Skip to content

Commit

Permalink
Use toBeRejectedWith instead of toBeRejectedTo
Browse files Browse the repository at this point in the history
  • Loading branch information
Gregg Van Hove committed Oct 22, 2018
1 parent 06854fe commit fe042fd
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
24 changes: 12 additions & 12 deletions spec/core/AsyncExpectationSpec.js
Expand Up @@ -108,7 +108,7 @@ describe('AsyncExpectation', function() {
});
});

describe('#toBeRejectedTo', function () {
describe('#toBeRejectedWith', function () {
it('should return true if the promise is rejected to the expected value', function () {
jasmine.getEnv().requirePromises();

Expand All @@ -120,9 +120,9 @@ describe('AsyncExpectation', function() {
addExpectationResult: addExpectationResult
});

return expectation.toBeRejectedTo({error: 'PEBCAK'}).then(function () {
return expectation.toBeRejectedWith({error: 'PEBCAK'}).then(function () {
expect(addExpectationResult).toHaveBeenCalledWith(true, {
matcherName: 'toBeRejectedTo',
matcherName: 'toBeRejectedWith',
passed: true,
message: '',
error: undefined,
Expand All @@ -144,9 +144,9 @@ describe('AsyncExpectation', function() {
addExpectationResult: addExpectationResult
});

return expectation.toBeRejectedTo('').then(function () {
return expectation.toBeRejectedWith('').then(function () {
expect(addExpectationResult).toHaveBeenCalledWith(false, {
matcherName: 'toBeRejectedTo',
matcherName: 'toBeRejectedWith',
passed: false,
message: "Expected a promise to be rejected to '' but it was resolved.",
error: undefined,
Expand All @@ -167,9 +167,9 @@ describe('AsyncExpectation', function() {
addExpectationResult: addExpectationResult
});

return expectation.toBeRejectedTo('Some Cool Thing').then(function () {
return expectation.toBeRejectedWith('Some Cool Thing').then(function () {
expect(addExpectationResult).toHaveBeenCalledWith(false, {
matcherName: 'toBeRejectedTo',
matcherName: 'toBeRejectedWith',
passed: false,
message: "Expected a promise to be rejected to 'Some Cool Thing' but it was rejected to 'A Bad Apple'.",
error: undefined,
Expand All @@ -189,7 +189,7 @@ describe('AsyncExpectation', function() {
addExpectationResult: addExpectationResult
});

return expectation.not.toBeRejectedTo(true).then(function () {
return expectation.not.toBeRejectedWith(true).then(function () {
expect(addExpectationResult).toHaveBeenCalledWith(false,
jasmine.objectContaining({
passed: false,
Expand All @@ -210,7 +210,7 @@ describe('AsyncExpectation', function() {
addExpectationResult: addExpectationResult
});

return expectation.toBeRejectedTo('expected').then(function() {
return expectation.toBeRejectedWith('expected').then(function() {
expect(addExpectationResult).toHaveBeenCalledWith(true,
jasmine.objectContaining({passed: true}));
});
Expand Down Expand Up @@ -324,7 +324,7 @@ describe('AsyncExpectation', function() {
});
});
});

describe('#not', function() {
it('converts a pass to a fail', function() {
jasmine.getEnv().requirePromises();
Expand All @@ -338,7 +338,7 @@ describe('AsyncExpectation', function() {
});

return expectation.not.toBeResolved().then(function() {
expect(addExpectationResult).toHaveBeenCalledWith(false,
expect(addExpectationResult).toHaveBeenCalledWith(false,
jasmine.objectContaining({
passed: false,
message: 'Expected a promise not to be resolved.'
Expand All @@ -359,7 +359,7 @@ describe('AsyncExpectation', function() {
});

return expectation.not.toBeResolved().then(function() {
expect(addExpectationResult).toHaveBeenCalledWith(true,
expect(addExpectationResult).toHaveBeenCalledWith(true,
jasmine.objectContaining({
passed: true,
message: ''
Expand Down
10 changes: 5 additions & 5 deletions src/core/AsyncExpectation.js
Expand Up @@ -23,7 +23,7 @@ getJasmineRequireObj().AsyncExpectation = function(j$) {
throw new Error('Expected expectAsync to be called with a promise.');
}

['toBeResolved', 'toBeRejected', 'toBeResolvedTo', 'toBeRejectedTo'].forEach(wrapCompare.bind(this));
['toBeResolved', 'toBeRejected', 'toBeResolvedTo', 'toBeRejectedWith'].forEach(wrapCompare.bind(this));
}

function wrapCompare(name) {
Expand Down Expand Up @@ -141,14 +141,14 @@ getJasmineRequireObj().AsyncExpectation = function(j$) {
* Expect a promise to be rejected to a value equal to the expected, using deep equality comparison.
* @function
* @async
* @name async-matchers#toBeRejectedTo
* @name async-matchers#toBeRejectedWith
* @param {Object} expected - Value that the promise is expected to reject to
* @example
* await expectAsync(aPromise).toBeRejectedTo({prop: 'value'});
* await expectAsync(aPromise).toBeRejectedWith({prop: 'value'});
* @example
* return expectAsync(aPromise).toBeRejectedTo({prop: 'value'});
* return expectAsync(aPromise).toBeRejectedWith({prop: 'value'});
*/
AsyncExpectation.prototype.toBeRejectedTo = function(actualPromise, expectedValue) {
AsyncExpectation.prototype.toBeRejectedWith = function(actualPromise, expectedValue) {
var self = this;

function prefix(passed) {
Expand Down

0 comments on commit fe042fd

Please sign in to comment.