diff --git a/test/spec/ol/expect.test.js b/test/spec/ol/expect.test.js index 98378d4b3a..66c161a7dc 100644 --- a/test/spec/ol/expect.test.js +++ b/test/spec/ol/expect.test.js @@ -30,31 +30,19 @@ describe('expect.js', function() { }).to.throwException(); }); - }); - - describe('kindaEqual', function() { - it('thinks that 1 ain\'t so different from 2', function() { - expect(1).to.kindaEqual(2, 1); + expect(1).to.roughlyEqual(2, 1); }); it('knows that, like, 1 and 2 would, like, totally dig each other', function() { expect(function() { - expect(1).to.kindaEqual(2, 1); + expect(1).to.roughlyEqual(2, 1); }).not.to.throwException(); }); }); - describe('roughlyEqual and kindaEqual', function() { - - it('it\'s like they\'re soul mates', function() { - expect(expect(0).to.roughlyEqual).to.be(expect(1).to.kindaEqual); - }); - - }); - describe('called', function() { var telephone; @@ -72,38 +60,21 @@ describe('expect.js', function() { expect(telephone).not.to.be.called(); }); - }); - - describe('totallyWantsToSpeakToYou', function() { - - var callMeMaybe; - beforeEach(function() { - callMeMaybe = sinon.spy(); - }); - it('reminds you that you forgot', function() { expect(function() { - expect(callMeMaybe).to.be.called(); + expect(telephone).to.be.called(); }).to.throwException(); }); it('gets moody all too quickly', function() { - callMeMaybe(); + telephone(); expect(function() { - expect(callMeMaybe).not.to.be.called(); + expect(telephone).not.to.be.called(); }).to.throwException(); }); }); - describe('called and totallyWantsToSpeakToYou', function() { - - it('are best friends forever \u2665', function() { - expect(expect(0).to.called).to.be(expect(1).to.totallyWantsToSpeakToYou); - }); - - }); - describe('Test equality of XML documents - xmleql', function() { it('Test XML document with single root, different prefix', function() { diff --git a/test/test-extensions.js b/test/test-extensions.js index bde60a7384..df186ad10a 100644 --- a/test/test-extensions.js +++ b/test/test-extensions.js @@ -60,8 +60,7 @@ * @param {Number} n Number. * @param {Number} tol Tolerance. */ - expect.Assertion.prototype.roughlyEqual = - expect.Assertion.prototype.kindaEqual = function(n, tol) { + expect.Assertion.prototype.roughlyEqual = function(n, tol) { this.assert( Math.abs(this.obj - n) <= tol, function() { @@ -79,8 +78,7 @@ /** * Assert that a sinon spy was called. */ - expect.Assertion.prototype.called = - expect.Assertion.prototype.totallyWantsToSpeakToYou = function() { + expect.Assertion.prototype.called = function() { this.assert( this.obj.called, function() {