diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index 3bd8dd93..50346ee0 100644 --- a/lib/jasmine-core/jasmine.js +++ b/lib/jasmine-core/jasmine.js @@ -6989,12 +6989,12 @@ getJasmineRequireObj().SpyStrategy = function(j$) { /** * Tell the spy to return a promise resolving to the specified value when invoked. - * @name SpyStrategy#resolveWith + * @name SpyStrategy#resolveTo * @function * @param {*} value The value to return. */ - this.resolveWith = function(value) { - var Promise = requirePromise('resolveWith'); + this.resolveTo = function(value) { + var Promise = requirePromise('resolveTo'); self.plan = function() { return Promise.resolve(value); }; @@ -7009,10 +7009,9 @@ getJasmineRequireObj().SpyStrategy = function(j$) { */ this.rejectWith = function(value) { var Promise = requirePromise('rejectWith'); - var error = value instanceof Error ? value : new Error(value); self.plan = function() { - return Promise.reject(error); + return Promise.reject(value); }; return self.getSpy(); }; diff --git a/spec/core/SpySpec.js b/spec/core/SpySpec.js index fd7dc4e6..f2eea200 100644 --- a/spec/core/SpySpec.js +++ b/spec/core/SpySpec.js @@ -208,7 +208,7 @@ describe('Spies', function() { it('works with global Promise library when available', function(done) { jasmine.getEnv().requirePromises(); - var spy = env.createSpy('foo').and.resolveWith(42); + var spy = env.createSpy('foo').and.resolveTo(42); spy() .then(function(result) { expect(result).toEqual(42); @@ -225,7 +225,7 @@ describe('Spies', function() { customPromise.resolve.and.returnValue('resolved'); env.configure({ Promise: customPromise }); - var spy = env.createSpy('foo').and.resolveWith(42); + var spy = env.createSpy('foo').and.resolveTo(42); expect(spy()).toEqual('resolved'); expect(customPromise.resolve).toHaveBeenCalledWith(42); }); diff --git a/spec/core/SpyStrategySpec.js b/spec/core/SpyStrategySpec.js index ae2679ac..e861dc8b 100644 --- a/spec/core/SpyStrategySpec.js +++ b/spec/core/SpyStrategySpec.js @@ -117,7 +117,7 @@ describe('SpyStrategy', function() { }); }); - describe('#resolveWith', function() { + describe('#resolveTo', function() { it('allows a resolved promise to be returned', function(done) { jasmine.getEnv().requirePromises(); @@ -130,7 +130,7 @@ describe('SpyStrategy', function() { getPromise: getPromise }); - spyStrategy.resolveWith(37); + spyStrategy.resolveTo(37); spyStrategy .exec() .then(function(returnValue) { @@ -145,9 +145,9 @@ describe('SpyStrategy', function() { spyStrategy = new jasmineUnderTest.SpyStrategy({ fn: originalFn }); expect(function() { - spyStrategy.resolveWith(37); + spyStrategy.resolveTo(37); }).toThrowError( - 'resolveWith requires global Promise, or `Promise` configured with `jasmine.getEnv().configure()`' + 'resolveTo requires global Promise, or `Promise` configured with `jasmine.getEnv().configure()`' ); }); }); @@ -176,7 +176,7 @@ describe('SpyStrategy', function() { .catch(done.fail); }); - it('allows a non-Error to be rejected, wrapping it in an exception when executed', function(done) { + it('allows a non-Error to be rejected', function(done) { jasmine.getEnv().requirePromises(); var originalFn = jasmine.createSpy('original'), @@ -193,7 +193,7 @@ describe('SpyStrategy', function() { .exec() .then(done.fail) .catch(function(error) { - expect(error).toEqual(new Error('oops')); + expect(error).toEqual('oops'); done(); }) .catch(done.fail); diff --git a/src/core/SpyStrategy.js b/src/core/SpyStrategy.js index 81ccf2ce..e1559a7d 100644 --- a/src/core/SpyStrategy.js +++ b/src/core/SpyStrategy.js @@ -46,12 +46,12 @@ getJasmineRequireObj().SpyStrategy = function(j$) { /** * Tell the spy to return a promise resolving to the specified value when invoked. - * @name SpyStrategy#resolveWith + * @name SpyStrategy#resolveTo * @function * @param {*} value The value to return. */ - this.resolveWith = function(value) { - var Promise = requirePromise('resolveWith'); + this.resolveTo = function(value) { + var Promise = requirePromise('resolveTo'); self.plan = function() { return Promise.resolve(value); }; @@ -66,10 +66,9 @@ getJasmineRequireObj().SpyStrategy = function(j$) { */ this.rejectWith = function(value) { var Promise = requirePromise('rejectWith'); - var error = value instanceof Error ? value : new Error(value); self.plan = function() { - return Promise.reject(error); + return Promise.reject(value); }; return self.getSpy(); };