Skip to content

Commit 2cb5597

Browse files
committed
Couple of fixes.
1 parent 05d4e51 commit 2cb5597

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

src/DSMock.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,11 @@ function DSProvider() {
3737
this.$get = ['DSMockUtils', 'DSUtils', 'DSErrors', function (DSMockUtils, DSUtils, DSErrors) {
3838

3939
var MockDSExpectation = DSMockUtils.MockDSExpectation;
40-
var defaults = {};
40+
var defaults = {
41+
deserialize: function (resourceName, data) {
42+
return data.data ? data.data : data;
43+
}
44+
};
4145

4246
angular.forEach(asyncMethods, function (name) {
4347
stubs[name] = DSMockUtils.mockAsync(name, 'DS', expectations, definitions, requests, responses);

src/index.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,8 @@
7171
responses.push(createResponse(resourceName, deferred, expectation.response));
7272
return deferred.promise;
7373
} else {
74-
throw new Error('No response defined for DSHttpAdapter.' + expectation.method);
74+
throw new Error('No response defined for ' + namespace + '.' + expectation.method);
7575
}
76-
return;
7776
}
7877

7978
// try to match request to any backend definitions
@@ -87,12 +86,11 @@
8786
} else {
8887
throw new Error('No response defined !');
8988
}
90-
return;
9189
}
9290
}
9391

9492
// Any requests that made it this far aren't being handled, so throw an exception
95-
throw new Error('Unexpected request: DSHttpAdapter.' + name + ' ' + resourceName + '\n' +
93+
throw new Error('Unexpected request: ' + namespace + '.' + name + ' ' + resourceName + '\n' +
9694
'No more requests expected');
9795
};
9896
}

0 commit comments

Comments
 (0)