diff --git a/www/scripts/common/forms/views/error.js b/www/scripts/common/forms/views/error.js index 4ecad0093f..50a3c348cc 100644 --- a/www/scripts/common/forms/views/error.js +++ b/www/scripts/common/forms/views/error.js @@ -17,11 +17,11 @@ define([ initialize: function(options) { options = options || {}; - if (! "name" in options) { + if (false === "name" in options) { throw "Missing name attribute in error view"; } - if (! "errorTemplate" in options) { + if (false === "errorTemplate" in options) { throw "Missing errorTemplate attribute in error view"; } diff --git a/www/scripts/common/forms/views/input.js b/www/scripts/common/forms/views/input.js index cef21307e7..6b838296d1 100644 --- a/www/scripts/common/forms/views/input.js +++ b/www/scripts/common/forms/views/input.js @@ -18,11 +18,11 @@ define([ initialize: function(options) { options = options || {}; - if (! "name" in options) { + if (false === "name" in options) { throw "Missing name attribute in input view"; } - if (! "errorTemplate" in options) { + if (false === "errorTemplate" in options) { throw "Missing errorTemplate attribute in input view"; } diff --git a/www/scripts/tests/specs/login/home.js b/www/scripts/tests/specs/login/home.js index bdfc90fa7f..343f929a20 100644 --- a/www/scripts/tests/specs/login/home.js +++ b/www/scripts/tests/specs/login/home.js @@ -2,9 +2,9 @@ define([ 'chai', 'fixtures', 'jquery', - 'apps/login/home/views/form', - 'apps/login/home/views/input', - 'apps/login/home/views/error' + 'common/forms/views/form', + 'common/forms/views/input', + 'common/forms/views/error' ], function( chai, fixtures, @@ -65,7 +65,8 @@ define([ describe("Input View", function() { it("should initialize error view", function() { var input = new InputView({ - "name": "test" + "name": "test", + "errorTemplate": "#field_errors" }); expect(input.errorView).to.be.an.instanceof(ErrorView); }); @@ -79,8 +80,10 @@ define([ }; var errorView = new ErrorView({ + "name": "test", "errors": [error], - "el" : $(".error-view").first() + "el" : $(".error-view").first(), + "errorTemplate": "#field_errors" }); errorView.render(); @@ -94,8 +97,10 @@ define([ $el.html('previous error here'); var errorView = new ErrorView({ + "name": "test", "errors": [], - "el" : $el + "el" : $el, + "errorTemplate": "#field_errors" }); errorView.render(); diff --git a/www/scripts/tests/specs/validator.js b/www/scripts/tests/specs/validator.js index 67d11caf02..26510ca118 100644 --- a/www/scripts/tests/specs/validator.js +++ b/www/scripts/tests/specs/validator.js @@ -1,6 +1,6 @@ define([ 'chai', - 'common/validator' + 'common/forms/validator' ], function(chai, Validator) { var expect = chai.expect; var assert = chai.assert;