Skip to content

Commit

Permalink
Moved Fx.isPaused from 1.3 to 1.5 specs.
Browse files Browse the repository at this point in the history
Updated and created configuration for 1.5 specs.
  • Loading branch information
ibolmo authored and arian committed Sep 1, 2012
1 parent 882ff53 commit ec56b69
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 17 deletions.
17 changes: 0 additions & 17 deletions Specs/1.3base/Fx/Fx.js
Expand Up @@ -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(){ it('should chain the Fx', function(){


var counter = 0; var counter = 0;
Expand Down
30 changes: 30 additions & 0 deletions 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);
});

});
11 changes: 11 additions & 0 deletions Specs/Configuration.js
Expand Up @@ -33,6 +33,10 @@ Configuration.presets = {
sets: ['core-1.3-base', 'core-1.3-client', 'core-1.4-base-nocompat', 'core-1.4-client'], sets: ['core-1.3-base', 'core-1.3-client', 'core-1.4-base-nocompat', 'core-1.4-client'],
source: ['1.4nocompat'] 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': { 'core-2.0': {
sets: ['core-2.0-base', 'core-2.0-client'], sets: ['core-2.0-base', 'core-2.0-client'],
source: ['core-2.0-base', 'core-2.0-client'] source: ['core-2.0-base', 'core-2.0-client']
Expand Down Expand Up @@ -117,6 +121,13 @@ Configuration.sets = {
] ]
}, },


'core-1.5-base': {
path: '1.5base/',
files: [
'Fx/Fx'
]
},

'core-2.0-base': { 'core-2.0-base': {
path: '2.0base/', path: '2.0base/',
files: [ files: [
Expand Down

0 comments on commit ec56b69

Please sign in to comment.