[Bug Fix] Ember.String.htmlSafe throws exception (#203)

* Failing test for SafeString. * Unwrap string in case of htmlbars string
adopted-ember-addons · Jun 3, 2016 · ab0f10e · ab0f10e
1 parent 64a361c
commit ab0f10e
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 9 deletions.
diff --git a/addon/utils/utils.js b/addon/utils/utils.js
@@ -3,6 +3,16 @@
  * Copyrights licensed under the New BSD License. See the accompanying LICENSE file for terms.
  */
 
+import Ember from 'ember';
+
 export function hasEmberData() {
   return typeof self.DS !== 'undefined';
 }
+
+export function unwrapString(input) {
+  if (input && input instanceof Ember.Handlebars.SafeString) {
+    return input.toString();
+  }
+
+  return input;
+}
diff --git a/addon/validators/base.js b/addon/validators/base.js
@@ -4,8 +4,9 @@
  */
 
 import Ember from 'ember';
-import Messages from './messages';
+import Messages from 'ember-cp-validations/validators/messages';
 import getOwner from 'ember-getowner-polyfill';
+import { unwrapString } from 'ember-cp-validations/utils/utils';
 
 const {
   get,
@@ -212,15 +213,15 @@ const Base = Ember.Object.extend({
    */
   createErrorMessage(type, value, options = {}) {
     const messages = this.get('errorMessages');
-    let message;
+    let message = unwrapString(options.message);
 
     options.description = messages.getDescriptionFor(get(this, 'attribute'), options);
 
-    if (options.message) {
-      if (typeof options.message === 'string') {
-        message = messages.formatMessage(options.message, options);
-      } else if (typeof options.message === 'function') {
-        message = options.message.apply(this, arguments);
+    if (message) {
+      if (typeof message === 'string') {
+        message = messages.formatMessage(message, options);
+      } else if (typeof message === 'function') {
+        message = message.apply(this, arguments);
         message = isNone(message) ? messages.getMessageFor(type, options) : messages.formatMessage(message, options);
       }
     } else {

diff --git a/tests/index.html b/tests/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>Dummy Tests</title>
+    <title>Ember CP Validations - Tests</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 

diff --git a/tests/unit/validators/base-test.js b/tests/unit/validators/base-test.js
@@ -91,7 +91,7 @@ test('value - default gets model value', function(assert) {
   });
 
   validator.init();
-  
+
   assert.equal(validator.get('attribute'), 'foo');
   assert.equal(validator.getValue(), 'bar');
 });
@@ -115,3 +115,14 @@ test('value - overwrite value method via options', function(assert) {
   assert.equal(validator.getValue(), 'baz');
   assert.deepEqual(validator.get('options'), {});
 });
+
+test('message - handles SafeString', function(assert) {
+  assert.expect(1);
+
+  options = {
+    message: Ember.String.htmlSafe('should be more than &euro;15')
+  };
+
+  message = validator.createErrorMessage(undefined, undefined, options);
+  assert.equal(message, 'should be more than &euro;15');
+});