admin/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make exposure of addMatchers and addCustomEqualityTesters be on jasmine instead of inconsistent.

Browse Source
This commit is contained in:
Davis W. Frank
2013-10-10 11:32:21 -07:00
parent 55716723b5
commit 8ca8197b4c
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/jasmine-core/boot.js
View File

@@ -60,10 +60,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
return env.pending(); return env.pending();
}, },
addMatchers: function(matchers) {
return env.addMatchers(matchers);
},
spyOn: function(obj, methodName) { spyOn: function(obj, methodName) {
return env.spyOn(obj, methodName); return env.spyOn(obj, methodName);
}, },
@@ -80,6 +76,14 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
extend(window, jasmineInterface); extend(window, jasmineInterface);
} }
jasmine.addCustomEqualityTester = function(tester) {
env.addCustomEqualityTester(tester);
};
jasmine.addMatchers = function(matchers) {
return env.addMatchers(matchers);
};
var queryString = new jasmine.QueryString({ var queryString = new jasmine.QueryString({
getWindowLocation: function() { return window.location; } getWindowLocation: function() { return window.location; }
}); });

12
lib/jasmine-core/boot/boot.js
View File

@@ -38,10 +38,6 @@
return env.pending(); return env.pending();
}, },
addMatchers: function(matchers) {
return env.addMatchers(matchers);
},
spyOn: function(obj, methodName) { spyOn: function(obj, methodName) {
return env.spyOn(obj, methodName); return env.spyOn(obj, methodName);
}, },
@@ -58,6 +54,14 @@
extend(window, jasmineInterface); extend(window, jasmineInterface);
} }
jasmine.addCustomEqualityTester = function(tester) {
env.addCustomEqualityTester(tester);
};
jasmine.addMatchers = function(matchers) {
return env.addMatchers(matchers);
};
var queryString = new jasmine.QueryString({ var queryString = new jasmine.QueryString({
getWindowLocation: function() { return window.location; } getWindowLocation: function() { return window.location; }
}); });

4
lib/jasmine-core/jasmine.js
View File

@@ -187,10 +187,6 @@ getJasmineRequireObj().base = function(j$) {
} }
return obj; return obj;
}; };
j$.addCustomEqualityTester = function(tester) {
j$.getEnv().addCustomEqualityTester(tester);
};
}; };
getJasmineRequireObj().util = function() { getJasmineRequireObj().util = function() {

4
src/core/base.js
View File

@@ -96,8 +96,4 @@ getJasmineRequireObj().base = function(j$) {
} }
return obj; return obj;
}; };
j$.addCustomEqualityTester = function(tester) {
j$.getEnv().addCustomEqualityTester(tester);
};
}; };