Merge pull request axios#1160 from owap/undefined-window

nickuraltsev · web-flow · commit 1fa01fd67415 · 2017-11-11T14:14:20.000-08:00
Move window defined check before window.XMLHttpRequest check
diff --git a/lib/adapters/xhr.js b/lib/adapters/xhr.js
@@ -24,9 +24,9 @@ module.exports = function xhrAdapter(config) {
     // For IE 8/9 CORS support
     // Only supports POST and GET calls and doesn't returns the response headers.
     // DON'T do this for testing b/c XMLHttpRequest is mocked, not XDomainRequest.
-    if (!window.XMLHttpRequest &&
-        process.env.NODE_ENV !== 'test' &&
+    if (process.env.NODE_ENV !== 'test' &&
         typeof window !== 'undefined' &&
+        !window.XMLHttpRequest &&
         window.XDomainRequest && !('withCredentials' in request) &&
         !isURLSameOrigin(config.url)) {
       request = new window.XDomainRequest();
