Skip to content

Commit 8f51bb2

Browse files
trodiValentinH
trodi
authored and
ValentinH
committed
Improve tests to ensure callOnChange isn't called multiple times
1 parent 8d7ea4d commit 8f51bb2

7 files changed

+164
-171
lines changed

‎tests/specs/mouse-controls/draggable-range-slider-horizontal-test.js‎

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
var expectedValue = 50;
4545
helper.moveMouseToValue(expectedValue);
4646
expect(helper.scope.slider.min).to.equal(expectedValue);
47-
helper.slider.positionTrackingHandle.called.should.be.true;
48-
helper.slider.callOnChange.called.should.be.true;
47+
expect(helper.slider.positionTrackingHandle.callCount).to.equal(1);
48+
expect(helper.slider.callOnChange.callCount).to.equal(1);
4949
});
5050

5151
it('should handle click and drag on maxH correctly when mouse is on the middle', function() {
@@ -55,8 +55,8 @@
5555
var expectedValue = 50;
5656
helper.moveMouseToValue(expectedValue);
5757
expect(helper.scope.slider.max).to.equal(expectedValue);
58-
helper.slider.positionTrackingHandle.called.should.be.true;
59-
helper.slider.callOnChange.called.should.be.true;
58+
expect(helper.slider.positionTrackingHandle.callCount).to.equal(1);
59+
expect(helper.slider.callOnChange.callCount).to.equal(1);
6060
});
6161

6262
it('should handle click and drag on minH and switch min/max if needed', function() {
@@ -91,9 +91,9 @@
9191
expect(helper.scope.slider.min).to.equal(expectedValue);
9292
expect(helper.slider.tracking).to.equal('lowValue');
9393
helper.slider.focusElement.calledWith(helper.slider.minH).should.be.true;
94-
helper.slider.positionTrackingHandle.called.should.be.true;
95-
helper.slider.callOnStart.called.should.be.true;
96-
helper.slider.callOnChange.called.should.be.true;
94+
expect(helper.slider.positionTrackingHandle.callCount).to.equal(1);
95+
expect(helper.slider.callOnStart.callCount).to.equal(1);
96+
expect(helper.slider.callOnChange.callCount).to.equal(1);
9797
});
9898

9999
it('should handle click on fullbar and move maxH when click pos is nearer to maxH', function() {
@@ -110,9 +110,9 @@
110110
expect(helper.scope.slider.max).to.equal(expectedValue);
111111
expect(helper.slider.tracking).to.equal('highValue');
112112
helper.slider.focusElement.calledWith(helper.slider.maxH).should.be.true;
113-
helper.slider.positionTrackingHandle.called.should.be.true;
114-
helper.slider.callOnStart.called.should.be.true;
115-
helper.slider.callOnChange.called.should.be.true;
113+
expect(helper.slider.positionTrackingHandle.callCount).to.equal(1);
114+
expect(helper.slider.callOnStart.callCount).to.equal(1);
115+
expect(helper.slider.callOnChange.callCount).to.equal(1);
116116
});
117117

118118
it('should handle click on selbar and move whole range when moved within slider range', function() {
@@ -131,9 +131,9 @@
131131
expect(helper.scope.slider.max).to.equal(70);
132132
expect(helper.slider.tracking).to.equal('lowValue');
133133
helper.slider.focusElement.calledWith(helper.slider.minH).should.be.true;
134-
helper.slider.positionTrackingBar.called.should.be.true;
135-
helper.slider.callOnStart.called.should.be.true;
136-
helper.slider.callOnChange.called.should.be.true;
134+
expect(helper.slider.positionTrackingBar.callCount).to.equal(2);
135+
expect(helper.slider.callOnStart.callCount).to.equal(1);
136+
expect(helper.slider.callOnChange.callCount).to.equal(2);
137137
});
138138

139139
it('should handle click on selbar and move move range when near 0 and moved left', function() {
@@ -265,8 +265,8 @@
265265
position = helper.getMousePosition(expectedValue);
266266
helper.fireMousemove(position);
267267
expect(helper.scope.slider.min).to.equal(expectedValue);
268-
helper.slider.positionTrackingHandle.called.should.be.true;
269-
helper.slider.callOnChange.called.should.be.true;
268+
expect(helper.slider.positionTrackingHandle.callCount).to.equal(1);
269+
expect(helper.slider.callOnChange.callCount).to.equal(1);
270270
});
271271

272272
it('should handle click and drag on maxH correctly when mouse is on the middle', function() {
@@ -277,8 +277,8 @@
277277
position = helper.getMousePosition(expectedValue);
278278
helper.fireMousemove(position);
279279
expect(helper.scope.slider.max).to.equal(expectedValue);
280-
helper.slider.positionTrackingHandle.called.should.be.true;
281-
helper.slider.callOnChange.called.should.be.true;
280+
expect(helper.slider.positionTrackingHandle.callCount).to.equal(1);
281+
expect(helper.slider.callOnChange.callCount).to.equal(1);
282282
});
283283

284284
it('should handle click and drag on minH and switch min/max if needed', function() {
@@ -315,9 +315,9 @@
315315
expect(helper.scope.slider.min).to.equal(expectedValue);
316316
expect(helper.slider.tracking).to.equal('lowValue');
317317
helper.slider.focusElement.calledWith(helper.slider.minH).should.be.true;
318-
helper.slider.positionTrackingHandle.called.should.be.true;
319-
helper.slider.callOnStart.called.should.be.true;
320-
helper.slider.callOnChange.called.should.be.true;
318+
expect(helper.slider.positionTrackingHandle.callCount).to.equal(1);
319+
expect(helper.slider.callOnStart.callCount).to.equal(1);
320+
expect(helper.slider.callOnChange.callCount).to.equal(1);
321321
});
322322

323323
it('should handle click on fullbar and move maxH when click pos is nearer to maxH', function() {
@@ -334,9 +334,9 @@
334334
expect(helper.scope.slider.max).to.equal(expectedValue);
335335
expect(helper.slider.tracking).to.equal('highValue');
336336
helper.slider.focusElement.calledWith(helper.slider.maxH).should.be.true;
337-
helper.slider.positionTrackingHandle.called.should.be.true;
338-
helper.slider.callOnStart.called.should.be.true;
339-
helper.slider.callOnChange.called.should.be.true;
337+
expect(helper.slider.positionTrackingHandle.callCount).to.equal(1);
338+
expect(helper.slider.callOnStart.callCount).to.equal(1);
339+
expect(helper.slider.callOnChange.callCount).to.equal(1);
340340
});
341341

342342
it('should handle click on selbar and move whole range when moved within slider range', function() {
@@ -355,9 +355,9 @@
355355
expect(helper.scope.slider.max).to.equal(50);
356356
expect(helper.slider.tracking).to.equal('highValue');
357357
helper.slider.focusElement.calledWith(helper.slider.maxH).should.be.true;
358-
helper.slider.positionTrackingBar.called.should.be.true;
359-
helper.slider.callOnStart.called.should.be.true;
360-
helper.slider.callOnChange.called.should.be.true;
358+
expect(helper.slider.positionTrackingBar.callCount).to.equal(2);
359+
expect(helper.slider.callOnStart.callCount).to.equal(1);
360+
expect(helper.slider.callOnChange.callCount).to.equal(2);
361361
});
362362

363363
it('should handle click on selbar and move move range when near 0 and moved right', function() {
@@ -422,4 +422,3 @@
422422
});
423423
});
424424
}());
425-

‎tests/specs/mouse-controls/draggableOnly-range-slider-horizontal-test.js‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848

4949
expect(helper.scope.slider.min).to.equal(50);
5050
expect(helper.scope.slider.max).to.equal(70);
51-
helper.slider.positionTrackingBar.called.should.be.true;
52-
helper.slider.callOnChange.called.should.be.true;
51+
expect(helper.slider.positionTrackingBar.callCount).to.equal(1);
52+
expect(helper.slider.callOnChange.callCount).to.equal(1);
5353
});
5454

5555
it('should handle click and drag on maxH correctly', function() {
@@ -61,8 +61,8 @@
6161
helper.fireMousemove(position);
6262
expect(helper.scope.slider.min).to.equal(50);
6363
expect(helper.scope.slider.max).to.equal(70);
64-
helper.slider.positionTrackingBar.called.should.be.true;
65-
helper.slider.callOnChange.called.should.be.true;
64+
expect(helper.slider.positionTrackingBar.callCount).to.equal(1);
65+
expect(helper.slider.callOnChange.callCount).to.equal(1);
6666
});
6767

6868
it('should not handle click on fullbar', function() {
@@ -95,9 +95,9 @@
9595
expect(helper.scope.slider.max).to.equal(70);
9696
expect(helper.slider.tracking).to.equal('lowValue');
9797
helper.slider.focusElement.calledWith(helper.slider.minH).should.be.true;
98-
helper.slider.positionTrackingBar.called.should.be.true;
99-
helper.slider.callOnStart.called.should.be.true;
100-
helper.slider.callOnChange.called.should.be.true;
98+
expect(helper.slider.positionTrackingBar.callCount).to.equal(2);
99+
expect(helper.slider.callOnStart.callCount).to.equal(1);
100+
expect(helper.slider.callOnChange.callCount).to.equal(2);
101101
});
102102

103103
it('should handle click on selbar and move range when near 0 and moved left', function() {
@@ -212,8 +212,8 @@
212212

213213
expect(helper.scope.slider.min).to.equal(50);
214214
expect(helper.scope.slider.max).to.equal(70);
215-
helper.slider.positionTrackingBar.called.should.be.true;
216-
helper.slider.callOnChange.called.should.be.true;
215+
expect(helper.slider.positionTrackingBar.callCount).to.equal(1);
216+
expect(helper.slider.callOnChange.callCount).to.equal(1);
217217
});
218218

219219
it('should handle click and drag on maxH correctly', function() {
@@ -225,8 +225,8 @@
225225
helper.fireMousemove(position);
226226
expect(helper.scope.slider.min).to.equal(50);
227227
expect(helper.scope.slider.max).to.equal(70);
228-
helper.slider.positionTrackingBar.called.should.be.true;
229-
helper.slider.callOnChange.called.should.be.true;
228+
expect(helper.slider.positionTrackingBar.callCount).to.equal(1);
229+
expect(helper.slider.callOnChange.callCount).to.equal(1);
230230
});
231231

232232
it('should not handle click on fullbar', function() {
@@ -259,9 +259,9 @@
259259
expect(helper.scope.slider.max).to.equal(70);
260260
expect(helper.slider.tracking).to.equal('lowValue');
261261
helper.slider.focusElement.calledWith(helper.slider.minH).should.be.true;
262-
helper.slider.positionTrackingBar.called.should.be.true;
263-
helper.slider.callOnStart.called.should.be.true;
264-
helper.slider.callOnChange.called.should.be.true;
262+
expect(helper.slider.positionTrackingBar.callCount).to.equal(2);
263+
expect(helper.slider.callOnStart.callCount).to.equal(1);
264+
expect(helper.slider.callOnChange.callCount).to.equal(2);
265265
});
266266

267267
it('should handle click on selbar and move range when near 0 and moved left', function() {
@@ -328,4 +328,3 @@
328328
});
329329
});
330330
}());
331-

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
var expectedValue = 50;
4545
helper.moveMouseToValue(expectedValue);
4646
expect(helper.scope.slider.value).to.equal(expectedValue);
47-
helper.slider.positionTrackingHandle.called.should.be.true;
48-
helper.slider.callOnChange.called.should.be.true;
47+
expect(helper.slider.positionTrackingHandle.callCount).to.equal(1);
48+
expect(helper.slider.callOnChange.callCount).to.equal(1);
4949
});
5050

5151
it('should do nothing when a click happen on another element than the handle', function() {
@@ -106,8 +106,8 @@
106106
var expectedValue = 50;
107107
helper.moveMouseToValue(expectedValue);
108108
expect(helper.scope.slider.value).to.equal(expectedValue);
109-
helper.slider.positionTrackingHandle.called.should.be.true;
110-
helper.slider.callOnChange.called.should.be.true;
109+
expect(helper.slider.positionTrackingHandle.callCount).to.equal(1);
110+
expect(helper.slider.callOnChange.callCount).to.equal(1);
111111
});
112112

113113
it('should do nothing when a click happen on another element than the handle', function() {
@@ -124,4 +124,3 @@
124124
});
125125
});
126126
}());
127-

‎tests/specs/mouse-controls/range-slider-horizontal-test.js‎

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@
113113
var expectedValue = 50;
114114
helper.moveMouseToValue(expectedValue);
115115
expect(helper.scope.slider.min).to.equal(expectedValue);
116-
helper.slider.positionTrackingHandle.called.should.be.true;
117-
helper.slider.callOnChange.called.should.be.true;
116+
expect(helper.slider.positionTrackingHandle.callCount).to.equal(1);
117+
expect(helper.slider.callOnChange.callCount).to.equal(1);
118118
});
119119

120120
it('should handle click and drag on maxH correctly when mouse is on the middle', function() {
@@ -124,8 +124,8 @@
124124
var expectedValue = 50;
125125
helper.moveMouseToValue(expectedValue);
126126
expect(helper.scope.slider.max).to.equal(expectedValue);
127-
helper.slider.positionTrackingHandle.called.should.be.true;
128-
helper.slider.callOnChange.called.should.be.true;
127+
expect(helper.slider.positionTrackingHandle.callCount).to.equal(1);
128+
expect(helper.slider.callOnChange.callCount).to.equal(1);
129129
});
130130

131131
it('should handle click and drag on minH and switch min/max if needed', function() {
@@ -204,9 +204,9 @@
204204
expect(helper.scope.slider.min).to.equal(expectedValue);
205205
expect(helper.slider.tracking).to.equal('lowValue');
206206
helper.slider.focusElement.calledWith(helper.slider.minH).should.be.true;
207-
helper.slider.positionTrackingHandle.called.should.be.true;
208-
helper.slider.callOnStart.called.should.be.true;
209-
helper.slider.callOnChange.called.should.be.true;
207+
expect(helper.slider.positionTrackingHandle.callCount).to.equal(1);
208+
expect(helper.slider.callOnStart.callCount).to.equal(1);
209+
expect(helper.slider.callOnChange.callCount).to.equal(1);
210210
});
211211

212212
it('should handle click on fullbar and move maxH when click pos is nearer to maxH', function() {
@@ -223,9 +223,9 @@
223223
expect(helper.scope.slider.max).to.equal(expectedValue);
224224
expect(helper.slider.tracking).to.equal('highValue');
225225
helper.slider.focusElement.calledWith(helper.slider.maxH).should.be.true;
226-
helper.slider.positionTrackingHandle.called.should.be.true;
227-
helper.slider.callOnStart.called.should.be.true;
228-
helper.slider.callOnChange.called.should.be.true;
226+
expect(helper.slider.positionTrackingHandle.callCount).to.equal(1);
227+
expect(helper.slider.callOnStart.callCount).to.equal(1);
228+
expect(helper.slider.callOnChange.callCount).to.equal(1);
229229
});
230230

231231
it('should handle click on selbar and move minH when click pos is nearer to minH', function() {
@@ -242,9 +242,9 @@
242242
expect(helper.scope.slider.min).to.equal(expectedValue);
243243
expect(helper.slider.tracking).to.equal('lowValue');
244244
helper.slider.focusElement.calledWith(helper.slider.minH).should.be.true;
245-
helper.slider.positionTrackingHandle.called.should.be.true;
246-
helper.slider.callOnStart.called.should.be.true;
247-
helper.slider.callOnChange.called.should.be.true;
245+
expect(helper.slider.positionTrackingHandle.callCount).to.equal(1);
246+
expect(helper.slider.callOnStart.callCount).to.equal(1);
247+
expect(helper.slider.callOnChange.callCount).to.equal(1);
248248
});
249249

250250
it('should handle click on selbar and move maxH when click pos is nearer to maxH', function() {
@@ -261,9 +261,9 @@
261261
expect(helper.scope.slider.max).to.equal(expectedValue);
262262
expect(helper.slider.tracking).to.equal('highValue');
263263
helper.slider.focusElement.calledWith(helper.slider.maxH).should.be.true;
264-
helper.slider.positionTrackingHandle.called.should.be.true;
265-
helper.slider.callOnStart.called.should.be.true;
266-
helper.slider.callOnChange.called.should.be.true;
264+
expect(helper.slider.positionTrackingHandle.callCount).to.equal(1);
265+
expect(helper.slider.callOnStart.callCount).to.equal(1);
266+
expect(helper.slider.callOnChange.callCount).to.equal(1);
267267
});
268268
});
269269

@@ -380,8 +380,8 @@
380380
var expectedValue = 50;
381381
helper.moveMouseToValue(expectedValue);
382382
expect(helper.scope.slider.min).to.equal(expectedValue);
383-
helper.slider.positionTrackingHandle.called.should.be.true;
384-
helper.slider.callOnChange.called.should.be.true;
383+
expect(helper.slider.positionTrackingHandle.callCount).to.equal(1);
384+
expect(helper.slider.callOnChange.callCount).to.equal(1);
385385
});
386386

387387
it('should handle click and drag on maxH correctly when mouse is on the middle', function() {
@@ -391,8 +391,8 @@
391391
var expectedValue = 50;
392392
helper.moveMouseToValue(expectedValue);
393393
expect(helper.scope.slider.max).to.equal(expectedValue);
394-
helper.slider.positionTrackingHandle.called.should.be.true;
395-
helper.slider.callOnChange.called.should.be.true;
394+
expect(helper.slider.positionTrackingHandle.callCount).to.equal(1);
395+
expect(helper.slider.callOnChange.callCount).to.equal(1);
396396
});
397397

398398
it('should handle click and drag on minH and switch min/max if needed', function() {
@@ -471,9 +471,9 @@
471471
expect(helper.scope.slider.min).to.equal(expectedValue);
472472
expect(helper.slider.tracking).to.equal('lowValue');
473473
helper.slider.focusElement.calledWith(helper.slider.minH).should.be.true;
474-
helper.slider.positionTrackingHandle.called.should.be.true;
475-
helper.slider.callOnStart.called.should.be.true;
476-
helper.slider.callOnChange.called.should.be.true;
474+
expect(helper.slider.positionTrackingHandle.callCount).to.equal(1);
475+
expect(helper.slider.callOnStart.callCount).to.equal(1);
476+
expect(helper.slider.callOnChange.callCount).to.equal(1);
477477
});
478478

479479
it('should handle click on fullbar and move maxH when click pos is nearer to maxH', function() {
@@ -490,9 +490,9 @@
490490
expect(helper.scope.slider.max).to.equal(expectedValue);
491491
expect(helper.slider.tracking).to.equal('highValue');
492492
helper.slider.focusElement.calledWith(helper.slider.maxH).should.be.true;
493-
helper.slider.positionTrackingHandle.called.should.be.true;
494-
helper.slider.callOnStart.called.should.be.true;
495-
helper.slider.callOnChange.called.should.be.true;
493+
expect(helper.slider.positionTrackingHandle.callCount).to.equal(1);
494+
expect(helper.slider.callOnStart.callCount).to.equal(1);
495+
expect(helper.slider.callOnChange.callCount).to.equal(1);
496496
});
497497

498498
it('should handle click on selbar and move minH when click pos is nearer to minH', function() {
@@ -509,9 +509,9 @@
509509
expect(helper.scope.slider.min).to.equal(expectedValue);
510510
expect(helper.slider.tracking).to.equal('lowValue');
511511
helper.slider.focusElement.calledWith(helper.slider.minH).should.be.true;
512-
helper.slider.positionTrackingHandle.called.should.be.true;
513-
helper.slider.callOnStart.called.should.be.true;
514-
helper.slider.callOnChange.called.should.be.true;
512+
expect(helper.slider.positionTrackingHandle.callCount).to.equal(1);
513+
expect(helper.slider.callOnStart.callCount).to.equal(1);
514+
expect(helper.slider.callOnChange.callCount).to.equal(1);
515515
});
516516

517517
it('should handle click on selbar and move maxH when click pos is nearer to maxH', function() {
@@ -528,10 +528,9 @@
528528
expect(helper.scope.slider.max).to.equal(expectedValue);
529529
expect(helper.slider.tracking).to.equal('highValue');
530530
helper.slider.focusElement.calledWith(helper.slider.maxH).should.be.true;
531-
helper.slider.positionTrackingHandle.called.should.be.true;
532-
helper.slider.callOnStart.called.should.be.true;
533-
helper.slider.callOnChange.called.should.be.true;
531+
expect(helper.slider.positionTrackingHandle.callCount).to.equal(1);
532+
expect(helper.slider.callOnStart.callCount).to.equal(1);
533+
expect(helper.slider.callOnChange.callCount).to.equal(1);
534534
});
535535
});
536536
}());
537-

0 commit comments

Comments
 (0)