Refer to MatchersUtil instances as matchersUtil, not util
This commit is contained in:
@@ -10,7 +10,7 @@ getJasmineRequireObj().toBeRejected = function(j$) {
|
||||
* @example
|
||||
* return expectAsync(aPromise).toBeRejected();
|
||||
*/
|
||||
return function toBeRejected(util) {
|
||||
return function toBeRejected() {
|
||||
return {
|
||||
compare: function(actual) {
|
||||
if (!j$.isPromiseLike(actual)) {
|
||||
|
||||
@@ -10,7 +10,7 @@ getJasmineRequireObj().toBeResolved = function(j$) {
|
||||
* @example
|
||||
* return expectAsync(aPromise).toBeResolved();
|
||||
*/
|
||||
return function toBeResolved(util) {
|
||||
return function toBeResolved() {
|
||||
return {
|
||||
compare: function(actual) {
|
||||
if (!j$.isPromiseLike(actual)) {
|
||||
|
||||
@@ -8,7 +8,7 @@ getJasmineRequireObj().toBe = function(j$) {
|
||||
* @example
|
||||
* expect(thing).toBe(realThing);
|
||||
*/
|
||||
function toBe(util) {
|
||||
function toBe(matchersUtil) {
|
||||
var tip = ' Tip: To check for deep equality, use .toEqual() instead of .toBe().';
|
||||
|
||||
return {
|
||||
@@ -18,7 +18,7 @@ getJasmineRequireObj().toBe = function(j$) {
|
||||
};
|
||||
|
||||
if (typeof expected === 'object') {
|
||||
result.message = util.buildFailureMessage('toBe', result.pass, actual, expected) + tip;
|
||||
result.message = matchersUtil.buildFailureMessage('toBe', result.pass, actual, expected) + tip;
|
||||
}
|
||||
|
||||
return result;
|
||||
|
||||
@@ -9,12 +9,12 @@ getJasmineRequireObj().toContain = function() {
|
||||
* expect(array).toContain(anElement);
|
||||
* expect(string).toContain(substring);
|
||||
*/
|
||||
function toContain(util) {
|
||||
function toContain(matchersUtil) {
|
||||
return {
|
||||
compare: function(actual, expected) {
|
||||
|
||||
return {
|
||||
pass: util.contains(actual, expected)
|
||||
pass: matchersUtil.contains(actual, expected)
|
||||
};
|
||||
}
|
||||
};
|
||||
|
||||
@@ -8,15 +8,15 @@ getJasmineRequireObj().toEqual = function(j$) {
|
||||
* @example
|
||||
* expect(bigObject).toEqual({"foo": ['bar', 'baz']});
|
||||
*/
|
||||
function toEqual(util) {
|
||||
function toEqual(matchersUtil) {
|
||||
return {
|
||||
compare: function(actual, expected) {
|
||||
var result = {
|
||||
pass: false
|
||||
},
|
||||
diffBuilder = j$.DiffBuilder({prettyPrinter: util.pp});
|
||||
diffBuilder = j$.DiffBuilder({prettyPrinter: matchersUtil.pp});
|
||||
|
||||
result.pass = util.equals(actual, expected, diffBuilder);
|
||||
result.pass = matchersUtil.equals(actual, expected, diffBuilder);
|
||||
|
||||
// TODO: only set error message if test fails
|
||||
result.message = diffBuilder.getMessage();
|
||||
|
||||
Reference in New Issue
Block a user