jasmine-core 2.4.1 → 2.5.0

data/lib/jasmine-core/spec/core/matchers/toHaveBeenCalledWithSpec.js

@@ -1,10 +1,11 @@
 describe("toHaveBeenCalledWith", function() {
+
   it("passes when the actual was called with matching parameters", function() {
     var util = {
           contains: jasmine.createSpy('delegated-contains').and.returnValue(true)
         },
-        matcher = j$.matchers.toHaveBeenCalledWith(util),
-        calledSpy = j$.createSpy('called-spy'),
+        matcher = jasmineUnderTest.matchers.toHaveBeenCalledWith(util),
+        calledSpy = jasmineUnderTest.createSpy('called-spy'),
         result;
 
     calledSpy('a', 'b');
@@ -19,8 +20,8 @@ describe("toHaveBeenCalledWith", function() {
           contains: jasmine.createSpy('delegated-contains').and.returnValue(true)
         },
         customEqualityTesters = [function() { return true; }],
-        matcher = j$.matchers.toHaveBeenCalledWith(util, customEqualityTesters),
-        calledSpy = j$.createSpy('called-spy');
+        matcher = jasmineUnderTest.matchers.toHaveBeenCalledWith(util, customEqualityTesters),
+        calledSpy = jasmineUnderTest.createSpy('called-spy');
 
     calledSpy('a', 'b');
     matcher.compare(calledSpy, 'a', 'b');
@@ -32,8 +33,8 @@ describe("toHaveBeenCalledWith", function() {
     var util = {
           contains: jasmine.createSpy('delegated-contains').and.returnValue(false)
         },
-        matcher = j$.matchers.toHaveBeenCalledWith(util),
-        uncalledSpy = j$.createSpy('uncalled spy'),
+        matcher = jasmineUnderTest.matchers.toHaveBeenCalledWith(util),
+        uncalledSpy = jasmineUnderTest.createSpy('uncalled spy'),
         result;
 
     result = matcher.compare(uncalledSpy);
@@ -45,8 +46,8 @@ describe("toHaveBeenCalledWith", function() {
     var util = {
           contains: jasmine.createSpy('delegated-contains').and.returnValue(false)
         },
-        matcher = j$.matchers.toHaveBeenCalledWith(util),
-        calledSpy = j$.createSpy('called spy'),
+        matcher = jasmineUnderTest.matchers.toHaveBeenCalledWith(util),
+        calledSpy = jasmineUnderTest.createSpy('called spy'),
         result;
 
     calledSpy('a');
@@ -58,9 +59,9 @@ describe("toHaveBeenCalledWith", function() {
   });
 
   it("throws an exception when the actual is not a spy", function() {
-    var matcher = j$.matchers.toHaveBeenCalledWith(),
+    var matcher = jasmineUnderTest.matchers.toHaveBeenCalledWith(),
         fn = function() {};
 
-    expect(function() { matcher.compare(fn) }).toThrow(new Error("Expected a spy, but got Function."));
+    expect(function() { matcher.compare(fn) }).toThrowError(/Expected a spy, but got Function./);
   });
 });

data/lib/jasmine-core/spec/core/matchers/toMatchSpec.js

@@ -1,6 +1,7 @@
 describe("toMatch", function() {
+
   it("passes when RegExps are equivalent", function() {
-    var matcher = j$.matchers.toMatch(),
+    var matcher = jasmineUnderTest.matchers.toMatch(),
       result;
 
     result = matcher.compare(/foo/, /foo/);
@@ -8,7 +9,7 @@ describe("toMatch", function() {
   });
 
   it("fails when RegExps are not equivalent", function() {
-    var matcher = j$.matchers.toMatch(),
+    var matcher = jasmineUnderTest.matchers.toMatch(),
       result;
 
     result = matcher.compare(/bar/, /foo/);
@@ -16,7 +17,7 @@ describe("toMatch", function() {
   });
 
   it("passes when the actual matches the expected string as a pattern", function() {
-    var matcher = j$.matchers.toMatch(),
+    var matcher = jasmineUnderTest.matchers.toMatch(),
       result;
 
     result = matcher.compare('foosball', 'foo');
@@ -24,7 +25,7 @@ describe("toMatch", function() {
   });
 
   it("fails when the actual matches the expected string as a pattern", function() {
-    var matcher = j$.matchers.toMatch(),
+    var matcher = jasmineUnderTest.matchers.toMatch(),
       result;
 
     result = matcher.compare('bar', 'foo');
@@ -32,11 +33,11 @@ describe("toMatch", function() {
   });
 
   it("throws an Error when the expected is not a String or RegExp", function() {
-    var matcher = j$.matchers.toMatch();
+    var matcher = jasmineUnderTest.matchers.toMatch();
 
     expect(function() {
       matcher.compare('foo', { bar: 'baz' });
-    }).toThrowError('Expected is not a String or a RegExp');
+    }).toThrowError(/Expected is not a String or a RegExp/);
   });
 });
 

data/lib/jasmine-core/spec/core/matchers/toThrowErrorSpec.js

@@ -1,47 +1,47 @@
 describe("toThrowError", function() {
   it("throws an error when the actual is not a function", function() {
-    var matcher = j$.matchers.toThrowError();
+    var matcher = jasmineUnderTest.matchers.toThrowError();
 
     expect(function() {
       matcher.compare({});
-    }).toThrowError("Actual is not a Function");
+    }).toThrowError(/Actual is not a Function/);
   });
 
   it("throws an error when the expected is not an Error, string, or RegExp", function() {
-    var matcher = j$.matchers.toThrowError(),
+    var matcher = jasmineUnderTest.matchers.toThrowError(),
       fn = function() {
         throw new Error("foo");
       };
 
     expect(function() {
       matcher.compare(fn, 1);
-    }).toThrowError("Expected is not an Error, string, or RegExp.");
+    }).toThrowError(/Expected is not an Error, string, or RegExp./);
   });
 
   it("throws an error when the expected error type is not an Error", function() {
-    var matcher = j$.matchers.toThrowError(),
+    var matcher = jasmineUnderTest.matchers.toThrowError(),
       fn = function() {
         throw new Error("foo");
       };
 
     expect(function() {
       matcher.compare(fn, void 0, "foo");
-    }).toThrowError("Expected error type is not an Error.");
+    }).toThrowError(/Expected error type is not an Error./);
   });
 
   it("throws an error when the expected error message is not a string or RegExp", function() {
-    var matcher = j$.matchers.toThrowError(),
+    var matcher = jasmineUnderTest.matchers.toThrowError(),
       fn = function() {
         throw new Error("foo");
       };
 
     expect(function() {
       matcher.compare(fn, Error, 1);
-    }).toThrowError("Expected error message is not a string or RegExp.");
+    }).toThrowError(/Expected error message is not a string or RegExp./);
   });
 
   it("fails if actual does not throw at all", function() {
-    var matcher = j$.matchers.toThrowError(),
+    var matcher = jasmineUnderTest.matchers.toThrowError(),
       fn = function() {
         return true;
       },
@@ -54,7 +54,7 @@ describe("toThrowError", function() {
   });
 
   it("fails if thrown is not an instanceof Error", function() {
-    var matcher = j$.matchers.toThrowError(),
+    var matcher = jasmineUnderTest.matchers.toThrowError(),
       fn = function() {
         throw 4;
       },
@@ -66,7 +66,7 @@ describe("toThrowError", function() {
   });
 
   it("fails with the correct message if thrown is a falsy value", function() {
-    var matcher = j$.matchers.toThrowError(),
+    var matcher = jasmineUnderTest.matchers.toThrowError(),
       fn = function() {
         throw undefined;
       },
@@ -78,7 +78,7 @@ describe("toThrowError", function() {
   });
 
   it("passes if thrown is a type of Error, but there is no expected error", function() {
-    var matcher = j$.matchers.toThrowError(),
+    var matcher = jasmineUnderTest.matchers.toThrowError(),
       fn = function() {
         throw new TypeError();
       },
@@ -91,7 +91,7 @@ describe("toThrowError", function() {
   });
 
   it("passes if thrown is an Error and the expected is the same message", function() {
-    var matcher = j$.matchers.toThrowError(),
+    var matcher = jasmineUnderTest.matchers.toThrowError(),
       fn = function() {
         throw new Error("foo");
       },
@@ -104,7 +104,7 @@ describe("toThrowError", function() {
   });
 
   it("fails if thrown is an Error and the expected is not the same message", function() {
-    var matcher = j$.matchers.toThrowError(),
+    var matcher = jasmineUnderTest.matchers.toThrowError(),
       fn = function() {
         throw new Error("foo");
       },
@@ -117,7 +117,7 @@ describe("toThrowError", function() {
   });
 
   it("passes if thrown is an Error and the expected is a RegExp that matches the message", function() {
-    var matcher = j$.matchers.toThrowError(),
+    var matcher = jasmineUnderTest.matchers.toThrowError(),
       fn = function() {
         throw new Error("a long message");
       },
@@ -130,7 +130,7 @@ describe("toThrowError", function() {
   });
 
   it("fails if thrown is an Error and the expected is a RegExp that does not match the message", function() {
-    var matcher = j$.matchers.toThrowError(),
+    var matcher = jasmineUnderTest.matchers.toThrowError(),
       fn = function() {
         throw new Error("a long message");
       },
@@ -146,7 +146,7 @@ describe("toThrowError", function() {
     var util = {
         equals: jasmine.createSpy('delegated-equal').and.returnValue(true)
       },
-      matcher = j$.matchers.toThrowError(),
+      matcher = jasmineUnderTest.matchers.toThrowError(),
       fn = function() {
         throw new Error();
       },
@@ -162,7 +162,7 @@ describe("toThrowError", function() {
     var util = {
         equals: jasmine.createSpy('delegated-equal').and.returnValue(true)
       },
-      matcher = j$.matchers.toThrowError(),
+      matcher = jasmineUnderTest.matchers.toThrowError(),
       CustomError = function CustomError(arg) { arg.x },
       fn = function() {
         throw new CustomError({ x: 1 });
@@ -181,7 +181,7 @@ describe("toThrowError", function() {
     var util = {
         equals: jasmine.createSpy('delegated-equal').and.returnValue(false)
       },
-      matcher = j$.matchers.toThrowError(),
+      matcher = jasmineUnderTest.matchers.toThrowError(),
       fn = function() {
         throw new Error();
       },
@@ -197,7 +197,7 @@ describe("toThrowError", function() {
     var util = {
         equals: jasmine.createSpy('delegated-equal').and.returnValue(true)
       },
-      matcher = j$.matchers.toThrowError(),
+      matcher = jasmineUnderTest.matchers.toThrowError(),
       fn = function() {
         throw new TypeError("foo");
       },
@@ -213,7 +213,7 @@ describe("toThrowError", function() {
     var util = {
         equals: jasmine.createSpy('delegated-equal').and.returnValue(true)
       },
-      matcher = j$.matchers.toThrowError(),
+      matcher = jasmineUnderTest.matchers.toThrowError(),
       CustomError = function CustomError(arg) { this.message = arg.message },
       fn = function() {
         throw new CustomError({message: "foo"});
@@ -232,7 +232,7 @@ describe("toThrowError", function() {
     var util = {
         equals: jasmine.createSpy('delegated-equal').and.returnValue(false)
       },
-      matcher = j$.matchers.toThrowError(),
+      matcher = jasmineUnderTest.matchers.toThrowError(),
       fn = function() {
         throw new TypeError("foo");
       },
@@ -248,7 +248,7 @@ describe("toThrowError", function() {
     var util = {
         equals: jasmine.createSpy('delegated-equal').and.returnValue(true)
       },
-      matcher = j$.matchers.toThrowError(),
+      matcher = jasmineUnderTest.matchers.toThrowError(),
       fn = function() {
         throw new TypeError("foo");
       },
@@ -264,7 +264,7 @@ describe("toThrowError", function() {
     var util = {
         equals: jasmine.createSpy('delegated-equal').and.returnValue(false)
       },
-      matcher = j$.matchers.toThrowError(),
+      matcher = jasmineUnderTest.matchers.toThrowError(),
       fn = function() {
         throw new TypeError("foo");
       },

data/lib/jasmine-core/spec/core/matchers/toThrowSpec.js

@@ -1,15 +1,16 @@
 describe("toThrow", function() {
+
   it("throws an error when the actual is not a function", function() {
-    var matcher = j$.matchers.toThrow();
+    var matcher = jasmineUnderTest.matchers.toThrow();
 
     expect(function() {
       matcher.compare({});
       matcherComparator({});
-    }).toThrowError("Actual is not a Function");
+    }).toThrowError(/Actual is not a Function/);
   });
 
   it("fails if actual does not throw", function() {
-    var matcher = j$.matchers.toThrow(),
+    var matcher = jasmineUnderTest.matchers.toThrow(),
       fn = function() {
         return true;
       },
@@ -25,7 +26,7 @@ describe("toThrow", function() {
     var util = {
         equals: jasmine.createSpy('delegated-equal').and.returnValue(true)
       },
-      matcher = j$.matchers.toThrow(util),
+      matcher = jasmineUnderTest.matchers.toThrow(util),
       fn = function() {
         throw 5;
       },
@@ -38,7 +39,7 @@ describe("toThrow", function() {
   });
 
   it("passes even if what is thrown is falsy", function() {
-    var matcher = j$.matchers.toThrow(),
+    var matcher = jasmineUnderTest.matchers.toThrow(),
       fn = function() {
         throw undefined;
       },
@@ -53,7 +54,7 @@ describe("toThrow", function() {
     var util = {
         equals: jasmine.createSpy('delegated-equal').and.returnValue(true)
       },
-      matcher = j$.matchers.toThrow(util),
+      matcher = jasmineUnderTest.matchers.toThrow(util),
       fn = function() {
         throw 5;
       },
@@ -69,7 +70,7 @@ describe("toThrow", function() {
     var util = {
         equals: jasmine.createSpy('delegated-equal').and.returnValue(false)
       },
-      matcher = j$.matchers.toThrow(util),
+      matcher = jasmineUnderTest.matchers.toThrow(util),
       fn = function() {
         throw 5;
       },
@@ -85,7 +86,7 @@ describe("toThrow", function() {
     var util = {
         equals: jasmine.createSpy('delegated-equal').and.returnValue(false)
       },
-      matcher = j$.matchers.toThrow(util),
+      matcher = jasmineUnderTest.matchers.toThrow(util),
       fn = function() {
         throw 5;
       },

data/lib/jasmine-core/spec/helpers/defineJasmineUnderTest.js

@@ -1,7 +1,7 @@
 (function() {
   // By the time onload is called, jasmineRequire will be redefined to point
   // to the Jasmine source files (and not jasmine.js). So re-require
-  window.j$ = jasmineRequire.core(jasmineRequire);
-  jasmineRequire.html(j$);
-  jasmineRequire.console(jasmineRequire, j$);
+  window.jasmineUnderTest = jasmineRequire.core(jasmineRequire);
+  jasmineRequire.html(jasmineUnderTest);
+  jasmineRequire.console(jasmineRequire, jasmineUnderTest);
 })();

data/lib/jasmine-core/spec/helpers/nodeDefineJasmineUnderTest.js

@@ -4,10 +4,10 @@
 
   var glob = require("glob");
 
-  var j$Require = require(path.join(__dirname, "../../src/core/requireCore.js"));
+  var jasmineUnderTestRequire = require(path.join(__dirname, "../../src/core/requireCore.js"));
 
   global.getJasmineRequireObj = function () {
-    return j$Require;
+    return jasmineUnderTestRequire;
   };
 
   function extend(destination, source) {
@@ -25,9 +25,9 @@
     });
   }
 
-  extend(j$Require, require(path.join(__dirname,"../../src/console/requireConsole.js")));
+  extend(jasmineUnderTestRequire, require(path.join(__dirname,"../../src/console/requireConsole.js")));
   getSourceFiles();
-  global.j$ = j$Require.core(j$Require);
+  global.jasmineUnderTest = jasmineUnderTestRequire.core(jasmineUnderTestRequire);
 
-  j$Require.console(j$Require, j$);
+  jasmineUnderTestRequire.console(jasmineUnderTestRequire, jasmineUnderTest);
 })();

data/lib/jasmine-core/spec/html/HtmlReporterSpec.js

@@ -1,10 +1,9 @@
 describe("New HtmlReporter", function() {
-  // TODO: Figure out why this isn't rendering...
   it("builds the initial DOM elements, including the title banner", function() {
-    var env = new j$.Env(),
+    var env = new jasmineUnderTest.Env(),
       container = document.createElement("div"),
       getContainer = function() { return container; },
-      reporter = new j$.HtmlReporter({
+      reporter = new jasmineUnderTest.HtmlReporter({
         env: env,
         getContainer: getContainer,
         createElement: function() { return document.createElement.apply(document, arguments); },
@@ -29,14 +28,14 @@ describe("New HtmlReporter", function() {
 
     var version = banner.querySelector(".jasmine-version"),
       versionText = 'textContent' in version ? version.textContent : version.innerText;
-    expect(versionText).toEqual(j$.version);
+    expect(versionText).toEqual(jasmineUnderTest.version);
   });
 
   it("builds a single reporter even if initialized multiple times", function() {
-    var env = new j$.Env(),
+    var env = new jasmineUnderTest.Env(),
       container = document.createElement("div"),
       getContainer = function() { return container; },
-      reporter = new j$.HtmlReporter({
+      reporter = new jasmineUnderTest.HtmlReporter({
         env: env,
         getContainer: getContainer,
         createElement: function() { return document.createElement.apply(document, arguments); },
@@ -52,7 +51,7 @@ describe("New HtmlReporter", function() {
   it("starts the timer when jasmine begins", function() {
     var env = new jasmine.Env(),
         startTimerSpy = jasmine.createSpy("start-timer-spy"),
-        reporter = new j$.HtmlReporter({
+        reporter = new jasmineUnderTest.HtmlReporter({
           env: env,
           createElement: function() { return document.createElement.apply(document, arguments); },
           timer: { start: startTimerSpy }
@@ -69,10 +68,10 @@ describe("New HtmlReporter", function() {
         console = { error: function(){} };
       }
 
-      var env = new j$.Env(),
+      var env = new jasmineUnderTest.Env(),
       container = document.createElement('div'),
       getContainer = function() {return container;},
-      reporter = new j$.HtmlReporter({
+      reporter = new jasmineUnderTest.HtmlReporter({
         env: env,
         getContainer: getContainer,
         createElement: function() { return document.createElement.apply(document, arguments); },
@@ -95,10 +94,10 @@ describe("New HtmlReporter", function() {
     });
 
     it("reports the status symbol of a disabled spec", function() {
-      var env = new j$.Env(),
+      var env = new jasmineUnderTest.Env(),
         container = document.createElement("div"),
         getContainer = function() { return container; },
-        reporter = new j$.HtmlReporter({
+        reporter = new jasmineUnderTest.HtmlReporter({
           env: env,
           getContainer: getContainer,
           createElement: function() { return document.createElement.apply(document, arguments); },
@@ -115,10 +114,10 @@ describe("New HtmlReporter", function() {
     });
 
     it("reports the status symbol of a pending spec", function() {
-      var env = new j$.Env(),
+      var env = new jasmineUnderTest.Env(),
         container = document.createElement("div"),
         getContainer = function() { return container; },
-        reporter = new j$.HtmlReporter({
+        reporter = new jasmineUnderTest.HtmlReporter({
           env: env,
           getContainer: getContainer,
           createElement: function() { return document.createElement.apply(document, arguments); },
@@ -134,10 +133,10 @@ describe("New HtmlReporter", function() {
     });
 
     it("reports the status symbol of a passing spec", function() {
-      var env = new j$.Env(),
+      var env = new jasmineUnderTest.Env(),
         container = document.createElement("div"),
         getContainer = function() { return container; },
-        reporter = new j$.HtmlReporter({
+        reporter = new jasmineUnderTest.HtmlReporter({
           env: env,
           getContainer: getContainer,
           createElement: function() { return document.createElement.apply(document, arguments); },
@@ -154,10 +153,10 @@ describe("New HtmlReporter", function() {
     });
 
     it("reports the status symbol of a failing spec", function() {
-      var env = new j$.Env(),
+      var env = new jasmineUnderTest.Env(),
         container = document.createElement("div"),
         getContainer = function() { return container; },
-        reporter = new j$.HtmlReporter({
+        reporter = new jasmineUnderTest.HtmlReporter({
           env: env,
           getContainer: getContainer,
           createElement: function() { return document.createElement.apply(document, arguments); },
@@ -181,10 +180,10 @@ describe("New HtmlReporter", function() {
 
   describe("when there are suite failures", function () {
     it("displays the exceptions in their own alert bars", function(){
-      var env = new j$.Env(),
+      var env = new jasmineUnderTest.Env(),
         container = document.createElement("div"),
         getContainer = function() { return container; },
-        reporter = new j$.HtmlReporter({
+        reporter = new jasmineUnderTest.HtmlReporter({
           env: env,
           getContainer: getContainer,
           createElement: function() { return document.createElement.apply(document, arguments); },
@@ -196,14 +195,16 @@ describe("New HtmlReporter", function() {
       reporter.jasmineStarted({});
       reporter.suiteDone({ status: 'failed', failedExpectations: [{ message: 'My After All Exception' }] });
       reporter.suiteDone({ status: 'failed', failedExpectations: [{ message: 'My Other Exception' }] });
-      reporter.jasmineDone({});
+      reporter.jasmineDone({ failedExpectations: [{ message: 'Global After All Failure' }, { message: 'Other Global' }] });
 
       var alertBars = container.querySelectorAll(".jasmine-alert .jasmine-bar");
 
-      expect(alertBars.length).toEqual(3);
+      expect(alertBars.length).toEqual(5);
       expect(alertBars[1].innerHTML).toMatch(/My After All Exception/);
       expect(alertBars[1].getAttribute("class")).toEqual('jasmine-bar jasmine-errored');
       expect(alertBars[2].innerHTML).toMatch(/My Other Exception/);
+      expect(alertBars[3].innerHTML).toMatch(/Global After All Failure/);
+      expect(alertBars[4].innerHTML).toMatch(/Other Global/);
     });
   });
 
@@ -212,10 +213,10 @@ describe("New HtmlReporter", function() {
       if (!window.console) {
         window.console = { error: function(){} };
       }
-      var env = new j$.Env(),
+      var env = new jasmineUnderTest.Env(),
       container = document.createElement('div'),
       getContainer = function() {return container;},
-      reporter = new j$.HtmlReporter({
+      reporter = new jasmineUnderTest.HtmlReporter({
         env: env,
         getContainer: getContainer,
         createElement: function() { return document.createElement.apply(document, arguments); },
@@ -247,11 +248,11 @@ describe("New HtmlReporter", function() {
     });
 
     it("reports the run time", function() {
-      var env = new j$.Env(),
+      var env = new jasmineUnderTest.Env(),
         container = document.createElement("div"),
         timer = jasmine.createSpyObj('timer', ['start', 'elapsed']),
         getContainer = function() { return container; },
-        reporter = new j$.HtmlReporter({
+        reporter = new jasmineUnderTest.HtmlReporter({
           env: env,
           getContainer: getContainer,
           createElement: function() { return document.createElement.apply(document, arguments); },
@@ -271,10 +272,10 @@ describe("New HtmlReporter", function() {
     });
 
     it("reports the suite and spec names with status", function() {
-      var env = new j$.Env(),
+      var env = new jasmineUnderTest.Env(),
         container = document.createElement("div"),
         getContainer = function() { return container; },
-        reporter = new j$.HtmlReporter({
+        reporter = new jasmineUnderTest.HtmlReporter({
           env: env,
           getContainer: getContainer,
           createElement: function() { return document.createElement.apply(document, arguments); },
@@ -365,12 +366,12 @@ describe("New HtmlReporter", function() {
     });
 
     it("has an options menu", function() {
-      var env = new j$.Env(),
+      var env = new jasmineUnderTest.Env(),
         container = document.createElement("div"),
         getContainer = function() {
           return container;
         },
-        reporter = new j$.HtmlReporter({
+        reporter = new jasmineUnderTest.HtmlReporter({
           env: env,
           getContainer: getContainer,
           createElement: function() {
@@ -400,12 +401,12 @@ describe("New HtmlReporter", function() {
 
     describe("UI for raising/catching exceptions", function() {
       it("should be unchecked if the env is catching", function() {
-        var env = new j$.Env(),
+        var env = new jasmineUnderTest.Env(),
           container = document.createElement("div"),
           getContainer = function() {
             return container;
           },
-          reporter = new j$.HtmlReporter({
+          reporter = new jasmineUnderTest.HtmlReporter({
             env: env,
             getContainer: getContainer,
             createElement: function() {
@@ -424,12 +425,12 @@ describe("New HtmlReporter", function() {
       });
 
       it("should be checked if the env is not catching", function() {
-        var env = new j$.Env(),
+        var env = new jasmineUnderTest.Env(),
           container = document.createElement("div"),
           getContainer = function() {
             return container;
           },
-          reporter = new j$.HtmlReporter({
+          reporter = new jasmineUnderTest.HtmlReporter({
             env: env,
             getContainer: getContainer,
             createElement: function() {
@@ -449,13 +450,13 @@ describe("New HtmlReporter", function() {
       });
 
       it("should affect the query param for catching exceptions", function() {
-        var env = new j$.Env(),
+        var env = new jasmineUnderTest.Env(),
           container = document.createElement("div"),
           exceptionsClickHandler = jasmine.createSpy("raise exceptions checked"),
           getContainer = function() {
             return container;
           },
-          reporter = new j$.HtmlReporter({
+          reporter = new jasmineUnderTest.HtmlReporter({
             env: env,
             getContainer: getContainer,
             onRaiseExceptionsClick: exceptionsClickHandler,
@@ -478,12 +479,12 @@ describe("New HtmlReporter", function() {
 
     describe("UI for throwing errors on expectation failures", function() {
       it("should be unchecked if not throwing", function() {
-        var env = new j$.Env(),
+        var env = new jasmineUnderTest.Env(),
           container = document.createElement("div"),
           getContainer = function() {
             return container;
           },
-          reporter = new j$.HtmlReporter({
+          reporter = new jasmineUnderTest.HtmlReporter({
             env: env,
             getContainer: getContainer,
             createElement: function() {
@@ -502,12 +503,12 @@ describe("New HtmlReporter", function() {
       });
 
       it("should be checked if throwing", function() {
-        var env = new j$.Env(),
+        var env = new jasmineUnderTest.Env(),
           container = document.createElement("div"),
           getContainer = function() {
             return container;
           },
-          reporter = new j$.HtmlReporter({
+          reporter = new jasmineUnderTest.HtmlReporter({
             env: env,
             getContainer: getContainer,
             createElement: function() {
@@ -528,13 +529,13 @@ describe("New HtmlReporter", function() {
       });
 
       it("should affect the query param for throw expectation failures", function() {
-        var env = new j$.Env(),
+        var env = new jasmineUnderTest.Env(),
           container = document.createElement("div"),
           throwingExceptionHandler = jasmine.createSpy('throwingExceptions'),
           getContainer = function() {
             return container;
           },
-          reporter = new j$.HtmlReporter({
+          reporter = new jasmineUnderTest.HtmlReporter({
             env: env,
             getContainer: getContainer,
             onThrowExpectationsClick: throwingExceptionHandler,
@@ -558,12 +559,12 @@ describe("New HtmlReporter", function() {
 
     describe("UI for running tests in random order", function() {
       it("should be unchecked if not randomizing", function() {
-        var env = new j$.Env(),
+        var env = new jasmineUnderTest.Env(),
           container = document.createElement("div"),
           getContainer = function() {
             return container;
           },
-          reporter = new j$.HtmlReporter({
+          reporter = new jasmineUnderTest.HtmlReporter({
             env: env,
             getContainer: getContainer,
             createElement: function() {
@@ -582,12 +583,12 @@ describe("New HtmlReporter", function() {
       });
 
       it("should be checked if randomizing", function() {
-        var env = new j$.Env(),
+        var env = new jasmineUnderTest.Env(),
           container = document.createElement("div"),
           getContainer = function() {
             return container;
           },
-          reporter = new j$.HtmlReporter({
+          reporter = new jasmineUnderTest.HtmlReporter({
             env: env,
             getContainer: getContainer,
             createElement: function() {
@@ -607,13 +608,13 @@ describe("New HtmlReporter", function() {
       });
 
       it("should affect the query param for random tests", function() {
-        var env = new j$.Env(),
+        var env = new jasmineUnderTest.Env(),
           container = document.createElement("div"),
           randomHandler = jasmine.createSpy('randomHandler'),
           getContainer = function() {
             return container;
           },
-          reporter = new j$.HtmlReporter({
+          reporter = new jasmineUnderTest.HtmlReporter({
             env: env,
             getContainer: getContainer,
             onRandomClick: randomHandler,
@@ -635,12 +636,12 @@ describe("New HtmlReporter", function() {
       });
 
       it("should show the seed bar if randomizing", function() {
-        var env = new j$.Env(),
+        var env = new jasmineUnderTest.Env(),
             container = document.createElement("div"),
             getContainer = function() {
               return container;
             },
-            reporter = new j$.HtmlReporter({
+            reporter = new jasmineUnderTest.HtmlReporter({
               env: env,
               getContainer: getContainer,
               createElement: function() {
@@ -667,12 +668,12 @@ describe("New HtmlReporter", function() {
       });
 
       it("should not show the current seed bar if not randomizing", function() {
-        var env = new j$.Env(),
+        var env = new jasmineUnderTest.Env(),
             container = document.createElement("div"),
             getContainer = function() {
               return container;
             },
-            reporter = new j$.HtmlReporter({
+            reporter = new jasmineUnderTest.HtmlReporter({
               env: env,
               getContainer: getContainer,
               createElement: function() {
@@ -690,14 +691,49 @@ describe("New HtmlReporter", function() {
         expect(seedBar).toBeNull();
       });
 
+      it("should include the random query param in the jasmine-skipped link when randomizing", function(){
+        var env = new jasmineUnderTest.Env(),
+          container = document.createElement("div"),
+          reporter = new jasmineUnderTest.HtmlReporter({
+            env: env,
+            getContainer: function() { return container; },
+            createElement: function() { return document.createElement.apply(document, arguments); },
+            createTextNode: function() { return document.createTextNode.apply(document, arguments); }
+          });
+
+        reporter.initialize();
+        reporter.jasmineStarted({ totalSpecsDefined: 1 });
+        reporter.jasmineDone({ order: { random: true } });
+
+        var skippedLink = container.querySelector(".jasmine-skipped a");
+        expect(skippedLink.getAttribute('href')).toEqual('?random=true');
+      });
+
+      it("should not include the random query param in the jasmine-skipped link when not randomizing", function(){
+        var env = new jasmineUnderTest.Env(),
+        container = document.createElement("div"),
+        reporter = new jasmineUnderTest.HtmlReporter({
+          env: env,
+          getContainer: function() { return container; },
+          createElement: function() { return document.createElement.apply(document, arguments); },
+          createTextNode: function() { return document.createTextNode.apply(document, arguments); }
+        });
+
+        reporter.initialize();
+        reporter.jasmineStarted({ totalSpecsDefined: 1 });
+        reporter.jasmineDone();
+
+        var skippedLink = container.querySelector(".jasmine-skipped a");
+        expect(skippedLink.getAttribute('href')).toEqual('?');
+      });
     });
 
     it("shows a message if no specs are run", function(){
       var env, container, reporter;
-      env = new j$.Env();
+      env = new jasmineUnderTest.Env();
       container = document.createElement("div");
       var getContainer = function() { return container; },
-      reporter = new j$.HtmlReporter({
+      reporter = new jasmineUnderTest.HtmlReporter({
         env: env,
         getContainer: getContainer,
         createElement: function() { return document.createElement.apply(document, arguments); },
@@ -716,10 +752,10 @@ describe("New HtmlReporter", function() {
     describe("and all specs pass", function() {
       var env, container, reporter;
       beforeEach(function() {
-        env = new j$.Env();
+        env = new jasmineUnderTest.Env();
         container = document.createElement("div");
         var getContainer = function() { return container; },
-          reporter = new j$.HtmlReporter({
+          reporter = new jasmineUnderTest.HtmlReporter({
             env: env,
             getContainer: getContainer,
             createElement: function() { return document.createElement.apply(document, arguments); },
@@ -771,10 +807,10 @@ describe("New HtmlReporter", function() {
     describe("and there are pending specs", function() {
       var env, container, reporter;
       beforeEach(function() {
-        env = new j$.Env();
+        env = new jasmineUnderTest.Env();
         container = document.createElement("div");
         var getContainer = function() { return container; };
-        reporter = new j$.HtmlReporter({
+        reporter = new jasmineUnderTest.HtmlReporter({
           env: env,
           getContainer: getContainer,
           createElement: function() { return document.createElement.apply(document, arguments); },
@@ -820,10 +856,10 @@ describe("New HtmlReporter", function() {
       var env, container, reporter;
 
       beforeEach(function() {
-        env = new j$.Env();
+        env = new jasmineUnderTest.Env();
         container = document.createElement("div");
         var getContainer = function() { return container; }
-        reporter = new j$.HtmlReporter({
+        reporter = new jasmineUnderTest.HtmlReporter({
           env: env,
           getContainer: getContainer,
           createElement: function() { return document.createElement.apply(document, arguments); },