feat(mock.$httpBackend): add verifyNoOutstandingRequest method

+ rename verifyExpectations to verifyNoOutstandingExpectation
This commit is contained in:
Vojta Jina 2011-10-31 20:34:03 -07:00 committed by Igor Minar
parent 7b705df2b7
commit afbe073121
4 changed files with 28 additions and 10 deletions

View file

@ -664,12 +664,18 @@ angular.module.ngMock.$HttpBackendProvider = function() {
}
};
$httpBackend.verifyExpectations = function() {
$httpBackend.verifyNoOutstandingExpectation = function() {
if (expectations.length) {
throw Error('Unsatisfied requests: ' + expectations.join(', '));
}
};
$httpBackend.verifyNoOutstandingRequest = function() {
if (responses.length) {
throw Error('Unflushed requests: ' + responses.length);
}
};
$httpBackend.resetExpectations = function() {
expectations = [];
responses = [];

View file

@ -20,7 +20,7 @@ describe("resource", function() {
);
afterEach(inject(function($httpBackend) {
$httpBackend.verifyExpectations();
$httpBackend.verifyNoOutstandingExpectation();
}));
it("should build resource", function() {

View file

@ -559,7 +559,7 @@ describe('mocks', function() {
hb.flush();
expect(callback).toHaveBeenCalled();
expect(function() { hb.verifyExpectations(); }).not.toThrow();
expect(function() { hb.verifyNoOutstandingExpectation(); }).not.toThrow();
});
@ -651,7 +651,7 @@ describe('mocks', function() {
hb('GET', '/some-url', null, callback);
hb.flush();
expect(callback).toHaveBeenCalledOnce();
hb.verifyExpectations();
hb.verifyNoOutstandingExpectation();
});
@ -680,7 +680,7 @@ describe('mocks', function() {
});
describe('verify', function() {
describe('verifyExpectations', function() {
it('should throw exception if not all expectations were satisfied', function() {
hb.expect('POST', '/u1', 'ddd').respond(201, '', {});
@ -689,7 +689,7 @@ describe('mocks', function() {
hb('POST', '/u1', 'ddd', noop, {});
expect(function() {hb.verifyExpectations();})
expect(function() {hb.verifyNoOutstandingExpectation();})
.toThrow('Unsatisfied requests: GET /u2, POST /u3');
});
@ -697,7 +697,7 @@ describe('mocks', function() {
it('should do nothing when no expectation', function() {
hb.when('DELETE', '/some').then(200, '');
expect(function() {hb.verifyExpectations();}).not.toThrow();
expect(function() {hb.verifyNoOutstandingExpectation();}).not.toThrow();
});
@ -709,7 +709,19 @@ describe('mocks', function() {
hb('GET', '/u2', noop);
hb('POST', '/u3', noop);
expect(function() {hb.verifyExpectations();}).not.toThrow();
expect(function() {hb.verifyNoOutstandingExpectation();}).not.toThrow();
});
});
describe('verifyRequests', function() {
it('should throw exception if not all requests were flushed', function() {
hb.when('GET').then(200);
hb('GET', '/some', null, noop, {});
expect(function() {
hb.verifyNoOutstandingRequest();
}).toThrow('Unflushed requests: 1');
});
});
@ -721,7 +733,7 @@ describe('mocks', function() {
hb.expect('POST', '/u3').respond(201, '', {});
hb.resetExpectations();
expect(function() {hb.verifyExpectations();}).not.toThrow();
expect(function() {hb.verifyNoOutstandingExpectation();}).not.toThrow();
});

View file

@ -19,7 +19,7 @@ describe('$http', function() {
afterEach(function() {
if ($exceptionHandler.errors.length) throw $exceptionHandler.errors;
$httpBackend.verifyExpectations();
$httpBackend.verifyNoOutstandingExpectation();
});