Skip to content

fix #286 #321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
springwang wants to merge 2 commits into
base: refactoring
Choose a base branch
from
Open

fix #286 #321

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2a4cf6
fix #286
springwang Sep 29, 2018
e397f15
fix #286
springwang Sep 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/mock/xhr/xhr.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,12 @@ Util.extend(MockXMLHttpRequest.prototype, {

// 原生 XHR
if (!this.match) {
// 修复timeout和withCredentials不生效的问题
Util.extend(that.custom.xhr, {
timeout: that.timeout,
withCredentials: that.withCredentials
});

this.custom.xhr.send(data)
return
}
Expand Down Expand Up @@ -439,4 +445,4 @@ function convert(item, options) {
item.template(options) : MockXMLHttpRequest.Mock.mock(item.template)
}

module.exports = MockXMLHttpRequest
module.exports = MockXMLHttpRequest