fix #95

nuysoft · Feb 2, 2016 · 5f4d246 · 5f4d246
1 parent 56bd67d
commit 5f4d246
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 10 deletions.
diff --git a/dist/mock-min.js b/dist/mock-min.js
diff --git a/dist/mock-min.js.map b/dist/mock-min.js.map
diff --git a/dist/mock.js b/dist/mock.js
@@ -85,7 +85,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	    _mocked: {}
 	}
 
-	Mock.version = '1.0.1-beta1'
+	Mock.version = '1.0.1-beta2'
 
 	// 避免循环依赖
 	if (XHR) XHR.Mock = Mock
@@ -8089,7 +8089,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	}
 
 	var XHR_EVENTS = 'readystatechange loadstart progress abort error load timeout loadend'.split(' ')
-
+	var XHR_REQUEST_PROPERTIES = 'timeout withCredentials'.split(' ')
 	var XHR_RESPONSE_PROPERTIES = 'readyState responseURL status statusText responseType response responseText responseXML'.split(' ')
 
 	// https://github.com/trek/FakeXMLHttpRequest/blob/master/fake_xml_http_request.js#L32
@@ -8207,7 +8207,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	        function handle(event) {
 	            // 同步属性 NativeXMLHttpRequest => MockXMLHttpRequest
-	            for (var i = 0, len = XHR_RESPONSE_PROPERTIES.length; i < len; i++) {
+	            for (var i = 0; i < XHR_RESPONSE_PROPERTIES.length; i++) {
 	                try {
 	                    that[XHR_RESPONSE_PROPERTIES[i]] = xhr[XHR_RESPONSE_PROPERTIES[i]]
 	                } catch (e) {}
@@ -8231,6 +8231,13 @@ return /******/ (function(modules) { // webpackBootstrap
 	            if (username) xhr.open(method, url, async, username, password)
 	            else xhr.open(method, url, async)
 
+	            // 同步属性 MockXMLHttpRequest => NativeXMLHttpRequest
+	            for (var j = 0; j < XHR_REQUEST_PROPERTIES.length; j++) {
+	                try {
+	                    xhr[XHR_REQUEST_PROPERTIES[j]] = that[XHR_REQUEST_PROPERTIES[j]]
+	                } catch (e) {}
+	            }
+
 	            return
 	        }
 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "mockjs",
   "title": "Mock.js",
   "description": "生成随机数据 & 拦截 Ajax 请求",
-  "version": "1.0.1-beta1",
+  "version": "1.0.1-beta2",
   "homepage": "http://mockjs.com/",
   "keywords": [
     "mock",

diff --git a/src/mock.js b/src/mock.js
@@ -29,7 +29,7 @@ var Mock = {
     _mocked: {}
 }
 
-Mock.version = '1.0.1-beta1'
+Mock.version = '1.0.1-beta2'
 
 // 避免循环依赖
 if (XHR) XHR.Mock = Mock

diff --git a/src/mock/xhr/xhr.js b/src/mock/xhr/xhr.js
@@ -81,7 +81,7 @@ var XHR_STATES = {
 }
 
 var XHR_EVENTS = 'readystatechange loadstart progress abort error load timeout loadend'.split(' ')
-
+var XHR_REQUEST_PROPERTIES = 'timeout withCredentials'.split(' ')
 var XHR_RESPONSE_PROPERTIES = 'readyState responseURL status statusText responseType response responseText responseXML'.split(' ')
 
 // https://github.com/trek/FakeXMLHttpRequest/blob/master/fake_xml_http_request.js#L32
@@ -199,7 +199,7 @@ Util.extend(MockXMLHttpRequest.prototype, {
 
         function handle(event) {
             // 同步属性 NativeXMLHttpRequest => MockXMLHttpRequest
-            for (var i = 0, len = XHR_RESPONSE_PROPERTIES.length; i < len; i++) {
+            for (var i = 0; i < XHR_RESPONSE_PROPERTIES.length; i++) {
                 try {
                     that[XHR_RESPONSE_PROPERTIES[i]] = xhr[XHR_RESPONSE_PROPERTIES[i]]
                 } catch (e) {}
@@ -223,6 +223,13 @@ Util.extend(MockXMLHttpRequest.prototype, {
             if (username) xhr.open(method, url, async, username, password)
             else xhr.open(method, url, async)
 
+            // 同步属性 MockXMLHttpRequest => NativeXMLHttpRequest
+            for (var j = 0; j < XHR_REQUEST_PROPERTIES.length; j++) {
+                try {
+                    xhr[XHR_REQUEST_PROPERTIES[j]] = that[XHR_REQUEST_PROPERTIES[j]]
+                } catch (e) {}
+            }
+
             return
         }
 

diff --git a/test/test.mock.request.js b/test/test.mock.request.js
@@ -60,6 +60,35 @@ describe('Request', function() {
             })
         })
     })
+    describe('jQuery.ajax() XHR Fields', function() {
+        it('', function(done) {
+            var that = this
+            var url = Math.random()
+            var xhr
+            $.ajax({
+                xhr: function() {
+                    xhr = $.ajaxSettings.xhr()
+                    return xhr
+                },
+                url: url,
+                dataType: 'json',
+                xhrFields: {
+                    timeout: 123,
+                    withCredentials: true
+                }
+            }).done(function( /*data, textStatus, jqXHR*/ ) {
+                // 不会进入
+            }).fail(function(jqXHR /*, textStatus, errorThrown*/ ) {
+                // 浏览器 || PhantomJS
+                expect([404, 0]).to.include(jqXHR.status)
+                that.test.title += url + ' => ' + jqXHR.status
+                expect(xhr.timeout).to.be.equal(123)
+                expect(xhr.withCredentials).to.be.equal(true)
+            }).always(function() {
+                done()
+            })
+        })
+    })
 
     describe('Mock.mock( rurl, template )', function() {
         it('', function(done) {