This repository was archived by the owner on Apr 12, 2024. It is now read-only.
fix(ngMockE2E): ensure that mocked $httpBackend uses correct $browser #15601
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The fix from angular#13124 enabled ngMock and ngMockE2E to work together but did it in a way that meant that the "real" `$httpBackend` service that was used in pass-through depended upon a different `$browser` service to the rest of the app. This broke Protractor since it watches the `$browser` for outstanding requests and the pass through requests were being tracked by the wrong `$browser` instance. Closes angular#15593
gkalpak
approved these changes
Jan 12, 2017
|
|
||
| beforeEach(function() { | ||
| callback = jasmine.createSpy('callback'); | ||
| angular.module('ng').config(function($provide) { | ||
| realHttpBackend = jasmine.createSpy('real $httpBackend'); | ||
| $provide.value('$httpBackend', realHttpBackend); | ||
| $provide.factory('$httpBackend', ['$browser', function($browser) { | ||
| return realHttpBackend.and.callFake(function() { realHttpBackendBrowser = $browser; }); |
There was a problem hiding this comment.
Wouldn't the following work as well (just trying to understand if I am missing something):
$provide.factory('$httpBackend', ['$browser', function($browser) {
realHttpBackendBrowser = $browser;
return realHttpBackend;
}]);There was a problem hiding this comment.
This way we would be able to be sure that the factory had been called but not that the correct httpBackend service had been called, no?
There was a problem hiding this comment.
Aren't you explicitly checking about the correct service anyway?
(I am not saying you should change it, just wondering.)
There was a problem hiding this comment.
Yes, we check that the spy has been called so I guess you are right.
There was a problem hiding this comment.
But since I have a LGTM from you and Travis is green I am going to merge it as-is :-P
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The fix from #13124 enabled ngMock and ngMockE2E to work together but
did it in a way that meant that the "real"
$httpBackendservice thatwas used in pass-through depended upon a different
$browserserviceto the rest of the app.
This broke Protractor since it watches the
$browserfor outstandingrequests and the pass through requests were being tracked by the wrong
$browserinstance.Closes #15593
What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)
What is the current behavior? (You can also link to an open issue here)
What is the new behavior (if this is a feature change)?
Does this PR introduce a breaking change?
Please check if the PR fulfills these requirements
Other information: