From e46de301f59335f7c6e8a17208751334faa79119 Mon Sep 17 00:00:00 2001 From: Francisco Dans Date: Wed, 5 Aug 2015 14:27:29 +0200 Subject: [PATCH] reduces posibility of race condition --- test/animator.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/test/animator.js b/test/animator.js index c3a6fde..91502b9 100644 --- a/test/animator.js +++ b/test/animator.js @@ -4,17 +4,17 @@ require('phantomjs-polyfill'); test('time moves', function(assert) { var done = assert.async(); - var animator = new torque.Animator(function(){}, {steps: 500, animationDuration: 10}); + var animator = new torque.Animator(function(){}, {steps: 500, animationDuration: 2}); animator.start(); setTimeout(function(){ assert.notEqual(animator._time, 0); done(); - }, 100) + }, 20) animator.pause(); }); test("rescale should resume animation if previously playing", function(assert){ - var animator = new torque.Animator(function(){}, {steps: 500, animationDuration: 10}); + var animator = new torque.Animator(function(){}, {steps: 500, animationDuration: 2}); animator.toggle(); animator.rescale(); assert.ok(animator.running); @@ -22,14 +22,14 @@ test("rescale should resume animation if previously playing", function(assert){ }); test("rescale shouldn't resume animation if previously paused", function(assert){ - var animator = new torque.Animator(function(){}, {steps: 500, animationDuration: 10}); + var animator = new torque.Animator(function(){}, {steps: 500, animationDuration: 2}); animator.pause(); animator.rescale(); assert.notOk(animator.running); }); test("onStart runs properly", function(assert){ - var animator = new torque.Animator(function(){}, {steps: 500, animationDuration: 10}); + var animator = new torque.Animator(function(){}, {steps: 500, animationDuration: 2}); animator.options.onStop = function(){ assert.ok(true); animator.pause(); @@ -38,13 +38,13 @@ test("onStart runs properly", function(assert){ }); test("stop should take the pointer to position zero", function(assert){ - var animator = new torque.Animator(function(){}, {steps: 500, animationDuration: 10}); + var animator = new torque.Animator(function(){}, {steps: 500, animationDuration: 2}); animator.stop() assert.equal(animator._time, 0); }); test("stop should call onStop", function(assert){ - var animator = new torque.Animator(function(){}, {steps: 500, animationDuration: 10}); + var animator = new torque.Animator(function(){}, {steps: 500, animationDuration: 2}); animator.options.onStop = function(){ assert.ok(true); animator.pause(); @@ -53,7 +53,7 @@ test("stop should call onStop", function(assert){ }); test("altering steps should rescale", function(assert){ - var animator = new torque.Animator(function(){}, {steps: 500, animationDuration: 10}); + var animator = new torque.Animator(function(){}, {steps: 500, animationDuration: 2}); sinon.spy(animator, "rescale"); animator.steps(600); assert.ok(animator.rescale.calledOnce); @@ -61,19 +61,19 @@ test("altering steps should rescale", function(assert){ test("tick should set time to zero if steps are bigger than range", function(assert){ var done = assert.async(); - var animator = new torque.Animator(function(){}, {steps: 500, animationDuration: 10}); + var animator = new torque.Animator(function(){}, {steps: 500, animationDuration: 2}); animator.start(); setTimeout(function(){ animator._time = 0; animator.step(800); assert.ok(animator.step() < 800); done(); - }, 200); + }, 20); animator.pause(); }); test("tick should pause animation on end if loop is disabled", function(assert){ - var animator = new torque.Animator(function(){}, {steps: 500, animationDuration: 10}); + var animator = new torque.Animator(function(){}, {steps: 500, animationDuration: 2}); animator.options.loop = false; animator.toggle(); animator.step(600);