Merge branch 'feature/ni-NaN-ni-NaN-NaN-na' into development

Author: davidlgj

.jscs.json

@@ -1,4 +1,5 @@
 {
   "preset": "google",
-  "maximumLineLength": 100
+  "maximumLineLength": 100,
+  "disallowMultipleLineBreaks": false
 }

docs/index.md

@@ -260,6 +260,7 @@ The context variables available to you are:
 | error         | The error code          |
 | title         | Title of the field      |
 | value         | The model value         |
+| viewValue     | The view value (probably the one you want) |
 | form          | form definition object for this field |
 | schema        | schema for this field |
 

examples/bootstrap-example.html

@@ -275,11 +275,12 @@ <h3>Schema</h3>
     }).error(function() {
       $scope.loadedData = 'dummy';
       $scope.error = 'Failed to load gist.';
+      $scope.selectedTest = $scope.tests[0];
     });
+  } else {
+    $scope.selectedTest = $scope.tests[0];
   }
 
-  $scope.selectedTest = $scope.tests[0];
-
   $scope.$watch('selectedTest',function(val){
     if (val && val.data !== undefined) {
       $http.get(val.data).then(function(res) {setNewData(res.data);});

gulp/tasks/protractor.js

@@ -0,0 +1,38 @@
+var gulp = require('gulp');
+
+// The protractor task
+var protractor = require('gulp-protractor');
+
+// Start a standalone server
+var webdriver_standalone = protractor.webdriver_standalone;
+
+// Download and update the selenium driver
+var webdriver_update = protractor.webdriver_update;
+
+// Downloads the selenium webdriver
+gulp.task('webdriver-update', webdriver_update);
+
+// Start the standalone selenium server
+// NOTE: This is not needed if you reference the
+// seleniumServerJar in your protractor.conf.js
+gulp.task('webdriver-standalone', webdriver_standalone);
+
+
+// Setting up the test task
+gulp.task('protractor', ['webdriver-update'], function(cb) {
+  gulp.src(['test/protractor/specs/**/*.js']).pipe(protractor.protractor({
+    configFile: 'test/protractor/conf.js',
+  })).on('error', function(e) {
+    console.log(e);
+  }).on('end', cb);
+});
+
+['validation-messages', 'custom-validation'].forEach(function(name) {
+  gulp.task('protractor:' + name, ['webdriver-update'], function(cb) {
+    gulp.src(['test/protractor/specs/' + name + '.js']).pipe(protractor.protractor({
+      configFile: 'test/protractor/conf.js',
+    })).on('error', function(e) {
+      console.log(e);
+    }).on('end', cb);
+  });
+});

package.json

@@ -38,6 +38,7 @@
     "gulp-concat": "^2.2.0",
     "gulp-jscs": "^1.1.0",
     "gulp-minify-html": "^0.1.1",
+    "gulp-protractor": "^1.0.0",
     "gulp-rename": "^1.2.0",
     "gulp-uglify": "^0.2.1",
     "gulp-umd": "^0.1.3",
@@ -50,6 +51,7 @@
     "karma-phantomjs-launcher": "^0.1.4",
     "mocha": "^1.18.0",
     "mocha-lcov-reporter": "0.0.1",
+    "protractor": "^2.0.0",
     "sinon": "^1.9.0",
     "sinon-chai": "^2.5.0",
     "streamqueue": "0.0.5"

src/directives/message.js

@@ -27,24 +27,13 @@ angular.module('schemaForm').directive('sfMessage',
 
           // We only show one error.
           // TODO: Make that optional
-          // tv4- errors take precedence
           var error = errors[0];
-          if (errors.length > 1) {
-
-            error = errors.reduce(function(prev, value) {
-              if (prev && prev.indexOf('tv4-') === 0) {
-                return prev;
-              }
-              return value;
-            });
-            console.log('reduced',errors, error)
-
-          }
 
           if (error) {
             element.html(sfErrorMessage.interpolate(
               error,
               scope.ngModel.$modelValue,
+              scope.ngModel.$viewValue,
               scope.form,
               scope.options && scope.options.validationMessage
             ));

src/services/decorators.js

@@ -159,6 +159,7 @@ angular.module('schemaForm').provider('schemaFormDecorators',
               return sfErrorMessage.interpolate(
                 (schemaError && schemaError.code + '') || 'default',
                 (scope.ngModel && scope.ngModel.$modelValue) || '',
+                (scope.ngModel && scope.ngModel.$viewValue) || '',
                 scope.form,
                 scope.options && scope.options.validationMessage
               );

src/services/errors.js

@@ -14,25 +14,25 @@ angular.module('schemaForm').provider('sfErrorMessage', function() {
     12: 'Data is valid against more than one schema from "oneOf"',
     13: 'Data matches schema from "not"',
     // Numeric errors
-    100: 'Value {{value}} is not a multiple of {{schema.multipleOf}}',
-    101: 'Value {{value}} is less than minimum {{schema.minimum}}',
-    102: 'Value {{value}} is equal to exclusive minimum {{schema.minimum}}',
-    103: 'Value {{value}} is greater than maximum {{schema.maximum}}',
-    104: 'Value {{value}} is equal to exclusive maximum {{schema.maximum}}',
-    105: 'Value {{value}} is not a valid number',
+    100: 'Value is not a multiple of {{schema.divisibleBy}}',
+    101: '{{viewValue}} is less than the allowed minimum of {{schema.minimum}}',
+    102: '{{viewValue}} is equal to the exclusive minimum {{schema.minimum}}',
+    103: '{{viewValue}} is greater than the allowed maximum of {{schema.maximum}}',
+    104: '{{viewValue}} is equal to the exclusive maximum {{schema.maximum}}',
+    105: 'Value is not a valid number',
     // String errors
-    200: 'String is too short ({{value.length}} chars), minimum {{schema.minimum}}',
-    201: 'String is too long ({{value.length}} chars), maximum {{schema.maximum}}',
+    200: 'String is too short ({{viewValue.length}} chars), minimum {{schema.minLength}}',
+    201: 'String is too long ({{viewValue.length}} chars), maximum {{schema.maxLength}}',
     202: 'String does not match pattern: {{schema.pattern}}',
     // Object errors
-    300: 'Too few properties defined, minimum {{schema.minimum}}',
-    301: 'Too many properties defined, maximum {{schema.maximum}}',
+    300: 'Too few properties defined, minimum {{schema.minProperties}}',
+    301: 'Too many properties defined, maximum {{schema.maxProperties}}',
     302: 'Required',
     303: 'Additional properties not allowed',
     304: 'Dependency failed - key must exist',
     // Array errors
-    400: 'Array is too short ({{value.length}}), minimum {{schema.minimum}}',
-    401: 'Array is too long ({{value.length}}), maximum {{schema.maximum}}',
+    400: 'Array is too short ({{value.length}}), minimum {{schema.maxItems}}',
+    401: 'Array is too long ({{value.length}}), maximum {{schema.minItems}}',
     402: 'Array items are not unique',
     403: 'Additional items not allowed',
     // Format errors
@@ -44,6 +44,15 @@ angular.module('schemaForm').provider('sfErrorMessage', function() {
     1000: 'Unknown property (not in schema)'
   };
 
+  // In some cases we get hit with an angular validation error
+  defaultMessages.number    = defaultMessages[105];
+  defaultMessages.required  = defaultMessages[302];
+  defaultMessages.min       = defaultMessages[101];
+  defaultMessages.max       = defaultMessages[103];
+  defaultMessages.maxlength = defaultMessages[201];
+  defaultMessages.minlength = defaultMessages[200];
+  defaultMessages.pattern   = defaultMessages[202];
+
   this.setDefaultMessages = function(messages) {
     defaultMessages = messages;
   };
@@ -68,12 +77,14 @@ angular.module('schemaForm').provider('sfErrorMessage', function() {
      * @param {string} error the error code, i.e. tv4-xxx for tv4 errors, otherwise it's whats on
      *                       ngModel.$error for custom errors.
      * @param {Any} value the actual model value.
+     * @param {Any} viewValue the viewValue
      * @param {Object} form a form definition object for this field
      * @param  {Object} global the global validation messages object (even though its called global
      *                         its actually just shared in one instance of sf-schema)
      * @return {string} The error message.
      */
-    service.interpolate = function(error, value, form, global) {
+    service.interpolate = function(error, value, viewValue, form, global) {
+      console.log(error, value, viewValue)
       global = global || {};
       var validationMessage = form.validationMessage || {};
 
@@ -99,6 +110,7 @@ angular.module('schemaForm').provider('sfErrorMessage', function() {
       var context = {
         error: error,
         value: value,
+        viewValue: viewValue,
         form: form,
         schema: form.schema,
         title: form.title || (form.schema && form.schema.title)

test/protractor/conf.js

@@ -0,0 +1,3 @@
+exports.config = {
+  seleniumAddress: 'http://localhost:4444/wd/hub'
+}

test/protractor/specs/custom-validation.js

@@ -0,0 +1,74 @@
+describe('Schema Form custom validators', function() {
+  it('should have a form with content', function() {
+    browser.get('http://localhost:8080/examples/custom-validators.html');
+
+    expect(element(by.css('form')).getInnerHtml()).not.toEqual('');
+  });
+
+  describe('#name', function() {
+    it('should not complain if it gets a normal name', function() {
+      browser.get('http://localhost:8080/examples/custom-validators.html');
+      var input = element.all(by.css('form input')).first();
+      input.sendKeys('Joe Schmoe');
+
+      expect(input.getAttribute('value')).toEqual('Joe Schmoe');
+      expect(input.evaluate('ngModel.$valid')).toEqual(true);
+
+    });
+
+    it('should complain if it gets a "Bob" as a name', function() {
+      browser.get('http://localhost:8080/examples/custom-validators.html');
+      var input = element.all(by.css('form input')).first();
+      input.sendKeys('Bob');
+
+      expect(input.getAttribute('value')).toEqual('Bob');
+      expect(input.evaluate('ngModel.$valid')).toEqual(false);
+    });
+  });
+
+  describe('#email', function() {
+    it('should not complain if it gets a normal email', function() {
+      browser.get('http://localhost:8080/examples/custom-validators.html');
+      var input = element.all(by.css('form input')).get(1);
+      input.sendKeys('foo@mailinator.com');
+
+      expect(input.getAttribute('value')).toEqual('foo@mailinator.com');
+      expect(input.evaluate('ngModel.$valid')).toEqual(true);
+
+    });
+
+    it('should complain if it gets a my email', function() {
+      browser.get('http://localhost:8080/examples/custom-validators.html');
+      var input = element.all(by.css('form input')).get(1);
+      input.sendKeys('david.lgj@gmail.com');
+
+      expect(input.getAttribute('value')).toEqual('david.lgj@gmail.com');
+      expect(input.evaluate('ngModel.$valid')).toEqual(false);
+    });
+  });
+
+  describe('#comment', function() {
+    it('should not complain if it gets a normal email', function() {
+      browser.get('http://localhost:8080/examples/custom-validators.html');
+      var input = element.all(by.css('form input')).get(1);
+      input.sendKeys('foo@mailinator.com');
+
+      expect(input.getAttribute('value')).toEqual('foo@mailinator.com');
+      expect(input.evaluate('ngModel.$valid')).toEqual(true);
+
+    });
+
+    it('should complain if it gets a my email', function() {
+      browser.get('http://localhost:8080/examples/custom-validators.html');
+      var input = element.all(by.css('form input')).get(1);
+      input.sendKeys('david.lgj@gmail.com');
+
+      expect(input.getAttribute('value')).toEqual('david.lgj@gmail.com');
+      expect(input.evaluate('ngModel.$valid')).toEqual(false);
+    });
+  });
+
+
+
+
+});