Complete unit tests

Author: ValentinH

demo/demo.js

@@ -247,6 +247,16 @@ app.controller('MainCtrl', function($scope, $rootScope, $timeout, $modal) {
     }
   };
 
+  //Slider with ticks and values at intermediate positions
+  $scope.slider_ticks_values_at = {
+    value: 500,
+    options: {
+      ceil: 1000,
+      floor: 0,
+      showTicksValues: 100
+    }
+  };
+
   //Slider with draggable range
   $scope.slider_draggable_range = {
     minValue: 1,

demo/index.html

@@ -189,6 +189,14 @@ <h2>Slider with ticks at intermediate positions</h2>
     ></rzslider>
   </article>
 
+  <article>
+    <h2>Slider with ticks and values at intermediate positions</h2>
+    <rzslider
+      rz-slider-model="slider_ticks_values_at.value"
+      rz-slider-options="slider_ticks_values_at.options"
+    ></rzslider>
+  </article>
+
   <article>
     <h2>Slider with draggable range</h2>
     <rzslider

dist/rzslider.js

@@ -1,7 +1,7 @@
 /*! angularjs-slider - v2.11.0 - 
  (c) Rafal Zajac <[email protected]>, Valentin Hervieu <[email protected]>, Jussi Saarivirta <[email protected]>, Angelin Sirbu <[email protected]> - 
  https://github.com/angular-slider/angularjs-slider - 
- 2016-04-01 */
+ 2016-04-22 */
 /*jslint unparam: true */
 /*global angular: false, console: false, define, module */
 (function(root, factory) {

dist/rzslider.min.js

@@ -183,6 +183,26 @@
       helper.slider.callOnStart.called.should.be.true;
       helper.slider.callOnChange.called.should.be.true;
     });
+
+    it('should handle click on ticks when showTicks is an integer and move minH', function () {
+      helper.scope.slider.options.step = 1;
+      helper.scope.slider.options.showTicks = 10;
+      helper.scope.$digest();
+      sinon.spy(helper.slider, 'positionTrackingHandle');
+      sinon.spy(helper.slider, 'callOnStart');
+      sinon.spy(helper.slider, 'callOnChange');
+
+      var expectedValue = 10,
+        offset = helper.slider.valueToOffset(expectedValue) + helper.slider.handleHalfDim + helper.slider.sliderElem.rzsp;
+
+      helper.fireMousedown(helper.slider.ticks, offset);
+
+      expect(helper.scope.slider.value).to.equal(expectedValue);
+      expect(helper.slider.tracking).to.equal('rzSliderModel');
+      helper.slider.positionTrackingHandle.called.should.be.true;
+      helper.slider.callOnStart.called.should.be.true;
+      helper.slider.callOnChange.called.should.be.true;
+    });
   });
 
     describe('Right to left Mouse controls - Single Horizontal', function() {
@@ -368,6 +388,25 @@
         helper.slider.callOnChange.called.should.be.true;
       });
 
+      it('should handle click on ticks when showTicks is an integer and move minH', function() {
+        helper.scope.slider.options.step = 1;
+        helper.scope.slider.options.showTicks = 10;
+        helper.scope.$digest();
+        sinon.spy(helper.slider, 'positionTrackingHandle');
+        sinon.spy(helper.slider, 'callOnStart');
+        sinon.spy(helper.slider, 'callOnChange');
+
+        var expectedValue = 10,
+          offset = helper.slider.valueToOffset(expectedValue) + helper.slider.handleHalfDim + helper.slider.sliderElem.rzsp;
+
+        helper.fireMousedown(helper.slider.ticks, offset);
+
+        expect(helper.scope.slider.value).to.equal(expectedValue);
+        expect(helper.slider.tracking).to.equal('rzSliderModel');
+        helper.slider.positionTrackingHandle.called.should.be.true;
+        helper.slider.callOnStart.called.should.be.true;
+        helper.slider.callOnChange.called.should.be.true;
+      });
   });
 }());
 

tests/specs/mouse-controls/single-slider-horizontal-test.js

@@ -186,6 +186,26 @@
       helper.slider.callOnStart.called.should.be.true;
       helper.slider.callOnChange.called.should.be.true;
     });
+
+    it('should handle click on ticks when showTicks is an integer and move minH', function() {
+      helper.scope.slider.options.step = 1;
+      helper.scope.slider.options.showTicks = 10;
+      helper.scope.$digest();
+      sinon.spy(helper.slider, 'positionTrackingHandle');
+      sinon.spy(helper.slider, 'callOnStart');
+      sinon.spy(helper.slider, 'callOnChange');
+
+      var expectedValue = 10,
+        offset = helper.slider.sliderElem.rzsp - helper.slider.valueToOffset(expectedValue) - helper.slider.handleHalfDim;
+
+      helper.fireMousedown(helper.slider.ticks, offset, true);
+
+      expect(helper.scope.slider.value).to.equal(expectedValue);
+      expect(helper.slider.tracking).to.equal('rzSliderModel');
+      helper.slider.positionTrackingHandle.called.should.be.true;
+      helper.slider.callOnStart.called.should.be.true;
+      helper.slider.callOnChange.called.should.be.true;
+    });
   });
 
   describe('Right to left Mouse controls - Single Vertical', function() {
@@ -374,6 +394,26 @@
       helper.slider.callOnStart.called.should.be.true;
       helper.slider.callOnChange.called.should.be.true;
     });
+
+    it('should handle click on ticks when showTicks is an integer and move minH', function() {
+      helper.scope.slider.options.step = 1;
+      helper.scope.slider.options.showTicks = 10;
+      helper.scope.$digest();
+      sinon.spy(helper.slider, 'positionTrackingHandle');
+      sinon.spy(helper.slider, 'callOnStart');
+      sinon.spy(helper.slider, 'callOnChange');
+
+      var expectedValue = 10,
+        offset = helper.slider.sliderElem.rzsp - helper.slider.valueToOffset(expectedValue) - helper.slider.handleHalfDim;
+
+      helper.fireMousedown(helper.slider.ticks, offset, true);
+
+      expect(helper.scope.slider.value).to.equal(expectedValue);
+      expect(helper.slider.tracking).to.equal('rzSliderModel');
+      helper.slider.positionTrackingHandle.called.should.be.true;
+      helper.slider.callOnStart.called.should.be.true;
+      helper.slider.callOnChange.called.should.be.true;
+    });
   });
 
 }());

tests/specs/mouse-controls/single-slider-vertical-test.js

@@ -660,6 +660,18 @@
         expect(helper.slider.scope.showTicks).to.be.true;
       });
 
+      it('should set the intermediateTicks flag to true when showTicks is an integer', function() {
+        helper.scope.slider.options.showTicks = 10;
+        helper.scope.$digest();
+        expect(helper.slider.intermediateTicks).to.be.true;
+      });
+
+      it('should set the intermediateTicks flag to true when showTicksValues is an integer', function() {
+        helper.scope.slider.options.showTicksValues = 10;
+        helper.scope.$digest();
+        expect(helper.slider.intermediateTicks).to.be.true;
+      });
+
       it('should set not accept draggableRange to true when slider is a single one', function() {
         helper.scope.slider.options.draggableRange = true;
         helper.scope.$digest();

tests/specs/options-handling-test.js

@@ -47,6 +47,20 @@
       expect(helper.element[0].querySelectorAll('.rz-tick')).to.have.length(11);
     });
 
+    it('should create the correct number of ticks when showTicks is an integer', function() {
+      var sliderConf = {
+        value: 50,
+        options: {
+          floor: 0,
+          ceil: 100,
+          step: 10,
+          showTicks: 20
+        }
+      };
+      helper.createSlider(sliderConf);
+      expect(helper.element[0].querySelectorAll('.rz-tick')).to.have.length(6);
+    });
+
     it('should create the correct number of ticks when showTicksValues is true', function() {
       var sliderConf = {
         value: 50,
@@ -66,6 +80,28 @@
       expect(secondTick.text()).to.equal('10');
     });
 
+    it('should create the correct number of ticks when showTicksValues is an integer', function() {
+      var sliderConf = {
+        value: 50,
+        options: {
+          floor: 0,
+          ceil: 100,
+          step: 10,
+          showTicksValues: 20
+        }
+      };
+      helper.createSlider(sliderConf);
+      expect(helper.slider.ticks.hasClass('rz-ticks-values-under')).to.be.true;
+      expect(helper.element[0].querySelectorAll('.rz-tick')).to.have.length(6);
+      expect(helper.element[0].querySelectorAll('.rz-tick-value')).to.have.length(6);
+      var firstTick = angular.element(helper.element[0].querySelectorAll('.rz-tick-value')[0]);
+      expect(firstTick.text()).to.equal('0');
+      var secondTick = angular.element(helper.element[0].querySelectorAll('.rz-tick-value')[1]);
+      expect(secondTick.text()).to.equal('20');
+      var lastTick = angular.element(helper.element[0].querySelectorAll('.rz-tick-value')[5]);
+      expect(lastTick.text()).to.equal('100');
+    });
+
     it('should set rz-selected class to ticks below the model value if showSelectionBar is true', function() {
       var sliderConf = {
         value: 50,