If translation isn't working, throw an error

ghiscoding · Sep 1, 2016 · ba2ba9a · ba2ba9a
1 parent 72f62bf
commit ba2ba9a
Show file tree

Hide file tree

Showing 19 changed files with 55 additions and 10 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-validation-ghiscoding",
-  "version": "1.5.4",
+  "version": "1.5.5",
   "author": "Ghislain B.",
   "description": "Angular-Validation Directive and Service (ghiscoding)",
   "main": [
@@ -47,4 +47,4 @@
   "devDependencies": {
     "angular-route": ">= 1.2.0"
   }
-}
+}
diff --git a/dist/angular-validation.min.js b/dist/angular-validation.min.js
diff --git a/more-examples/customRemote/app.js b/more-examples/customRemote/app.js
@@ -62,15 +62,15 @@ myApp.controller('CtrlService', ['$scope', '$q', 'ValidationService', function (
   var vs = new ValidationService({ controllerAs: vms, debounce: 500 });
 
   vs.setGlobalOptions({ scope: $scope })
-    .addValidator('input3', 'alpha|min_len:2|remote:vms.myRemoteValidation3():alt=Alternate error message.|required')
+    .addValidator('input3', 'alpha|min_len:2|remote:vms.myRemoteValidation3:alt=Alternate error message.|required')
     .addValidator('input4', 'alpha|min_len:2|remote:vms.myRemoteValidation4()|required');
 
   vms.myRemoteValidation3 = function() {
     var deferred = $q.defer();
     setTimeout(function() {
       var isValid = (vms.model.input3 === "abc") ? true : false;
       deferred.resolve({ isValid: isValid, message: 'Returned error from promise.'});
-    }, 500);
+    }, 100);
 
     return deferred.promise;
   }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-validation-ghiscoding",
-  "version": "1.5.4",
+  "version": "1.5.5",
   "author": "Ghislain B.",
   "description": "Angular-Validation Directive and Service (ghiscoding)",
   "main": "app.js",

diff --git a/protractor/angularUI_spec.js b/protractor/angularUI_spec.js
@@ -20,6 +20,7 @@
     it('Should enter valid date expect no errors on input and validation summary', function () {
       var elmInput = $('[name=dateOfChange]');
       elmInput.sendKeys(validDate);
+      element(by.css('body')).click();
       elmInput.sendKeys(protractor.Key.TAB);
 
       // validation summary should become empty
@@ -30,6 +31,7 @@
     it('Should enter outside of range date and show dateOfChange error on input and ValidationSummary', function () {
       var elmInput = $('[name=dateOfChange]');
       elmInput.sendKeys(invalidOverDate);
+      element(by.css('body')).click();
       elmInput.sendKeys(protractor.Key.TAB);
 
       var itemRows = element.all(by.binding('message'));
@@ -43,6 +45,7 @@
     it('Should enter wrong date format and show dateOfChange error on input and ValidationSummary', function () {
       var elmInput = $('[name=dateOfChange]');
       elmInput.sendKeys(invalidTypoDate);
+      element(by.css('body')).click();
       elmInput.sendKeys(protractor.Key.TAB);
 
       var itemRows = element.all(by.binding('message'));

diff --git a/protractor/badInput_spec.js b/protractor/badInput_spec.js
@@ -45,6 +45,7 @@ describe('Angular-Validation badInput Tests:', function () {
         it('Should display same invalid character error message even after a Tab', function() {
           // make input3 invalid, remove text
           var elmInput2 = $('[name=input2]');
+          element(by.css('body')).click();
           elmInput2.sendKeys(protractor.Key.TAB);
 
           // error should appear on input2
@@ -95,6 +96,7 @@ describe('Angular-Validation badInput Tests:', function () {
           var elmInput2 = $('[name=input2]');
           elmInput2.click();
           clearInput(elmInput2, 5);
+          element(by.css('body')).click();
           elmInput2.sendKeys(protractor.Key.TAB);
 
           // error should appear on input2

diff --git a/protractor/callback_spec.js b/protractor/callback_spec.js
@@ -45,6 +45,7 @@ describe('Angular-Validation callback Validation Tests:', function () {
       for (var i = 0, ln = formElementNames.length; i < ln; i++) {
         var elmInput = $('[name=' + formElementNames[i] + ']');
         elmInput.click();
+        element(by.css('body')).click();
         elmInput.sendKeys(protractor.Key.TAB);
 
         var elmError = $('.validation-' + formElementNames[i]);

diff --git a/protractor/conf.js b/protractor/conf.js
@@ -7,7 +7,7 @@
     'browserName': 'chrome',
     'chromeOptions': {
       // get rid of --ignore-certificate yellow warning
-      args: ['--no-sandbox', 'test-type=browser'],
+      args: ['--no-sandbox', 'test-type=browser', 'disable-extensions'],
       // set download path and avoid prompting for download even though
       // even though this is already the default Chrome but for completeness
       prefs: {

diff --git a/protractor/controllerAsWithRoute_spec.js b/protractor/controllerAsWithRoute_spec.js
@@ -26,6 +26,7 @@
     it('Should enter valid data and show 0 error on Top Form Valdation Summary', function () {
       var elmInput = $('[name=f1]');
       elmInput.sendKeys('abc');
+      element(by.css('body')).click();
       elmInput.sendKeys(protractor.Key.TAB);
 
       // validation summary should become empty
@@ -36,6 +37,7 @@
     it('Should enter valid data and show 0 error on bottom Form Valdation Summary in ngView (First Route)', function () {
       var elmInput = $('[name=firstField]');
       elmInput.sendKeys('abc');
+      element(by.css('body')).click();
       elmInput.sendKeys(protractor.Key.TAB);
 
       // validation summary should become empty
@@ -63,6 +65,7 @@
     it('Should enter valid data and show 0 error on bottom Form Valdation Summary in ngView (First Route)', function () {
       var elmInput = $('[name=secondField]');
       elmInput.sendKeys('abc');
+      element(by.css('body')).click();
       elmInput.sendKeys(protractor.Key.TAB);
 
       // validation summary should become empty

diff --git a/protractor/custom_spec.js b/protractor/custom_spec.js
@@ -50,6 +50,7 @@
       for (var i = 0, ln = formElementNames.length; i < ln; i++) {
         var elmInput = $('[name=' + formElementNames[i] + ']');
         elmInput.click();
+        element(by.css('body')).click();
         elmInput.sendKeys(protractor.Key.TAB);
 
         var elmError = $('.validation-' + formElementNames[i]);
@@ -74,6 +75,7 @@
         elmInput.click();
         clearInput(elmInput);
         elmInput.sendKeys(validInputTexts[i]);
+        element(by.css('body')).click();
         elmInput.sendKeys(protractor.Key.TAB);
 
         var elmError = $('.validation-' + formElementNames[i]);
@@ -114,6 +116,7 @@
       for (var i = 0, ln = formElementNames.length; i < ln; i++) {
         var elmInput = $('[name=' + formElementNames[i] + ']');
         elmInput.click();
+        element(by.css('body')).click();
         elmInput.sendKeys(protractor.Key.TAB);
 
         var elmError = $('.validation-' + formElementNames[i]);

diff --git a/protractor/dynamic_spec.js b/protractor/dynamic_spec.js
@@ -28,10 +28,12 @@
     it('Should enter valid data in Form1 and expect valid Form1 but invalid Form2', function () {
       var elmFirstName = $('[name=firstName]');
       elmFirstName.sendKeys('abc');
+      element(by.css('body')).click();
       elmFirstName.sendKeys(protractor.Key.TAB);
 
       var elmLastName = $('[name=lastName]');
       elmLastName.sendKeys('def');
+      element(by.css('body')).click();
       elmLastName.sendKeys(protractor.Key.TAB);
 
       var validateBtn = $('[name=validateForms]');
@@ -54,10 +56,12 @@
     it('Should enter valid data in Form2 and expect both Forms to be valid', function () {
       var elmEmail = $('[name=email]');
       elmEmail.sendKeys('abc');
+      element(by.css('body')).click();
       elmEmail.sendKeys(protractor.Key.TAB);
 
       var elmPhone = $('[name=phoneNo]');
       elmPhone.sendKeys('def');
+      element(by.css('body')).click();
       elmPhone.sendKeys(protractor.Key.TAB);
 
       var validateBtn = $('[name=validateForms]');

diff --git a/protractor/full_tests_spec.js b/protractor/full_tests_spec.js
@@ -49,6 +49,7 @@
           for (var i = 0, ln = validations.length; i < ln; i++) {
             var elmInput = $('[name=input' + i + ']');
             elmInput.click();
+            element(by.css('body')).click();
             elmInput.sendKeys(protractor.Key.TAB);
             //$('[for=input' + i + ']').click();
 
@@ -73,6 +74,7 @@
                 (function(elmInput, data, i) {
                   elmInput.clear().then(function() {
                     elmInput.sendKeys(data);
+                    element(by.css('body')).click();
                     elmInput.sendKeys(protractor.Key.TAB);
                     //$('[for=input' + i + ']').click();
                     var elmError = $('.validation-input' + i);
@@ -100,6 +102,7 @@
                 (function(elmInput, data, i) {
                   elmInput.clear().then(function() {
                     elmInput.sendKeys(data);
+                    element(by.css('body')).click();
                     elmInput.sendKeys(protractor.Key.TAB);
                     //$('[for=input' + i + ']').click();
                     var elmError = $('.validation-input' + i);

diff --git a/protractor/interpolate_spec.js b/protractor/interpolate_spec.js
@@ -32,6 +32,7 @@
     it('Should enter valid data and show 0 error on bottom Form in ngView (First Route)', function () {
       var elmInput = $('[name=if1]');
       elmInput.sendKeys('abc');
+      element(by.css('body')).click();
       elmInput.sendKeys(protractor.Key.TAB);
 
       // validation summary should become empty

diff --git a/protractor/mixed_validation_spec.js b/protractor/mixed_validation_spec.js
@@ -130,6 +130,7 @@
         it('Should click, blur on Remote input and error message should display', function () {
           var elmInput = $('[name=input1]');
           elmInput.click();
+          element(by.css('body')).click();
           elmInput.sendKeys(protractor.Key.TAB);
           //$('[for=input1]').click();
           browser.waitForAngular();
@@ -143,6 +144,7 @@
           var elmInput = $('[name=input1]');
           elmInput.click();
           elmInput.sendKeys('ab');
+          element(by.css('body')).click();
           elmInput.sendKeys(protractor.Key.TAB);
           //$('[for=input1]').click();
           browser.sleep(1100); // sleep because of our data sample having a delay of 1sec internally, we use 1.5sec on this side to be sure
@@ -155,6 +157,7 @@
           var elmInput = $('[name=input1]');
           elmInput.clear().then(function() {
             elmInput.sendKeys('abc');
+            element(by.css('body')).click();
             elmInput.sendKeys(protractor.Key.TAB);
             //$('[for=input1]').click();
             browser.sleep(1100); // sleep because of our data sample having a delay of 1sec internally, we use 1.5sec on this side to be sure
@@ -172,12 +175,14 @@
             }
             var elmInput = $('[name=' + formElementNames[i] + ']');
             elmInput.click();
+            element(by.css('body')).click();
             elmInput.sendKeys(protractor.Key.TAB);
             //$('[for=' + formElementNames[i] + ']').click(); // click on label to blur away
 
             if (formElementNames[i] === 'select1') {
               element(by.cssContainingText('option', 'en')).click(); // click on good option first
               element(by.cssContainingText('option', '...')).click(); // then click on option[0], the one containing '...'
+              element(by.css('body')).click();
               elmInput.sendKeys(protractor.Key.TAB);
 
               var elmError = $('.validation-select1');
@@ -191,6 +196,7 @@
         });
 
         it('Should enter valid text and make error go away', function () {
+          browser.sleep(2000);
           for (var i = 0, ln = formElementNames.length; i < ln; i++) {
             // some fields are not required or disabled so no error will show up, continue to next ones
             if (formElementNames[i] === 'input12' || formElementNames[i] === 'input14') {
@@ -200,11 +206,13 @@
             elmInput.click();
             elmInput.sendKeys(validInputTexts[i]);
             elmInput.sendKeys(protractor.Key.TAB);
+            element(by.css('body')).click();
             //$('[for=' + formElementNames[i] + ']').click(); // click on label to blur away
 
             if (formElementNames[i] === 'select1') {
               element(by.cssContainingText('option', validInputTexts[i])).click(); // click on good option
               elmInput.sendKeys(protractor.Key.TAB);
+              element(by.css('body')).click();
             }
 
             var elmError = $('.validation-' + formElementNames[i]);
@@ -223,6 +231,7 @@
             // make input3 invalid, remove text
             var elmInput3 = $('[name=input3]');
             clearInput(elmInput3);
+            element(by.css('body')).click();
             elmInput3.sendKeys(protractor.Key.TAB);
             //$('[for=input3]').click(); // click on label to blur away
 
@@ -306,6 +315,7 @@
         it('Should focus and blur out of input22 & error should appear', function() {
           var elmInput = $('[name=input22]');
           elmInput.click();
+          element(by.css('body')).click();
           elmInput.sendKeys(protractor.Key.TAB);
           //$('[for=input22]').click(); // click on label to blur away
 
@@ -393,10 +403,12 @@
             var elmInput = $('[name=' + formElementNames[i] + ']');
             elmInput.click();
             elmInput.sendKeys(validInputTexts[i]);
+            element(by.css('body')).click();
             elmInput.sendKeys(protractor.Key.TAB);
 
             if (formElementNames[i] === 'select1') {
               element(by.cssContainingText('option', validInputTexts[i])).click(); // click on good option
+              element(by.css('body')).click();
               elmInput.sendKeys(protractor.Key.TAB);
             }
 
@@ -506,6 +518,7 @@
 
         if (formElement2FormsNames[i] === 'select1') {
           element(by.cssContainingText('option', validInput2FormsTexts[i])).click(); // click on good option
+          element(by.css('body')).click();
           elmInput.sendKeys(protractor.Key.TAB);
         }
 
@@ -587,6 +600,7 @@
         var elmInput = $('[name=' + formElement2FormsNames[i] + ']');
         elmInput.click();
         elmInput.sendKeys("a");
+        element(by.css('body')).click();
         elmInput.sendKeys(protractor.Key.TAB);
 
         // both inputs should have the same error message

diff --git a/protractor/remote_spec.js b/protractor/remote_spec.js
@@ -42,6 +42,7 @@
       for (var i = 0, ln = formElementNames.length; i < ln; i++) {
         var elmInput = $('[name=' + formElementNames[i] + ']');
         elmInput.click();
+        element(by.css('body')).click();
         elmInput.sendKeys(protractor.Key.TAB);
 
         var elmError = $('.validation-' + formElementNames[i]);
@@ -68,6 +69,7 @@
         clearInput(elmInput);
         elmInput.sendKeys(validInputTexts[i]);
         elmInput.sendKeys(protractor.Key.TAB);
+        element(by.css('body')).click();
         browser.sleep(1000);
 
         var elmError = $('.validation-' + formElementNames[i]);
@@ -108,6 +110,7 @@
       for (var i = 0, ln = formElementNames.length; i < ln; i++) {
         var elmInput = $('[name=' + formElementNames[i] + ']');
         elmInput.click();
+        element(by.css('body')).click();
         elmInput.sendKeys(protractor.Key.TAB);
 
         var elmError = $('.validation-' + formElementNames[i]);

diff --git a/protractor/thirdParty_spec.js b/protractor/thirdParty_spec.js
@@ -76,6 +76,7 @@
           elmInput.click();
           elmInput.sendKeys('tag4');
           elmInput.sendKeys(protractor.Key.ENTER);
+          element(by.css('body')).click();
           elmInput.sendKeys(protractor.Key.TAB);
 
       var elmError = $('.validation-input1');
@@ -92,6 +93,7 @@
           elmInput.click();
           elmInput.sendKeys('xyz');
           elmInput.sendKeys(protractor.Key.ENTER);
+          element(by.css('body')).click();
           elmInput.sendKeys(protractor.Key.TAB);
 
       // get 2 errors concatenated

diff --git a/protractor/validRequireHowMany_spec.js b/protractor/validRequireHowMany_spec.js
@@ -38,6 +38,7 @@ describe('Angular-Validation ValidRequireHowMany Validation Tests:', function ()
       for (var i = 0, ln = formElementNames.length; i < ln; i++) {
         var elmInput = $('[name=' + formElementNames[i] + ']');
         elmInput.click();
+        element(by.css('body')).click();
         elmInput.sendKeys(protractor.Key.TAB);
 
         var elmError = $('.validation-' + formElementNames[i]);
@@ -51,6 +52,7 @@ describe('Angular-Validation ValidRequireHowMany Validation Tests:', function ()
         elmInput.click();
         clearInput(elmInput);
         elmInput.sendKeys(invalidInputTexts[i]);
+        element(by.css('body')).click();
         elmInput.sendKeys(protractor.Key.TAB);
 
         var elmError = $('.validation-' + formElementNames[i]);
@@ -64,6 +66,7 @@ describe('Angular-Validation ValidRequireHowMany Validation Tests:', function ()
         elmInput.click();
         clearInput(elmInput);
         elmInput.sendKeys(validInputTexts[i]);
+        element(by.css('body')).click();
         elmInput.sendKeys(protractor.Key.TAB);
 
         var elmError = $('.validation-' + formElementNames[i]);
@@ -104,6 +107,7 @@ describe('Angular-Validation ValidRequireHowMany Validation Tests:', function ()
       for (var i = 0, ln = formElementNames.length; i < ln; i++) {
         var elmInput = $('[name=' + formElementNames[i] + ']');
         elmInput.click();
+        element(by.css('body')).click();
         elmInput.sendKeys(protractor.Key.TAB);
 
         var elmError = $('.validation-' + formElementNames[i]);

diff --git a/readme.md b/readme.md
@@ -1,5 +1,5 @@
 #Angular Validation (Directive / Service)
-`Version: 1.5.4`
+`Version: 1.5.5`
 ### Forms Validation with Angular made easy!
 ##### (Concept comes from the amazing Laravel)
 

diff --git a/src/validation-common.js b/src/validation-common.js
@@ -612,6 +612,8 @@ angular
                   validationElmObj.message += errorMessageSeparator + msgToTranslate;
                 }
                 addToValidationAndDisplayError(self, formElmObj, validationElmObj.message, isFieldValid, showError);
+              } else {
+                throw String.format("Could not translate: '{0}'. Please check your Angular-Translate $translateProvider configuration.", data);
               }
             });
           })(formElmObj, isConditionValid, validator);