remove tests for changing step value

Author: Narretz

Diff for: src/ng/directive/input.js

@@ -1610,15 +1610,24 @@ function rangeInputType(scope, element, attr, ctrl, $sniffer, $browser) {
   if (stepAttributeType) {
     ctrl.$validators.step = stepAttributeType === 'step' && supportsRange ?
       function noopStepValidator() {
-        // Since all browsers set the input to a valid value, we don't need to check validity
-        return true;
+        // Currently, only FF implements the spec on step change correctly (i.e. adjusting the
+        // input element value to a valid value). Other browsers have various problems, such as
+        // setting the stepMismatch error instead
+        return !validity.stepMismatch;
       } :
       // ngStep doesn't set the setp attr, so the browser doesn't adjust the input value as setting step would
       function stepValidator(modelValue, viewValue) {
         return ctrl.$isEmpty(viewValue) || isUndefined(stepVal) || viewValue % stepVal === 0;
       };
 
-    // Assign stepVal when the directive is linked. This won't run the validators as the model isn't ready yet
+    if (stepAttributeType === 'step') {
+      // Set the actual element attribute so that the browser can adjust the value based on
+      // the max value, which might be interpolated
+      element.attr('step', attr.step);
+    }
+
+    // This initalizes the step value, so that non-support browsers validate with the correct
+    // values during the initial $render
     stepChange(attr.step);
     attr.$observe('step', stepChange);
   }
@@ -1675,7 +1684,7 @@ function rangeInputType(scope, element, attr, ctrl, $sniffer, $browser) {
     if (isDefined(val) && !isNumber(val)) {
       val = parseFloat(val);
     }
-    stepVal = isNumber(val) && !isNaN(val) ? val : undefined;
+    stepVal = isNumber(val) && !isNaN(val) ? val : 1;
     // ignore changes before model is initialized
     if (isNumber(ctrl.$modelValue) && isNaN(ctrl.$modelValue)) {
       return;

Diff for: test/ng/directive/inputSpec.js

@@ -3310,76 +3310,37 @@ describe('input', function() {
           expect(scope.form.alias.$error.step).toBeFalsy();
         });
 
-        it('should adjust the element and model value if the step value changes on-the-fly', function() {
-          scope.step = 10;
-          var inputElm = helper.compileInput('<input type="range" ng-model="value" name="alias" step="{{step}}" />');
-
-          helper.changeInputValueTo('5');
-          expect(inputElm).toBeValid();
-          expect(scope.value).toBe(10);
-
-          // Step changes, but value matches
-          scope.$apply('step = 5');
-          expect(inputElm).toBeValid();
-          expect(scope.value).toBe(10);
-          expect(inputElm.val()).toBe('10');
-
-          // Step changes, value does not match
-          scope.$apply('step = 6');
-          expect(inputElm).toBeValid();
-          expect(scope.value).toBe(12);
-          expect(inputElm.val()).toBe('12');
-
-          // null is ignored
-          scope.$apply('step = null');
-          expect(inputElm).toBeValid();
-          expect(scope.value).toBe(12);
-          expect(inputElm.val()).toBe('12');
-
-          // Step val as string
-          scope.$apply('step = "7"');
-          expect(inputElm).toBeValid();
-          expect(scope.value).toBe(14);
-          expect(inputElm.val()).toBe('14');
-
-          // unparsable string is ignored
-          scope.step = 'abc';
-          scope.$digest();
-          expect(inputElm).toBeValid();
-          expect(scope.value).toBe(14);
-          expect(inputElm.val()).toBe('14');
-        });
-
       } else {
         it('should validate if "range" is not implemented', function() {
-          var inputElm = helper.compileInput('<input type="range" ng-model="value" name="alias" step="10" />');
+          scope.step = 10;
+          scope.value = 20;
+          var inputElm = helper.compileInput('<input type="range" ng-model="value" name="alias" step="{{step}}" />');
 
-          scope.$apply('value = 20');
-          expect(inputElm.val()).to('20');
+          expect(inputElm.val()).toBe('20');
           expect(inputElm).toBeValid();
           expect(scope.value).toBe(20);
           expect(scope.form.alias.$error.step).toBeFalsy();
 
           helper.changeInputValueTo('18');
           expect(inputElm).toBeInvalid();
-          expect(inputElm.val()).to('18');
+          expect(inputElm.val()).toBe('18');
           expect(scope.value).toBeUndefined();
           expect(scope.form.alias.$error.step).toBeTruthy();
 
           helper.changeInputValueTo('10');
           expect(inputElm).toBeValid();
-          expect(inputElm.val()).to('10');
+          expect(inputElm.val()).toBe('10');
           expect(scope.value).toBe(10);
           expect(scope.form.alias.$error.step).toBeFalsy();
 
           scope.$apply('value = 12');
           expect(inputElm).toBeInvalid();
-          expect(inputElm.val()).to('12');
+          expect(inputElm.val()).toBe('12');
           expect(scope.value).toBe(12);
           expect(scope.form.alias.$error.step).toBeTruthy();
         });
 
-        it('should validate even if the max value changes on-the-fly', function() {
+        it('should validate even if the step value changes on-the-fly', function() {
           scope.step = 10;
           var inputElm = helper.compileInput('<input type="range" ng-model="value" name="alias" step="{{step}}" />');
 
@@ -3391,13 +3352,13 @@ describe('input', function() {
           scope.$apply('step = 5');
           expect(inputElm.val()).toBe('10');
           expect(inputElm).toBeValid();
-          expect(scope.value).toBeUndefined();
+          expect(scope.value).toBe(10);
           expect(scope.form.alias.$error.step).toBeFalsy();
 
           // Step changes, value does not match
           scope.$apply('step = 6');
           expect(inputElm).toBeInvalid();
-          expect(scope.value).toBe(10);
+          expect(scope.value).toBeUndefined();
           expect(inputElm.val()).toBe('10');
           expect(scope.form.alias.$error.step).toBeTruthy();
 
@@ -3428,9 +3389,10 @@ describe('input', function() {
     describe('ngStep', function() {
 
       it('should validate', function() {
-        var inputElm = helper.compileInput('<input type="range" ng-model="value" name="alias" ng-step="5" />');
+        scope.step = 5;
+        scope.value = 5;
+        var inputElm = helper.compileInput('<input type="range" ng-model="value" name="alias" ng-step="step" />');
 
-        scope.$apply('value = 5');
         expect(inputElm).toBeValid();
         expect(inputElm.val()).toBe('5');
         expect(scope.value).toBe(5);