This repository was archived by the owner on Apr 12, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 27.4k
feat($http): add overrideMimeType passthrough #7689
Open
quietmint
wants to merge
1
commit into
angular:master
Choose a base branch
from
quietmint:override-mime-type
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1383,13 +1383,14 @@ describe('$http', function() { | |
}); | ||
|
||
|
||
it('should pass timeout, withCredentials and responseType', function() { | ||
it('should pass timeout, withCredentials, responseType, and overrideMimeType', function() { | ||
var $httpBackend = jasmine.createSpy('$httpBackend'); | ||
|
||
$httpBackend.andCallFake(function(m, u, d, c, h, timeout, withCredentials, responseType) { | ||
$httpBackend.andCallFake(function(m, u, d, c, h, timeout, withCredentials, responseType, overrideMimeType) { | ||
expect(timeout).toBe(12345); | ||
expect(withCredentials).toBe(true); | ||
expect(responseType).toBe('json'); | ||
expect(overrideMimeType).toBe('text/plain;charset=x-user-defined'); | ||
}); | ||
|
||
module(function($provide) { | ||
|
@@ -1402,7 +1403,8 @@ describe('$http', function() { | |
url: 'some.html', | ||
timeout: 12345, | ||
withCredentials: true, | ||
responseType: 'json' | ||
responseType: 'json', | ||
overrideMimeType: 'text/plain;charset=x-user-defined', | ||
}); | ||
$rootScope.$digest(); | ||
expect($httpBackend).toHaveBeenCalledOnce(); | ||
|
@@ -1412,11 +1414,12 @@ describe('$http', function() { | |
}); | ||
|
||
|
||
it('should use withCredentials from default', function() { | ||
it('should use withCredentials and overrideMimeType from default', function() { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't think we should be testing overrideMimeType in this spec, it should get its own spec, so that we can keep the scope of each spec very narrow There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why make this different than the immediately preceding spec for |
||
var $httpBackend = jasmine.createSpy('$httpBackend'); | ||
|
||
$httpBackend.andCallFake(function(m, u, d, c, h, timeout, withCredentials, responseType) { | ||
$httpBackend.andCallFake(function(m, u, d, c, h, timeout, withCredentials, responseType, overrideMimeType) { | ||
expect(withCredentials).toBe(true); | ||
expect(overrideMimeType).toBe('text/plain;charset=x-user-defined'); | ||
}); | ||
|
||
module(function($provide) { | ||
|
@@ -1425,6 +1428,7 @@ describe('$http', function() { | |
|
||
inject(function($http, $rootScope) { | ||
$http.defaults.withCredentials = true; | ||
$http.defaults.overrideMimeType = 'text/plain;charset=x-user-defined'; | ||
$http({ | ||
method: 'GET', | ||
url: 'some.html', | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not big on adding a new parameter to $httpBackend, but I guess there's no other way
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems odd to me that
$httpBackend
doesn't take aconfig
alike object, but it doesn't (for whatever reason).