From 9031fb69ff3dfd2190e70a6cacdb47080a692459 Mon Sep 17 00:00:00 2001 From: jmelvin-r7 Date: Mon, 3 Jun 2019 13:16:21 -0400 Subject: [PATCH] Fixing issue 2195 - order of if/else blocks is causing unit tests mocking XHR. --- lib/defaults.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/defaults.js b/lib/defaults.js index dd1971859e..6cdfc06a84 100644 --- a/lib/defaults.js +++ b/lib/defaults.js @@ -15,13 +15,12 @@ function setContentTypeIfUnset(headers, value) { function getDefaultAdapter() { var adapter; - // Only Node.JS has a process variable that is of [[Class]] process - if (typeof process !== 'undefined' && Object.prototype.toString.call(process) === '[object process]') { - // For node use HTTP adapter - adapter = require('./adapters/http'); - } else if (typeof XMLHttpRequest !== 'undefined') { + if (typeof XMLHttpRequest !== 'undefined') { // For browsers use XHR adapter adapter = require('./adapters/xhr'); + } else if (typeof process !== 'undefined' && Object.prototype.toString.call(process) === '[object process]') { + // For node use HTTP adapter + adapter = require('./adapters/http'); } return adapter; }