Permalink
Browse files

Moved Fx.isPaused from 1.3 to 1.5 specs.

Updated and created configuration for 1.5 specs.
  • Loading branch information...
1 parent 882ff53 commit ec56b690ac023d8f2ea14750afc0a99dfd1814ee @ibolmo ibolmo committed with arian Dec 19, 2011
Showing with 41 additions and 17 deletions.
  1. +0 −17 Specs/1.3base/Fx/Fx.js
  2. +30 −0 Specs/1.5base/Fx/Fx.js
  3. +11 −0 Specs/Configuration.js
View
@@ -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;
View
@@ -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);
+ });
+
+});
View
@@ -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: [

0 comments on commit ec56b69

Please sign in to comment.