Make exposure of addMatchers and addCustomEqualityTesters be on jasmine instead of inconsistent.
This commit is contained in:
@@ -60,10 +60,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
return env.pending();
|
||||
},
|
||||
|
||||
addMatchers: function(matchers) {
|
||||
return env.addMatchers(matchers);
|
||||
},
|
||||
|
||||
spyOn: function(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);
|
||||
}
|
||||
|
||||
jasmine.addCustomEqualityTester = function(tester) {
|
||||
env.addCustomEqualityTester(tester);
|
||||
};
|
||||
|
||||
jasmine.addMatchers = function(matchers) {
|
||||
return env.addMatchers(matchers);
|
||||
};
|
||||
|
||||
var queryString = new jasmine.QueryString({
|
||||
getWindowLocation: function() { return window.location; }
|
||||
});
|
||||
|
||||
@@ -38,10 +38,6 @@
|
||||
return env.pending();
|
||||
},
|
||||
|
||||
addMatchers: function(matchers) {
|
||||
return env.addMatchers(matchers);
|
||||
},
|
||||
|
||||
spyOn: function(obj, methodName) {
|
||||
return env.spyOn(obj, methodName);
|
||||
},
|
||||
@@ -58,6 +54,14 @@
|
||||
extend(window, jasmineInterface);
|
||||
}
|
||||
|
||||
jasmine.addCustomEqualityTester = function(tester) {
|
||||
env.addCustomEqualityTester(tester);
|
||||
};
|
||||
|
||||
jasmine.addMatchers = function(matchers) {
|
||||
return env.addMatchers(matchers);
|
||||
};
|
||||
|
||||
var queryString = new jasmine.QueryString({
|
||||
getWindowLocation: function() { return window.location; }
|
||||
});
|
||||
|
||||
@@ -187,10 +187,6 @@ getJasmineRequireObj().base = function(j$) {
|
||||
}
|
||||
return obj;
|
||||
};
|
||||
|
||||
j$.addCustomEqualityTester = function(tester) {
|
||||
j$.getEnv().addCustomEqualityTester(tester);
|
||||
};
|
||||
};
|
||||
|
||||
getJasmineRequireObj().util = function() {
|
||||
|
||||
@@ -96,8 +96,4 @@ getJasmineRequireObj().base = function(j$) {
|
||||
}
|
||||
return obj;
|
||||
};
|
||||
|
||||
j$.addCustomEqualityTester = function(tester) {
|
||||
j$.getEnv().addCustomEqualityTester(tester);
|
||||
};
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user