From 965229bd03e81030eed9c2409d2f816b8d41baa5 Mon Sep 17 00:00:00 2001 From: Gregg Van Hove Date: Wed, 18 Mar 2015 13:12:40 -0700 Subject: [PATCH] Properly pass `j$` to `Any` so it can use other jasmine stuff Fixes #806 --- lib/jasmine-core/jasmine.js | 4 ++-- src/core/asymmetric_equality/Any.js | 2 +- src/core/requireCore.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index b470a465..f0a41428 100644 --- a/lib/jasmine-core/jasmine.js +++ b/lib/jasmine-core/jasmine.js @@ -43,7 +43,7 @@ var getJasmineRequireObj = (function (jasmineGlobal) { jRequire.base(j$, jasmineGlobal); j$.util = jRequire.util(); j$.errors = jRequire.errors(); - j$.Any = jRequire.Any(); + j$.Any = jRequire.Any(j$); j$.Anything = jRequire.Anything(j$); j$.CallTracker = jRequire.CallTracker(); j$.MockDate = jRequire.MockDate(); @@ -2371,7 +2371,7 @@ getJasmineRequireObj().TreeProcessor = function() { return TreeProcessor; }; -getJasmineRequireObj().Any = function() { +getJasmineRequireObj().Any = function(j$) { function Any(expectedObject) { this.expectedObject = expectedObject; diff --git a/src/core/asymmetric_equality/Any.js b/src/core/asymmetric_equality/Any.js index 044a8507..7f597c83 100644 --- a/src/core/asymmetric_equality/Any.js +++ b/src/core/asymmetric_equality/Any.js @@ -1,4 +1,4 @@ -getJasmineRequireObj().Any = function() { +getJasmineRequireObj().Any = function(j$) { function Any(expectedObject) { this.expectedObject = expectedObject; diff --git a/src/core/requireCore.js b/src/core/requireCore.js index 22c1101a..aaefbed3 100644 --- a/src/core/requireCore.js +++ b/src/core/requireCore.js @@ -21,7 +21,7 @@ var getJasmineRequireObj = (function (jasmineGlobal) { jRequire.base(j$, jasmineGlobal); j$.util = jRequire.util(); j$.errors = jRequire.errors(); - j$.Any = jRequire.Any(); + j$.Any = jRequire.Any(j$); j$.Anything = jRequire.Anything(j$); j$.CallTracker = jRequire.CallTracker(); j$.MockDate = jRequire.MockDate();