Skip to content

Commit 8b67305

Browse files
author
Carlos Atencio
committed
Bumped to version 0.9.0. Code refactoring.
1 parent e756077 commit 8b67305

File tree

3 files changed

+9
-14
lines changed

3 files changed

+9
-14
lines changed

example/protractor-conf.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@ var config = {
1717
}
1818
};
1919

20-
if (true || process.env.TRAVIS) {
20+
if (process.env.TRAVIS) {
2121
//Run PhantomJS on Travis
2222
config.capabilities = {
2323
browserName: 'phantomjs',
24-
//'phantomjs.binary.path': require('phantomjs').path,
2524
'phantomjs.ghostdriver.cli.args': ['--loglevel=DEBUG'],
2625
shardTestFiles: true,
2726
maxInstances: 2

lib/httpMock.js

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ function mockTemplate() {
1717

1818
var interceptors = $httpProvider.interceptors;
1919

20-
function statusIsSuccessful(status){
21-
return status >= 200 && status <= 299;
22-
}
23-
2420
function getInterceptor(interceptorExpression) {
2521
if (angular.isString(interceptorExpression)) {
2622
return $injector.get(interceptorExpression);
@@ -79,23 +75,24 @@ function mockTemplate() {
7975
return response;
8076
}
8177

78+
function statusIsSuccessful(status){
79+
return status >= 200 && status <= 299;
80+
}
81+
8282
function getTransformedAndInterceptedResponse(response) {
8383
response = transformResponse(response);
8484

8585
// Response interceptors are invoked in reverse order as per docs
8686
for (var i = interceptors.length - 1; i >= 0; i--) {
8787
var interceptor = getInterceptor(interceptors[i]);
8888

89-
if (interceptor.response &&
90-
(response.status === undefined || statusIsSuccessful(response.status))
91-
) {
89+
if (interceptor.response && statusIsSuccessful(response.status)) {
9290
$q.when(interceptor.response(response)).then(function(interceptedResponse){
9391
response = interceptedResponse;
9492
});
9593
}
9694

97-
if (interceptor.responseError &&
98-
!(response.status === undefined || statusIsSuccessful(response.status))) {
95+
if (interceptor.responseError && !statusIsSuccessful(response.status)) {
9996
$q.reject(interceptor.responseError(response)).then(null, function(interceptedResponse){
10097
response = interceptedResponse;
10198
});
@@ -281,11 +278,10 @@ function mockTemplate() {
281278
resolvedResponse.headers = function () {};
282279
}
283280

281+
resolvedResponse.status = resolvedResponse.status || 200;
284282
resolvedResponse = getTransformedAndInterceptedResponse(resolvedResponse);
285283

286284
$q.when(resolvedResponse).then(function(resolvedResponse) {
287-
resolvedResponse.status = resolvedResponse.status || 200;
288-
289285
if (statusIsSuccessful(resolvedResponse.status)) {
290286
deferred.resolve(resolvedResponse);
291287
} else {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "protractor-http-mock",
3-
"version": "0.8.0",
3+
"version": "0.9.0",
44
"description": "Mock HTTP calls in your protractor specs.",
55
"main": "index.js",
66
"scripts": {

0 commit comments

Comments
 (0)