jasmine-core 2.0.0 → 2.1.0

data/lib/jasmine-core/spec/core/MockDateSpec.js

@@ -0,0 +1,200 @@
+describe("FakeDate", function() {
+  it("does not fail if no global date is found", function() {
+    var fakeGlobal = {},
+      mockDate = new j$.MockDate(fakeGlobal);
+
+    expect(function() {
+      mockDate.install();
+      mockDate.tick(0);
+      mockDate.uninstall();
+    }).not.toThrow();
+  });
+
+  it("replaces the global Date when it is installed", function() {
+    var globalDate = jasmine.createSpy("global Date").and.callFake(function() {
+        return {
+          getTime: function() {}
+        }
+      }),
+      fakeGlobal = { Date: globalDate },
+      mockDate = new j$.MockDate(fakeGlobal);
+
+    expect(fakeGlobal.Date).toEqual(globalDate);
+    mockDate.install();
+
+    expect(fakeGlobal.Date).not.toEqual(globalDate);
+  });
+
+  it("replaces the global Date on uninstall", function() {
+    var globalDate = jasmine.createSpy("global Date").and.callFake(function() {
+        return {
+          getTime: function() {}
+        }
+      }),
+      fakeGlobal = { Date: globalDate },
+      mockDate = new j$.MockDate(fakeGlobal);
+
+    mockDate.install();
+    mockDate.uninstall();
+
+    expect(fakeGlobal.Date).toEqual(globalDate);
+  });
+
+  it("takes the current time as the base when installing without parameters", function() {
+    var globalDate = jasmine.createSpy("global Date").and.callFake(function() {
+        return {
+          getTime: function() {
+            return 1000;
+          }
+        }
+      }),
+      fakeGlobal = { Date: globalDate },
+      mockDate = new j$.MockDate(fakeGlobal);
+
+    mockDate.install();
+
+    globalDate.calls.reset();
+    new fakeGlobal.Date();
+    expect(globalDate).toHaveBeenCalledWith(1000);
+  });
+
+  it("can accept a date as time base when installing", function() {
+    var fakeGlobal = { Date: Date },
+      mockDate = new j$.MockDate(fakeGlobal),
+      baseDate = new Date();
+
+    spyOn(baseDate, 'getTime').and.returnValue(123);
+    mockDate.install(baseDate);
+
+    expect(new fakeGlobal.Date().getTime()).toEqual(123);
+  });
+
+  it("makes real dates", function() {
+    var fakeGlobal = { Date: Date },
+      mockDate = new j$.MockDate(fakeGlobal);
+
+    mockDate.install();
+    expect(new fakeGlobal.Date()).toEqual(jasmine.any(Date));
+    expect(new fakeGlobal.Date() instanceof fakeGlobal.Date).toBe(true);
+  });
+
+  it("fakes current time when using Date.now()", function() {
+    var globalDate = jasmine.createSpy("global Date").and.callFake(function() {
+        return {
+          getTime: function() {
+            return 1000;
+          }
+        }
+      }),
+      fakeGlobal = { Date: globalDate };
+
+    globalDate.now = function() {};
+    var mockDate = new j$.MockDate(fakeGlobal);
+
+    mockDate.install();
+
+    expect(fakeGlobal.Date.now()).toEqual(1000);
+  });
+
+  it("does not stub Date.now() if it doesn't already exist", function() {
+    var globalDate = jasmine.createSpy("global Date").and.callFake(function() {
+        return {
+          getTime: function() {
+            return 1000;
+          }
+        }
+      }),
+      fakeGlobal = { Date: globalDate },
+      mockDate = new j$.MockDate(fakeGlobal);
+
+    mockDate.install();
+
+    expect(fakeGlobal.Date.now).toThrowError("Browser does not support Date.now()");
+  });
+
+  it("makes time passes using tick", function() {
+    var globalDate = jasmine.createSpy("global Date").and.callFake(function() {
+        return {
+          getTime: function() {
+            return 1000;
+          }
+        }
+      }),
+      fakeGlobal = { Date: globalDate };
+
+    globalDate.now = function() {};
+    var mockDate = new j$.MockDate(fakeGlobal);
+
+    mockDate.install();
+
+    mockDate.tick(100);
+
+    expect(fakeGlobal.Date.now()).toEqual(1100);
+
+    mockDate.tick(1000);
+
+    expect(fakeGlobal.Date.now()).toEqual(2100);
+  });
+
+  it("allows to increase 0 milliseconds using tick", function() {
+    var globalDate = jasmine.createSpy("global Date").and.callFake(function() {
+        return {
+          getTime: function() {
+            return 1000;
+          }
+        }
+      }),
+      fakeGlobal = { Date: globalDate };
+
+    globalDate.now = function() {};
+    var mockDate = new j$.MockDate(fakeGlobal);
+
+    mockDate.install();
+
+    mockDate.tick(0);
+    expect(fakeGlobal.Date.now()).toEqual(1000);
+
+    mockDate.tick();
+    expect(fakeGlobal.Date.now()).toEqual(1000);
+  });
+
+  it("allows creation of a Date in a different time than the mocked time", function() {
+    var fakeGlobal = { Date: Date },
+      mockDate = new j$.MockDate(fakeGlobal);
+
+    mockDate.install();
+
+    var otherDate = new fakeGlobal.Date(2013, 9, 23, 0, 0, 1, 0);
+    expect(otherDate.getTime()).toEqual(new Date(2013, 9, 23, 0, 0, 1, 0).getTime());
+  });
+
+  it("allows creation of a Date that isn't fully specified", function() {
+    var fakeGlobal = { Date: Date },
+      mockDate = new j$.MockDate(fakeGlobal);
+
+    mockDate.install();
+
+    var otherDate = new fakeGlobal.Date(2013, 9, 23);
+    expect(otherDate.getTime()).toEqual(new Date(2013, 9, 23).getTime());
+  });
+
+  it('allows creation of a Date with millis', function() {
+    var fakeGlobal = { Date: Date },
+      mockDate = new j$.MockDate(fakeGlobal),
+      now = new Date(2014, 3, 15).getTime();
+
+    mockDate.install();
+
+    var otherDate = new fakeGlobal.Date(now);
+    expect(otherDate.getTime()).toEqual(now);
+  });
+
+  it("copies all Date properties to the mocked date", function() {
+    var fakeGlobal = { Date: Date },
+      mockDate = new j$.MockDate(fakeGlobal);
+
+    mockDate.install();
+
+    expect(fakeGlobal.Date.UTC(2013, 9, 23)).toEqual(Date.UTC(2013, 9, 23));
+  });
+});

data/lib/jasmine-core/spec/core/ObjectContainingSpec.js

@@ -61,4 +61,10 @@ describe("ObjectContaining", function() {
 
     expect(containing.jasmineToString()).toMatch("<jasmine.objectContaining");
   });
+
+  it("matches recursively", function() {
+    var containing = new j$.ObjectContaining({one: new j$.ObjectContaining({two: {}})});
+
+    expect(containing.jasmineMatches({one: {two: {}}})).toBe(true);
+  });
 });

data/lib/jasmine-core/spec/core/PrettyPrintSpec.js

@@ -11,6 +11,7 @@ describe("j$.pp", function () {
     expect(j$.pp(jasmine.undefined)).toEqual("undefined");
     expect(j$.pp(3)).toEqual("3");
     expect(j$.pp(-3.14)).toEqual("-3.14");
+    expect(j$.pp(-0)).toEqual("-0");
   });
 
   it("should stringify arrays properly", function() {
@@ -25,11 +26,16 @@ describe("j$.pp", function () {
     expect(j$.pp(array1)).toEqual("[ 1, 2, [ <circular reference: Array> ] ]");
   });
 
+  it("should not indicate circular references incorrectly", function() {
+    var array = [ [1] ];
+    expect(j$.pp(array)).toEqual("[ [ 1 ] ]");
+  });
+
   it("should stringify objects properly", function() {
-    expect(j$.pp({foo: 'bar'})).toEqual("{ foo : 'bar' }");
-    expect(j$.pp({foo:'bar', baz:3, nullValue: null, undefinedValue: jasmine.undefined})).toEqual("{ foo : 'bar', baz : 3, nullValue : null, undefinedValue : undefined }");
+    expect(j$.pp({foo: 'bar'})).toEqual("{ foo: 'bar' }");
+    expect(j$.pp({foo:'bar', baz:3, nullValue: null, undefinedValue: jasmine.undefined})).toEqual("{ foo: 'bar', baz: 3, nullValue: null, undefinedValue: undefined }");
     expect(j$.pp({foo: function () {
-    }, bar: [1, 2, 3]})).toEqual("{ foo : Function, bar : [ 1, 2, 3 ] }");
+    }, bar: [1, 2, 3]})).toEqual("{ foo: Function, bar: [ 1, 2, 3 ] }");
   });
 
   it("should not include inherited properties when stringifying an object", function() {
@@ -37,7 +43,7 @@ describe("j$.pp", function () {
     SomeClass.prototype.foo = "inherited foo";
     var instance = new SomeClass();
     instance.bar = "my own bar";
-    expect(j$.pp(instance)).toEqual("{ bar : 'my own bar' }");
+    expect(j$.pp(instance)).toEqual("{ bar: 'my own bar' }");
   });
 
   it("should not recurse objects and arrays more deeply than j$.MAX_PRETTY_PRINT_DEPTH", function() {
@@ -47,21 +53,42 @@ describe("j$.pp", function () {
 
     try {
       j$.MAX_PRETTY_PRINT_DEPTH = 2;
-      expect(j$.pp(nestedObject)).toEqual("{ level1 : { level2 : Object } }");
+      expect(j$.pp(nestedObject)).toEqual("{ level1: { level2: Object } }");
       expect(j$.pp(nestedArray)).toEqual("[ 1, [ 2, Array ] ]");
 
       j$.MAX_PRETTY_PRINT_DEPTH = 3;
-      expect(j$.pp(nestedObject)).toEqual("{ level1 : { level2 : { level3 : Object } } }");
+      expect(j$.pp(nestedObject)).toEqual("{ level1: { level2: { level3: Object } } }");
       expect(j$.pp(nestedArray)).toEqual("[ 1, [ 2, [ 3, Array ] ] ]");
 
       j$.MAX_PRETTY_PRINT_DEPTH = 4;
-      expect(j$.pp(nestedObject)).toEqual("{ level1 : { level2 : { level3 : { level4 : 'leaf' } } } }");
+      expect(j$.pp(nestedObject)).toEqual("{ level1: { level2: { level3: { level4: 'leaf' } } } }");
       expect(j$.pp(nestedArray)).toEqual("[ 1, [ 2, [ 3, [ 4, 'leaf' ] ] ] ]");
     } finally {
       j$.MAX_PRETTY_PRINT_DEPTH = originalMaxDepth;
     }
   });
 
+  it("should stringify immutable circular objects", function(){
+    if(Object.freeze){
+      var frozenObject = {foo: {bar: 'baz'}};
+      frozenObject.circular = frozenObject;
+      frozenObject = Object.freeze(frozenObject);
+      expect(j$.pp(frozenObject)).toEqual("{ foo: { bar: 'baz' }, circular: <circular reference: Object> }");
+    }
+  });
+
+  it("should truncate arrays that are longer than j$.MAX_PRETTY_PRINT_ARRAY_LENGTH", function() {
+    var originalMaxLength = j$.MAX_PRETTY_PRINT_ARRAY_LENGTH;
+    var array = [1, 2, 3];
+
+    try {
+      j$.MAX_PRETTY_PRINT_ARRAY_LENGTH = 2;
+      expect(j$.pp(array)).toEqual("[ 1, 2, ... ]");
+    } finally {
+      j$.MAX_PRETTY_PRINT_ARRAY_LENGTH = originalMaxLength;
+    }
+  });
+
   it("should stringify RegExp objects properly", function() {
     expect(j$.pp(/x|y|z/)).toEqual("/x|y|z/");
   });
@@ -69,7 +96,7 @@ describe("j$.pp", function () {
   it("should indicate circular object references", function() {
     var sampleValue = {foo: 'hello'};
     sampleValue.nested = sampleValue;
-    expect(j$.pp(sampleValue)).toEqual("{ foo : 'hello', nested : <circular reference: Object> }");
+    expect(j$.pp(sampleValue)).toEqual("{ foo: 'hello', nested: <circular reference: Object> }");
   });
 
   it("should indicate getters on objects as such", function() {
@@ -81,10 +108,10 @@ describe("j$.pp", function () {
       });
     }
     if (sampleValue.__defineGetter__) {
-      expect(j$.pp(sampleValue)).toEqual("{ id : 1, calculatedValue : <getter> }");
+      expect(j$.pp(sampleValue)).toEqual("{ id: 1, calculatedValue: <getter> }");
     }
     else {
-      expect(j$.pp(sampleValue)).toEqual("{ id : 1 }");
+      expect(j$.pp(sampleValue)).toEqual("{ id: 1 }");
     }
   });
 
@@ -108,7 +135,9 @@ describe("j$.pp", function () {
         },
         env = new j$.Env();
 
-    env.spyOn(TestObject, 'someFunction');
+    var spyRegistry = new j$.SpyRegistry({currentSpies: function() {return [];}});
+
+    spyRegistry.spyOn(TestObject, 'someFunction');
     expect(j$.pp(TestObject.someFunction)).toEqual("spy on someFunction");
 
     expect(j$.pp(j$.createSpy("something"))).toEqual("spy on something");
@@ -121,5 +150,13 @@ describe("j$.pp", function () {
 
     expect(j$.pp(obj)).toEqual("strung");
   });
-});
 
+  it("should handle objects with null prototype", function() {
+    if (jasmine.getEnv().ieVersion < 9) { return; }
+
+    var obj = Object.create(null);
+    obj.foo = 'bar';
+
+    expect(j$.pp(obj)).toEqual("{ foo: 'bar' }");
+  });
+});

data/lib/jasmine-core/spec/core/QueueRunnerSpec.js

@@ -2,15 +2,15 @@ describe("QueueRunner", function() {
 
   it("runs all the functions it's passed", function() {
     var calls = [],
-      fn1 = jasmine.createSpy('fn1'),
-      fn2 = jasmine.createSpy('fn2'),
+      queueableFn1 = { fn: jasmine.createSpy('fn1') },
+      queueableFn2 = { fn: jasmine.createSpy('fn2') },
       queueRunner = new j$.QueueRunner({
-        fns: [fn1, fn2]
+        queueableFns: [queueableFn1, queueableFn2]
       });
-    fn1.and.callFake(function() {
+    queueableFn1.fn.and.callFake(function() {
       calls.push('fn1');
     });
-    fn2.and.callFake(function() {
+    queueableFn2.fn.and.callFake(function() {
       calls.push('fn2');
     });
 
@@ -20,19 +20,19 @@ describe("QueueRunner", function() {
   });
 
   it("calls each function with a consistent 'this'-- an empty object", function() {
-    var fn1 = jasmine.createSpy('fn1'),
-        fn2 = jasmine.createSpy('fn2'),
-        fn3 = function(done) { asyncContext = this; done(); },
+    var queueableFn1 = { fn: jasmine.createSpy('fn1') },
+        queueableFn2 = { fn: jasmine.createSpy('fn2') },
+        queueableFn3 = { fn: function(done) { asyncContext = this; done(); } },
         queueRunner = new j$.QueueRunner({
-          fns: [fn1, fn2, fn3]
+          queueableFns: [queueableFn1, queueableFn2, queueableFn3]
         }),
         asyncContext;
 
     queueRunner.execute();
 
-    var context = fn1.calls.first().object;
+    var context = queueableFn1.fn.calls.first().object;
     expect(context).toEqual({});
-    expect(fn2.calls.first().object).toBe(context);
+    expect(queueableFn2.fn.calls.first().object).toBe(context);
     expect(asyncContext).toBe(context);
   });
 
@@ -50,31 +50,25 @@ describe("QueueRunner", function() {
       //createSpy('asyncfn').and.callFake(function(done) {});
 
       var onComplete = jasmine.createSpy('onComplete'),
-      beforeCallback = jasmine.createSpy('beforeCallback'),
-      fnCallback = jasmine.createSpy('fnCallback'),
-      afterCallback = jasmine.createSpy('afterCallback'),
-      fn1 = function(done) {
-        beforeCallback();
-        setTimeout(function() {
-          done()
-        }, 100);
-      },
-      fn2 = function(done) {
-        fnCallback();
-        setTimeout(function() {
-          done()
-        }, 100);
-      },
-      fn3 = function(done) {
-        afterCallback();
-        setTimeout(function() {
-          done()
-        }, 100);
-      },
-      queueRunner = new j$.QueueRunner({
-        fns: [fn1, fn2, fn3],
-        onComplete: onComplete
-      });
+        beforeCallback = jasmine.createSpy('beforeCallback'),
+        fnCallback = jasmine.createSpy('fnCallback'),
+        afterCallback = jasmine.createSpy('afterCallback'),
+        queueableFn1 = { fn: function(done) {
+          beforeCallback();
+          setTimeout(done, 100);
+        } },
+        queueableFn2 = { fn: function(done) {
+          fnCallback();
+          setTimeout(done, 100);
+        } },
+        queueableFn3 = { fn: function(done) {
+          afterCallback();
+          setTimeout(done, 100);
+        } },
+        queueRunner = new j$.QueueRunner({
+          queueableFns: [queueableFn1, queueableFn2, queueableFn3],
+          onComplete: onComplete
+        });
 
       queueRunner.execute();
 
@@ -98,52 +92,182 @@ describe("QueueRunner", function() {
 
       expect(onComplete).toHaveBeenCalled();
     });
+
+    it("explicitly fails an async function with a provided fail function and moves to the next function", function() {
+      var queueableFn1 = { fn: function(done) {
+          setTimeout(function() { done.fail('foo'); }, 100);
+        } },
+        queueableFn2 = { fn: jasmine.createSpy('fn2') },
+        failFn = jasmine.createSpy('fail'),
+        queueRunner = new j$.QueueRunner({
+          queueableFns: [queueableFn1, queueableFn2],
+          fail: failFn
+        });
+
+      queueRunner.execute();
+
+      expect(failFn).not.toHaveBeenCalled();
+      expect(queueableFn2.fn).not.toHaveBeenCalled();
+
+      jasmine.clock().tick(100);
+
+      expect(failFn).toHaveBeenCalledWith('foo');
+      expect(queueableFn2.fn).toHaveBeenCalled();
+    });
+
+    it("sets a timeout if requested for asynchronous functions so they don't go on forever", function() {
+      var timeout = 3,
+        beforeFn = { fn: function(done) { }, type: 'before', timeout: function() { return timeout; } },
+        queueableFn = { fn: jasmine.createSpy('fn'), type: 'queueable' },
+        onComplete = jasmine.createSpy('onComplete'),
+        onException = jasmine.createSpy('onException'),
+        queueRunner = new j$.QueueRunner({
+          queueableFns: [beforeFn, queueableFn],
+          onComplete: onComplete,
+          onException: onException
+        });
+
+      queueRunner.execute();
+      expect(queueableFn.fn).not.toHaveBeenCalled();
+
+      jasmine.clock().tick(timeout);
+
+      expect(onException).toHaveBeenCalledWith(jasmine.any(Error));
+      expect(queueableFn.fn).toHaveBeenCalled();
+      expect(onComplete).toHaveBeenCalled();
+    });
+
+    it("by default does not set a timeout for asynchronous functions", function() {
+      var beforeFn = { fn: function(done) { } },
+        queueableFn = { fn: jasmine.createSpy('fn') },
+        onComplete = jasmine.createSpy('onComplete'),
+        onException = jasmine.createSpy('onException'),
+        queueRunner = new j$.QueueRunner({
+          queueableFns: [beforeFn, queueableFn],
+          onComplete: onComplete,
+          onException: onException,
+        });
+
+      queueRunner.execute();
+      expect(queueableFn.fn).not.toHaveBeenCalled();
+
+      jasmine.clock().tick(j$.DEFAULT_TIMEOUT_INTERVAL);
+
+      expect(onException).not.toHaveBeenCalled();
+      expect(queueableFn.fn).not.toHaveBeenCalled();
+      expect(onComplete).not.toHaveBeenCalled();
+    });
+
+    it("clears the timeout when an async function throws an exception, to prevent additional exception reporting", function() {
+       var queueableFn = { fn: function(done) { throw new Error("error!"); } },
+        onComplete = jasmine.createSpy('onComplete'),
+        onException = jasmine.createSpy('onException'),
+        queueRunner = new j$.QueueRunner({
+          queueableFns: [queueableFn],
+          onComplete: onComplete,
+          onException: onException
+        });
+
+      queueRunner.execute();
+
+      expect(onComplete).toHaveBeenCalled();
+      expect(onException).toHaveBeenCalled();
+
+      jasmine.clock().tick(j$.DEFAULT_TIMEOUT_INTERVAL);
+      expect(onException.calls.count()).toEqual(1);
+    });
+
+    it("clears the timeout when the done callback is called", function() {
+      var queueableFn = { fn: function(done) { done(); } },
+        onComplete = jasmine.createSpy('onComplete'),
+        onException = jasmine.createSpy('onException'),
+        queueRunner = new j$.QueueRunner({
+          queueableFns: [queueableFn],
+          onComplete: onComplete,
+          onException: onException
+        });
+
+      queueRunner.execute();
+
+      expect(onComplete).toHaveBeenCalled();
+
+      jasmine.clock().tick(j$.DEFAULT_TIMEOUT_INTERVAL);
+      expect(onException).not.toHaveBeenCalled();
+    });
+
+    it("only moves to the next spec the first time you call done", function() {
+      var queueableFn = { fn: function(done) {done(); done();} },
+        nextQueueableFn = { fn: jasmine.createSpy('nextFn') };
+      queueRunner = new j$.QueueRunner({
+        queueableFns: [queueableFn, nextQueueableFn]
+      });
+
+      queueRunner.execute();
+      expect(nextQueueableFn.fn.calls.count()).toEqual(1);
+    });
+
+    it("does not move to the next spec if done is called after an exception has ended the spec", function() {
+       var queueableFn = { fn: function(done) {
+         setTimeout(done, 1);
+         throw new Error('error!');
+       } },
+        nextQueueableFn = { fn: jasmine.createSpy('nextFn') };
+      queueRunner = new j$.QueueRunner({
+        queueableFns: [queueableFn, nextQueueableFn]
+      });
+
+      queueRunner.execute();
+      jasmine.clock().tick(1);
+      expect(nextQueueableFn.fn.calls.count()).toEqual(1);
+    });
   });
 
-  it("calls an exception handler when an exception is thrown in a fn", function() {
-    var fn = function() {
+  it("calls exception handlers when an exception is thrown in a fn", function() {
+    var queueableFn = { type: 'queueable',
+      fn: function() {
         throw new Error('fake error');
-      },
-      exceptionCallback = jasmine.createSpy('exception callback'),
+      } },
+      onExceptionCallback = jasmine.createSpy('on exception callback'),
       queueRunner = new j$.QueueRunner({
-        fns: [fn],
-        onException: exceptionCallback
+        queueableFns: [queueableFn],
+        onException: onExceptionCallback
       });
 
     queueRunner.execute();
 
-    expect(exceptionCallback).toHaveBeenCalledWith(jasmine.any(Error));
+    expect(onExceptionCallback).toHaveBeenCalledWith(jasmine.any(Error));
   });
 
   it("rethrows an exception if told to", function() {
-    var fn = function() {
+    var queueableFn = { fn: function() {
         throw new Error('fake error');
-      },
+      } },
       queueRunner = new j$.QueueRunner({
-        fns: [fn],
+        queueableFns: [queueableFn],
         catchException: function(e) { return false; }
       });
 
-    expect(function() { queueRunner.execute(); }).toThrow();
+    expect(function() {
+      queueRunner.execute();
+    }).toThrowError('fake error');
   });
 
   it("continues running the functions even after an exception is thrown in an async spec", function() {
-    var fn = function(done) { throw new Error("error"); },
-        nextFn = jasmine.createSpy("nextFunction");
-
-    queueRunner = new j$.QueueRunner({
-      fns: [fn, nextFn]
-    });
+    var queueableFn = { fn: function(done) { throw new Error("error"); } },
+      nextQueueableFn = { fn: jasmine.createSpy("nextFunction") },
+      queueRunner = new j$.QueueRunner({
+        queueableFns: [queueableFn, nextQueueableFn]
+      });
 
     queueRunner.execute();
-    expect(nextFn).toHaveBeenCalled();
+    expect(nextQueueableFn.fn).toHaveBeenCalled();
   });
 
   it("calls a provided complete callback when done", function() {
-    var fn = jasmine.createSpy('fn'),
+    var queueableFn = { fn: jasmine.createSpy('fn') },
       completeCallback = jasmine.createSpy('completeCallback'),
       queueRunner = new j$.QueueRunner({
-        fns: [fn],
+        queueableFns: [queueableFn],
         onComplete: completeCallback
       });
 
@@ -153,12 +277,12 @@ describe("QueueRunner", function() {
   });
 
   it("calls a provided stack clearing function when done", function() {
-    var asyncFn = function(done) { done() },
-        afterFn = jasmine.createSpy('afterFn'),
+    var asyncFn = { fn: function(done) { done() } },
+        afterFn = { fn: jasmine.createSpy('afterFn') },
         completeCallback = jasmine.createSpy('completeCallback'),
         clearStack = jasmine.createSpy('clearStack'),
         queueRunner = new j$.QueueRunner({
-          fns: [asyncFn, afterFn],
+          queueableFns: [asyncFn, afterFn],
           clearStack: clearStack,
           onComplete: completeCallback
         });
@@ -166,7 +290,7 @@ describe("QueueRunner", function() {
     clearStack.and.callFake(function(fn) { fn(); });
 
     queueRunner.execute();
-    expect(afterFn).toHaveBeenCalled();
+    expect(afterFn.fn).toHaveBeenCalled();
     expect(clearStack).toHaveBeenCalledWith(completeCallback);
   });
 });