From ec56b690ac023d8f2ea14750afc0a99dfd1814ee Mon Sep 17 00:00:00 2001 From: Olmo Maldonado Date: Sun, 18 Dec 2011 23:33:36 -0600 Subject: [PATCH] Moved Fx.isPaused from 1.3 to 1.5 specs. Updated and created configuration for 1.5 specs. --- Specs/1.3base/Fx/Fx.js | 17 ----------------- Specs/1.5base/Fx/Fx.js | 30 ++++++++++++++++++++++++++++++ Specs/Configuration.js | 11 +++++++++++ 3 files changed, 41 insertions(+), 17 deletions(-) create mode 100644 Specs/1.5base/Fx/Fx.js diff --git a/Specs/1.3base/Fx/Fx.js b/Specs/1.3base/Fx/Fx.js index e1b48b5c..eedd5e67 100644 --- a/Specs/1.3base/Fx/Fx.js +++ b/Specs/1.3base/Fx/Fx.js @@ -118,23 +118,6 @@ describe('Fx', function(){ }); - it('should return the paused state', function(){ - var fx = new Fx({ - duration: 50 - }).start(); - - expect(fx.isPaused()).toEqual(false); - - this.clock.tick(30); - fx.pause(); - - expect(fx.isPaused()).toEqual(true); - - fx.resume(); - this.clock.tick(60); - expect(fx.isPaused()).toEqual(false); - }); - it('should chain the Fx', function(){ var counter = 0; diff --git a/Specs/1.5base/Fx/Fx.js b/Specs/1.5base/Fx/Fx.js new file mode 100644 index 00000000..bc348035 --- /dev/null +++ b/Specs/1.5base/Fx/Fx.js @@ -0,0 +1,30 @@ + +describe('Fx', function(){ + + beforeEach(function(){ + this.clock = sinon.useFakeTimers(); + }); + + afterEach(function(){ + this.clock.reset(); + this.clock.restore(); + }); + + it('should return the paused state', function(){ + var fx = new Fx({ + duration: 50 + }).start(); + + expect(fx.isPaused()).toEqual(false); + + this.clock.tick(30); + fx.pause(); + + expect(fx.isPaused()).toEqual(true); + + fx.resume(); + this.clock.tick(60); + expect(fx.isPaused()).toEqual(false); + }); + +}); diff --git a/Specs/Configuration.js b/Specs/Configuration.js index ebbed55a..cea57098 100644 --- a/Specs/Configuration.js +++ b/Specs/Configuration.js @@ -33,6 +33,10 @@ Configuration.presets = { sets: ['core-1.3-base', 'core-1.3-client', 'core-1.4-base-nocompat', 'core-1.4-client'], source: ['1.4nocompat'] }, + 'core-1.5': { + sets: ['1.2', 'core-1.3-base', 'core-1.3-client', 'core-1.4-base', 'core-1.4-client', 'core-1.5-base'], + source: ['core-1.4-base', 'core-1.4-client'] + }, 'core-2.0': { sets: ['core-2.0-base', 'core-2.0-client'], source: ['core-2.0-base', 'core-2.0-client'] @@ -117,6 +121,13 @@ Configuration.sets = { ] }, + 'core-1.5-base': { + path: '1.5base/', + files: [ + 'Fx/Fx' + ] + }, + 'core-2.0-base': { path: '2.0base/', files: [ -- 2.11.4.GIT