jasmine-core 2.4.1 → 2.5.0

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

@@ -1,20 +1,20 @@
 describe("SpyStrategy", function() {
 
   it("defaults its name to unknown", function() {
-    var spyStrategy = new j$.SpyStrategy();
+    var spyStrategy = new jasmineUnderTest.SpyStrategy();
 
     expect(spyStrategy.identity()).toEqual("unknown");
   });
 
   it("takes a name", function() {
-    var spyStrategy = new j$.SpyStrategy({name: "foo"});
+    var spyStrategy = new jasmineUnderTest.SpyStrategy({name: "foo"});
 
     expect(spyStrategy.identity()).toEqual("foo");
   });
 
   it("stubs an original function, if provided", function() {
     var originalFn = jasmine.createSpy("original"),
-        spyStrategy = new j$.SpyStrategy({fn: originalFn});
+        spyStrategy = new jasmineUnderTest.SpyStrategy({fn: originalFn});
 
     spyStrategy.exec();
 
@@ -23,7 +23,7 @@ describe("SpyStrategy", function() {
 
   it("allows an original function to be called, passed through the params and returns it's value", function() {
     var originalFn = jasmine.createSpy("original").and.returnValue(42),
-        spyStrategy = new j$.SpyStrategy({fn: originalFn}),
+        spyStrategy = new jasmineUnderTest.SpyStrategy({fn: originalFn}),
         returnValue;
 
     spyStrategy.callThrough();
@@ -36,7 +36,7 @@ describe("SpyStrategy", function() {
 
   it("can return a specified value when executed", function() {
     var originalFn = jasmine.createSpy("original"),
-        spyStrategy = new j$.SpyStrategy({fn: originalFn}),
+        spyStrategy = new jasmineUnderTest.SpyStrategy({fn: originalFn}),
         returnValue;
 
     spyStrategy.returnValue(17);
@@ -48,7 +48,7 @@ describe("SpyStrategy", function() {
 
   it("can return specified values in order specified when executed", function() {
     var originalFn = jasmine.createSpy("original"),
-        spyStrategy = new j$.SpyStrategy({fn: originalFn});
+        spyStrategy = new jasmineUnderTest.SpyStrategy({fn: originalFn});
 
     spyStrategy.returnValues('value1', 'value2', 'value3');
 
@@ -61,7 +61,7 @@ describe("SpyStrategy", function() {
 
   it("allows an exception to be thrown when executed", function() {
     var originalFn = jasmine.createSpy("original"),
-        spyStrategy = new j$.SpyStrategy({fn: originalFn});
+        spyStrategy = new jasmineUnderTest.SpyStrategy({fn: originalFn});
 
     spyStrategy.throwError(new TypeError("bar"));
 
@@ -71,7 +71,7 @@ describe("SpyStrategy", function() {
 
   it("allows a non-Error to be thrown, wrapping it into an exception when executed", function() {
     var originalFn = jasmine.createSpy("original"),
-        spyStrategy = new j$.SpyStrategy({fn: originalFn});
+        spyStrategy = new jasmineUnderTest.SpyStrategy({fn: originalFn});
 
     spyStrategy.throwError("bar");
 
@@ -82,7 +82,7 @@ describe("SpyStrategy", function() {
   it("allows a fake function to be called instead", function() {
     var originalFn = jasmine.createSpy("original"),
         fakeFn = jasmine.createSpy("fake").and.returnValue(67),
-        spyStrategy = new j$.SpyStrategy({fn: originalFn}),
+        spyStrategy = new jasmineUnderTest.SpyStrategy({fn: originalFn}),
         returnValue;
 
     spyStrategy.callFake(fakeFn);
@@ -92,10 +92,22 @@ describe("SpyStrategy", function() {
     expect(returnValue).toEqual(67);
   });
 
+  it('throws an error when a non-function is passed to callFake strategy', function() {
+    var originalFn = jasmine.createSpy('original'),
+        invalidFakes = [5, 'foo', {}, true, false, null, void 0, new Date(), /.*/];
+
+    for (var i=0; i<invalidFakes.length; i++) {
+      var invalidFake = invalidFakes[i],
+          spyStrategy = new jasmineUnderTest.SpyStrategy({fn: originalFn});
+
+      expect(function() {spyStrategy.callFake(invalidFake);}).toThrowError('Argument passed to callFake should be a function, got ' + invalidFake);
+    }
+  });
+
   it("allows a return to plan stubbing after another strategy", function() {
     var originalFn = jasmine.createSpy("original"),
         fakeFn = jasmine.createSpy("fake").and.returnValue(67),
-        spyStrategy = new j$.SpyStrategy({fn: originalFn}),
+        spyStrategy = new jasmineUnderTest.SpyStrategy({fn: originalFn}),
         returnValue;
 
     spyStrategy.callFake(fakeFn);
@@ -103,7 +115,7 @@ describe("SpyStrategy", function() {
 
     expect(originalFn).not.toHaveBeenCalled();
     expect(returnValue).toEqual(67);
-    
+
     spyStrategy.stub();
     returnValue = spyStrategy.exec();
 
@@ -113,12 +125,12 @@ describe("SpyStrategy", function() {
   it("returns the spy after changing the strategy", function(){
     var spy = {},
         spyFn = jasmine.createSpy('spyFn').and.returnValue(spy),
-        spyStrategy = new j$.SpyStrategy({getSpy: spyFn});
+        spyStrategy = new jasmineUnderTest.SpyStrategy({getSpy: spyFn});
 
     expect(spyStrategy.callThrough()).toBe(spy);
     expect(spyStrategy.returnValue()).toBe(spy);
     expect(spyStrategy.throwError()).toBe(spy);
-    expect(spyStrategy.callFake()).toBe(spy);
+    expect(spyStrategy.callFake(function() {})).toBe(spy);
     expect(spyStrategy.stub()).toBe(spy);
   });
 });

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

@@ -1,8 +1,8 @@
 describe("Suite", function() {
 
   it("keeps its id", function() {
-    var env = new j$.Env(),
-      suite = new j$.Suite({
+    var env = new jasmineUnderTest.Env(),
+      suite = new jasmineUnderTest.Suite({
         env: env,
         id: 456,
         description: "I am a suite"
@@ -11,24 +11,24 @@ describe("Suite", function() {
     expect(suite.id).toEqual(456);
   });
 
-  it("returns its full name", function() {
-    var env = new j$.Env(),
-      suite = new j$.Suite({
+  it("returns blank full name for top level suite", function() {
+    var env = new jasmineUnderTest.Env(),
+      suite = new jasmineUnderTest.Suite({
         env: env,
         description: "I am a suite"
       });
 
-    expect(suite.getFullName()).toEqual("I am a suite");
+    expect(suite.getFullName()).toEqual("");
   });
 
   it("returns its full name when it has parent suites", function() {
-    var env = new j$.Env(),
-      parentSuite = new j$.Suite({
+    var env = new jasmineUnderTest.Env(),
+      parentSuite = new jasmineUnderTest.Suite({
         env: env,
         description: "I am a parent suite",
         parentSuite: jasmine.createSpy('pretend top level suite')
       }),
-      suite = new j$.Suite({
+      suite = new jasmineUnderTest.Suite({
         env: env,
         description: "I am a suite",
         parentSuite: parentSuite
@@ -38,8 +38,8 @@ describe("Suite", function() {
   });
 
   it("adds before functions in order of needed execution", function() {
-    var env = new j$.Env(),
-      suite = new j$.Suite({
+    var env = new jasmineUnderTest.Env(),
+      suite = new jasmineUnderTest.Suite({
         env: env,
         description: "I am a suite"
       }),
@@ -53,8 +53,8 @@ describe("Suite", function() {
   });
 
   it("adds after functions in order of needed execution", function() {
-    var env = new j$.Env(),
-      suite = new j$.Suite({
+    var env = new jasmineUnderTest.Env(),
+      suite = new jasmineUnderTest.Suite({
         env: env,
         description: "I am a suite"
       }),
@@ -68,7 +68,7 @@ describe("Suite", function() {
   });
 
   it('has a status of failed if any afterAll expectations have failed', function() {
-    var suite = new j$.Suite({
+    var suite = new jasmineUnderTest.Suite({
       expectationResultFactory: function() { return 'hi'; }
     });
     suite.addChild({ result: { status: 'done' } });
@@ -78,27 +78,27 @@ describe("Suite", function() {
   });
 
   it("retrieves a result with updated status", function() {
-    var suite = new j$.Suite({});
+    var suite = new jasmineUnderTest.Suite({});
 
     expect(suite.getResult().status).toBe('finished');
   });
 
   it("retrieves a result with disabled status", function() {
-    var suite = new j$.Suite({});
+    var suite = new jasmineUnderTest.Suite({});
     suite.disable();
 
     expect(suite.getResult().status).toBe('disabled');
   });
 
   it("retrieves a result with pending status", function() {
-    var suite = new j$.Suite({});
+    var suite = new jasmineUnderTest.Suite({});
     suite.pend();
 
     expect(suite.getResult().status).toBe('pending');
   });
 
   it("priviledges a disabled status over pending status", function() {
-    var suite = new j$.Suite({});
+    var suite = new jasmineUnderTest.Suite({});
     suite.disable();
     suite.pend();
 
@@ -106,20 +106,20 @@ describe("Suite", function() {
   });
 
   it("is executable if not disabled", function() {
-    var suite = new j$.Suite({});
+    var suite = new jasmineUnderTest.Suite({});
 
     expect(suite.isExecutable()).toBe(true);
   });
 
   it("is not executable if disabled", function() {
-    var suite = new j$.Suite({});
+    var suite = new jasmineUnderTest.Suite({});
     suite.disable();
 
     expect(suite.isExecutable()).toBe(false);
   });
 
   it("tells all children about expectation failures, even if one throws", function() {
-    var suite = new j$.Suite({}),
+    var suite = new jasmineUnderTest.Suite({}),
       child1 = { addExpectationResult: jasmine.createSpy('child1#expectationResult'), result: {} },
       child2 = { addExpectationResult: jasmine.createSpy('child2#expectationResult'), result: {} };
 
@@ -135,7 +135,7 @@ describe("Suite", function() {
   });
 
   it("throws an ExpectationFailed when receiving a failed expectation in an afterAll when throwOnExpectationFailure is set", function() {
-    var suite = new j$.Suite({
+    var suite = new jasmineUnderTest.Suite({
       expectationResultFactory: function(data) { return data; },
       throwOnExpectationFailure: true
     });
@@ -143,17 +143,17 @@ describe("Suite", function() {
 
     expect(function() {
       suite.addExpectationResult(false, 'failed');
-    }).toThrowError(j$.errors.ExpectationFailed);
+    }).toThrowError(jasmineUnderTest.errors.ExpectationFailed);
 
     expect(suite.status()).toBe('failed');
     expect(suite.result.failedExpectations).toEqual(['failed']);
   });
 
   it("does not add an additional failure when an expectation fails in an afterAll", function(){
-    var suite = new j$.Suite({});
+    var suite = new jasmineUnderTest.Suite({});
     suite.addChild({ result: { status: 'done' } });
 
-    suite.onException(new j$.errors.ExpectationFailed());
+    suite.onException(new jasmineUnderTest.errors.ExpectationFailed());
 
     expect(suite.getResult().failedExpectations).toEqual([]);
   })

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

@@ -1,7 +1,7 @@
 describe("Timer", function() {
   it("reports the time elapsed", function() {
     var fakeNow = jasmine.createSpy('fake Date.now'),
-        timer = new j$.Timer({now: fakeNow});
+        timer = new jasmineUnderTest.Timer({now: fakeNow});
 
     fakeNow.and.returnValue(100);
     timer.start();
@@ -22,7 +22,7 @@ describe("Timer", function() {
     });
 
     it("does not throw even though Date was taken away", function() {
-      var timer = new j$.Timer();
+      var timer = new jasmineUnderTest.Timer();
 
       expect(timer.start).not.toThrow();
       expect(timer.elapsed()).toEqual(jasmine.any(Number));

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

@@ -30,7 +30,7 @@ describe("TreeProcessor", function() {
 
   it("processes a single executable leaf", function() {
     var leaf = new Leaf(),
-        processor = new j$.TreeProcessor({ tree: leaf, runnableIds: [leaf.id] }),
+        processor = new jasmineUnderTest.TreeProcessor({ tree: leaf, runnableIds: [leaf.id] }),
         result = processor.processTree();
 
     expect(result.valid).toBe(true);
@@ -43,7 +43,7 @@ describe("TreeProcessor", function() {
 
   it("processes a single non-executable leaf", function() {
     var leaf = new Leaf({ executable: false }),
-        processor = new j$.TreeProcessor({ tree: leaf, runnableIds: [leaf.id] }),
+        processor = new jasmineUnderTest.TreeProcessor({ tree: leaf, runnableIds: [leaf.id] }),
         result = processor.processTree();
 
     expect(result.valid).toBe(true);
@@ -56,7 +56,7 @@ describe("TreeProcessor", function() {
 
   it("processes a single non-specified leaf", function() {
     var leaf = new Leaf(),
-        processor = new j$.TreeProcessor({ tree: leaf, runnableIds: [] }),
+        processor = new jasmineUnderTest.TreeProcessor({ tree: leaf, runnableIds: [] }),
         result = processor.processTree();
 
     expect(result.valid).toBe(true);
@@ -70,7 +70,7 @@ describe("TreeProcessor", function() {
   it("processes a tree with a single leaf with the root specified", function() {
     var leaf = new Leaf(),
         parent = new Node({ children: [leaf] }),
-        processor = new j$.TreeProcessor({ tree: parent, runnableIds: [parent.id] }),
+        processor = new jasmineUnderTest.TreeProcessor({ tree: parent, runnableIds: [parent.id] }),
         result = processor.processTree();
 
     expect(result.valid).toBe(true);
@@ -89,7 +89,7 @@ describe("TreeProcessor", function() {
   it("processes a tree with a single non-executable leaf, with the root specified", function() {
     var leaf = new Leaf({ executable: false }),
         parent = new Node({ children: [leaf] }),
-        processor = new j$.TreeProcessor({ tree: parent, runnableIds: [parent.id] }),
+        processor = new jasmineUnderTest.TreeProcessor({ tree: parent, runnableIds: [parent.id] }),
         result = processor.processTree();
 
     expect(result.valid).toBe(true);
@@ -113,7 +113,7 @@ describe("TreeProcessor", function() {
         childOfDisabled = new Leaf({ executable: true }),
         disabledNode = new Node({ executable: false, children: [childOfDisabled] }),
         root = new Node({ children: [parent, childless, disabledNode] }),
-        processor = new j$.TreeProcessor({ tree: root, runnableIds: [root.id] }),
+        processor = new jasmineUnderTest.TreeProcessor({ tree: root, runnableIds: [root.id] }),
         result = processor.processTree();
 
     expect(result.valid).toBe(true);
@@ -160,7 +160,7 @@ describe("TreeProcessor", function() {
         leaf3 = new Leaf(),
         reentered = new Node({ noReenter: true, children: [leaf1, leaf2] }),
         root = new Node({ children: [reentered, leaf3] }),
-        processor = new j$.TreeProcessor({ tree: root, runnableIds: [leaf1.id, leaf3.id, leaf2.id] }),
+        processor = new jasmineUnderTest.TreeProcessor({ tree: root, runnableIds: [leaf1.id, leaf3.id, leaf2.id] }),
         result = processor.processTree();
 
     expect(result).toEqual({ valid: false });
@@ -172,7 +172,7 @@ describe("TreeProcessor", function() {
         leaf3 = new Leaf(),
         reentered = new Node({ children: [leaf1, leaf2] }),
         root = new Node({ children: [reentered, leaf3] }),
-        processor = new j$.TreeProcessor({ tree: root, runnableIds: [leaf1.id, leaf3.id, leaf2.id] }),
+        processor = new jasmineUnderTest.TreeProcessor({ tree: root, runnableIds: [leaf1.id, leaf3.id, leaf2.id] }),
         result = processor.processTree();
 
     expect(result.valid).toBe(true);
@@ -184,7 +184,7 @@ describe("TreeProcessor", function() {
         leaf3 = new Leaf(),
         noReentry = new Node({ noReenter: true }),
         root = new Node({ children: [noReentry] }),
-        processor = new j$.TreeProcessor({ tree: root, runnableIds: [leaf2.id, leaf1.id, leaf3.id] }),
+        processor = new jasmineUnderTest.TreeProcessor({ tree: root, runnableIds: [leaf2.id, leaf1.id, leaf3.id] }),
         result = processor.processTree();
 
     expect(result.valid).toBe(true);
@@ -194,7 +194,7 @@ describe("TreeProcessor", function() {
     var leaf1 = new Leaf(),
         noReentry = new Node({ noReenter: true }),
         root = new Node({ children: [noReentry] }),
-        processor = new j$.TreeProcessor({ tree: root, runnableIds: [root.id] }),
+        processor = new jasmineUnderTest.TreeProcessor({ tree: root, runnableIds: [root.id] }),
         result = processor.processTree();
 
     expect(result.valid).toBe(true);
@@ -204,7 +204,7 @@ describe("TreeProcessor", function() {
     var leaf = new Leaf(),
         node = new Node({ children: [leaf], userContext: { root: 'context' } }),
         queueRunner = jasmine.createSpy('queueRunner'),
-        processor = new j$.TreeProcessor({ tree: node, runnableIds: [leaf.id], queueRunnerFactory: queueRunner }),
+        processor = new jasmineUnderTest.TreeProcessor({ tree: node, runnableIds: [leaf.id], queueRunnerFactory: queueRunner }),
         treeComplete = jasmine.createSpy('treeComplete');
 
     processor.execute(treeComplete);
@@ -227,7 +227,7 @@ describe("TreeProcessor", function() {
         nodeStart = jasmine.createSpy('nodeStart'),
         nodeComplete = jasmine.createSpy('nodeComplete'),
         queueRunner = jasmine.createSpy('queueRunner'),
-        processor = new j$.TreeProcessor({
+        processor = new jasmineUnderTest.TreeProcessor({
           tree: root,
           runnableIds: [node.id],
           nodeStart: nodeStart,
@@ -269,7 +269,7 @@ describe("TreeProcessor", function() {
         node = new Node({ children: [leaf1, leaf2] }),
         root = new Node({ children: [node] }),
         queueRunner = jasmine.createSpy('queueRunner'),
-        processor = new j$.TreeProcessor({
+        processor = new jasmineUnderTest.TreeProcessor({
           tree: root,
           runnableIds: [node.id],
           queueRunnerFactory: queueRunner
@@ -298,7 +298,7 @@ describe("TreeProcessor", function() {
         queueRunner = jasmine.createSpy('queueRunner'),
         nodeStart = jasmine.createSpy('nodeStart'),
         nodeComplete = jasmine.createSpy('nodeComplete'),
-        processor = new j$.TreeProcessor({
+        processor = new jasmineUnderTest.TreeProcessor({
           tree: root,
           runnableIds: [node.id],
           queueRunnerFactory: queueRunner,
@@ -334,7 +334,7 @@ describe("TreeProcessor", function() {
         }),
         root = new Node({ children: [node] }),
         queueRunner = jasmine.createSpy('queueRunner'),
-        processor = new j$.TreeProcessor({
+        processor = new jasmineUnderTest.TreeProcessor({
           tree: root,
           runnableIds: [node.id],
           queueRunnerFactory: queueRunner
@@ -359,7 +359,7 @@ describe("TreeProcessor", function() {
         }),
         root = new Node({ children: [node] }),
         queueRunner = jasmine.createSpy('queueRunner'),
-        processor = new j$.TreeProcessor({
+        processor = new jasmineUnderTest.TreeProcessor({
           tree: root,
           runnableIds: [node.id],
           queueRunnerFactory: queueRunner
@@ -383,7 +383,7 @@ describe("TreeProcessor", function() {
         }),
         root = new Node({ children: [node] }),
         queueRunner = jasmine.createSpy('queueRunner'),
-        processor = new j$.TreeProcessor({
+        processor = new jasmineUnderTest.TreeProcessor({
           tree: root,
           runnableIds: [node.id],
           queueRunnerFactory: queueRunner
@@ -410,7 +410,7 @@ describe("TreeProcessor", function() {
         }),
         root = new Node({ children: [node] }),
         queueRunner = jasmine.createSpy('queueRunner'),
-        processor = new j$.TreeProcessor({
+        processor = new jasmineUnderTest.TreeProcessor({
           tree: root,
           runnableIds: [node.id],
           queueRunnerFactory: queueRunner
@@ -432,7 +432,7 @@ describe("TreeProcessor", function() {
         leaf2 = new Leaf(),
         root = new Node({ children: [leaf1, leaf2] }),
         queueRunner = jasmine.createSpy('queueRunner'),
-        processor = new j$.TreeProcessor({
+        processor = new jasmineUnderTest.TreeProcessor({
           tree: root,
           runnableIds: [leaf2.id, leaf1.id],
           queueRunnerFactory: queueRunner
@@ -456,7 +456,7 @@ describe("TreeProcessor", function() {
         nonSpecified = new Leaf(),
         root = new Node({ children: [nonSpecified, specified] }),
         queueRunner = jasmine.createSpy('queueRunner'),
-        processor = new j$.TreeProcessor({
+        processor = new jasmineUnderTest.TreeProcessor({
           tree: root,
           runnableIds: [specified.id],
           queueRunnerFactory: queueRunner
@@ -481,7 +481,7 @@ describe("TreeProcessor", function() {
         specifiedNode = new Node({ children: [childLeaf] }),
         root = new Node({ children: [specifiedLeaf, specifiedNode] }),
         queueRunner = jasmine.createSpy('queueRunner'),
-        processor = new j$.TreeProcessor({
+        processor = new jasmineUnderTest.TreeProcessor({
           tree: root,
           runnableIds: [specifiedNode.id, specifiedLeaf.id],
           queueRunnerFactory: queueRunner
@@ -511,7 +511,7 @@ describe("TreeProcessor", function() {
         reentered = new Node({ children: [leaf1, leaf2, leaf3] }),
         root = new Node({ children: [reentered, leaf4, leaf5] }),
         queueRunner = jasmine.createSpy('queueRunner'),
-        processor = new j$.TreeProcessor({
+        processor = new jasmineUnderTest.TreeProcessor({
           tree: root,
           runnableIds: [leaf1.id, leaf4.id, leaf2.id, leaf5.id, leaf3.id],
           queueRunnerFactory: queueRunner
@@ -555,7 +555,7 @@ describe("TreeProcessor", function() {
         grandparent = new Node({ children: [parent] }),
         root = new Node({ children: [grandparent, leaf4, leaf5] }),
         queueRunner = jasmine.createSpy('queueRunner'),
-        processor = new j$.TreeProcessor({
+        processor = new jasmineUnderTest.TreeProcessor({
           tree: root,
           runnableIds: [leaf1.id, leaf4.id, leaf2.id, leaf5.id, leaf3.id],
           queueRunnerFactory: queueRunner
@@ -609,7 +609,7 @@ describe("TreeProcessor", function() {
         parent = new Node({ children: [leaf2, leaf3] }),
         root = new Node({ children: [leaf1, parent] }),
         queueRunner = jasmine.createSpy('queueRunner'),
-        processor = new j$.TreeProcessor({
+        processor = new jasmineUnderTest.TreeProcessor({
           tree: root,
           runnableIds: [root.id],
           queueRunnerFactory: queueRunner
@@ -647,7 +647,7 @@ describe("TreeProcessor", function() {
         leaf11 = new Leaf(),
         root = new Node({ children: [leaf1, leaf2, leaf3, leaf4, leaf5, leaf6, leaf7, leaf8, leaf9, leaf10, leaf11] }),
         queueRunner = jasmine.createSpy('queueRunner'),
-        processor = new j$.TreeProcessor({
+        processor = new jasmineUnderTest.TreeProcessor({
           tree: root,
           runnableIds: [root.id],
           queueRunnerFactory: queueRunner
@@ -705,7 +705,7 @@ describe("TreeProcessor", function() {
         leaf11 = new Leaf(),
         root = new Node({ children: [leaf1, leaf2, leaf3, leaf4, leaf5, leaf6, leaf7, leaf8, leaf9, leaf10, leaf11] }),
         queueRunner = jasmine.createSpy('queueRunner'),
-        processor = new j$.TreeProcessor({
+        processor = new jasmineUnderTest.TreeProcessor({
           tree: root,
           runnableIds: [root.id],
           queueRunnerFactory: queueRunner,