diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index 36aa494b..95cfebbe 100644 --- a/lib/jasmine-core/jasmine.js +++ b/lib/jasmine-core/jasmine.js @@ -3765,7 +3765,7 @@ getJasmineRequireObj().ObjectPath = function(j$) { return ObjectPath; }; -getJasmineRequireObj().toBe = function() { +getJasmineRequireObj().toBe = function(j$) { /** * {@link expect} the actual value to be `===` to the expected value. * @function @@ -3774,12 +3774,20 @@ getJasmineRequireObj().toBe = function() { * @example * expect(thing).toBe(realThing); */ - function toBe() { + function toBe(util) { + var tip = ' Tip: To check for deep equality, use .toEqual() instead of .toBe().'; + return { compare: function(actual, expected) { - return { - pass: actual === expected + var result = { + pass: actual === expected, }; + + if (typeof expected === 'object') { + result.message = util.buildFailureMessage('toBe', result.pass, actual, expected) + tip; + } + + return result; } }; } diff --git a/spec/core/matchers/toBeSpec.js b/spec/core/matchers/toBeSpec.js index 541eda96..e065af57 100644 --- a/spec/core/matchers/toBeSpec.js +++ b/spec/core/matchers/toBeSpec.js @@ -1,17 +1,56 @@ describe("toBe", function() { - it("passes when actual === expected", function() { - var matcher = jasmineUnderTest.matchers.toBe(), + it("passes with no message when actual === expected", function() { + var matcher = jasmineUnderTest.matchers.toBe(jasmineUnderTest.matchersUtil), result; result = matcher.compare(1, 1); expect(result.pass).toBe(true); }); - it("fails when actual !== expected", function() { - var matcher = jasmineUnderTest.matchers.toBe(), + it("passes with a custom message when expected is an array", function() { + var matcher = jasmineUnderTest.matchers.toBe(jasmineUnderTest.matchersUtil), + result, + array = [1]; + + result = matcher.compare(array, array); + expect(result.pass).toBe(true); + expect(result.message).toBe("Expected [ 1 ] not to be [ 1 ]. Tip: To check for deep equality, use .toEqual() instead of .toBe().") + }); + + it("passes with a custom message when expected is an object", function() { + var matcher = jasmineUnderTest.matchers.toBe(jasmineUnderTest.matchersUtil), + result, + obj = {foo: "bar"}; + + result = matcher.compare(obj, obj); + expect(result.pass).toBe(true); + expect(result.message).toBe("Expected Object({ foo: 'bar' }) not to be Object({ foo: 'bar' }). Tip: To check for deep equality, use .toEqual() instead of .toBe().") + }); + + it("fails with no message when actual !== expected", function() { + var matcher = jasmineUnderTest.matchers.toBe(jasmineUnderTest.matchersUtil), result; result = matcher.compare(1, 2); expect(result.pass).toBe(false); + expect(result.message).toBeUndefined(); + }); + + it("fails with a custom message when expected is an array", function() { + var matcher = jasmineUnderTest.matchers.toBe(jasmineUnderTest.matchersUtil), + result; + + result = matcher.compare([1], [1]); + expect(result.pass).toBe(false); + expect(result.message).toBe("Expected [ 1 ] to be [ 1 ]. Tip: To check for deep equality, use .toEqual() instead of .toBe().") + }); + + it("fails with a custom message when expected is an object", function() { + var matcher = jasmineUnderTest.matchers.toBe(jasmineUnderTest.matchersUtil), + result; + + result = matcher.compare({foo: "bar"}, {foo: "bar"}); + expect(result.pass).toBe(false); + expect(result.message).toBe("Expected Object({ foo: 'bar' }) to be Object({ foo: 'bar' }). Tip: To check for deep equality, use .toEqual() instead of .toBe().") }); }); diff --git a/src/core/matchers/toBe.js b/src/core/matchers/toBe.js index bcbbb1a6..96b236a7 100644 --- a/src/core/matchers/toBe.js +++ b/src/core/matchers/toBe.js @@ -1,4 +1,4 @@ -getJasmineRequireObj().toBe = function() { +getJasmineRequireObj().toBe = function(j$) { /** * {@link expect} the actual value to be `===` to the expected value. * @function @@ -7,12 +7,20 @@ getJasmineRequireObj().toBe = function() { * @example * expect(thing).toBe(realThing); */ - function toBe() { + function toBe(util) { + var tip = ' Tip: To check for deep equality, use .toEqual() instead of .toBe().'; + return { compare: function(actual, expected) { - return { - pass: actual === expected + var result = { + pass: actual === expected, }; + + if (typeof expected === 'object') { + result.message = util.buildFailureMessage('toBe', result.pass, actual, expected) + tip; + } + + return result; } }; }