Merge pull request #1152 from iLiviu/bugfix/1151-fetch_handle_text_responseType

fix default case for responseType in WireClient._fetchRequest #1151

Author: Sebastian Kippe

src/wireclient.js

@@ -536,6 +536,7 @@ WireClient._fetchRequest = function (method, url, options) {
         return response.blob();
       case 'json':
         return response.json();
+      case undefined:
       case '':
       case 'text':
         return response.text();
@@ -544,6 +545,9 @@ WireClient._fetchRequest = function (method, url, options) {
     }
   }).then(function (processedBody) {
     syntheticXhr.response = processedBody;
+    if (!options.responseType || options.responseType === 'text') {
+      syntheticXhr.responseText = processedBody;
+    }
     return syntheticXhr;
   });
 

test/helpers/mocks.js

@@ -97,6 +97,192 @@ define([], function() {
         this._responses = {};
       };
 
+    },
+
+    undefineMocks(env) {
+      delete global.Blob;
+      delete global.FileReader;
+      delete global.XMLHttpRequest;
+      delete global.fetch;
+      delete global.getMockRequestMethod;
+      delete global.getMockRequestUrl;
+      delete global.getMockRequestHeader;
+      delete global.getMockRequestBody;
+      delete global.mockRequestSuccess;
+      delete global.mockRequestFail;
+      delete global.addMockRequestCallback;
+      delete env.blob;
+      delete env.fileReaderResult;
+    },
+
+    defineXMLHttpRequestMock(env) {
+
+      var requestCallbacks = [];
+      global.XMLHttpRequest = function () {
+        XMLHttpRequest.instances.push(this);
+        this._headers = {};
+        this._responseHeaders = {};
+      };
+      XMLHttpRequest.instances = [];
+      XMLHttpRequest.prototype = {
+        open: function () {
+         this._open = Array.prototype.slice.call(arguments);
+        },
+        send: function () {
+          this._send = Array.prototype.slice.call(arguments);
+
+          if (requestCallbacks.length)
+            requestCallbacks.shift()(this);
+        },
+        setRequestHeader: function (key, value) {
+         this._headers[key] = value;
+        },
+        getResponseHeader: function (key) {
+         return this._responseHeaders[key] || null;
+        }
+      };
+      ['load', 'abort', 'error'].forEach(function (cb) {
+        Object.defineProperty(XMLHttpRequest.prototype, 'on' + cb, {
+          configurable: true,
+          set: function (f) {
+           this['_on' + cb] = f;
+          }
+        });
+      });
+
+      global.addMockRequestCallback = function(callback) {
+        requestCallbacks.push(callback);
+      };
+
+  
+      global.getMockRequestMethod = function() {
+        var request = XMLHttpRequest.instances[0];
+        return request._open[0];
+      };
+  
+      global.getMockRequestUrl = function() {
+        var request = XMLHttpRequest.instances[0];
+        return request._open[1];
+      };
+  
+      global.getMockRequestHeader = function (headerName) {
+        var req = XMLHttpRequest.instances[0];
+        return req._headers[headerName];
+      };
+  
+      global.getMockRequestBody = function () {
+        var request = XMLHttpRequest.instances[0];
+        return request._send[0];
+      };
+  
+      global.mockRequestSuccess = function (param) {
+        var req = XMLHttpRequest.instances.shift();
+        req._responseHeaders = param.responseHeaders || {};
+        req.status = param.status;
+        req.response = param.arrayBuffer || param.responseText;
+        req.responseText = param.responseText;
+        req._onload();
+      };
+  
+      global.mockRequestFail = function (errMsg) {
+        var req = XMLHttpRequest.instances.shift();
+        req._onerror(errMsg);
+      };      
+    },
+
+    defineFetchMock(env) {
+
+      var fetchesData = [];
+      var requestCallbacks = [];
+
+      global.fetch = function (url, init) {
+        init = init || {};
+        promise = new Promise(function (resolve, reject) {
+          fetchesData.push({
+            url: url,
+            method: init.method || 'GET',
+            requestHeaders: init.headers || {},
+            requestBody: init.body,
+            resolve: resolve,
+            reject: reject});
+        });
+
+        if (requestCallbacks.length)
+          requestCallbacks.shift()(this);
+        return promise;
+
+      };
+
+      global.addMockRequestCallback = function(callback) {
+        requestCallbacks.push(callback);
+      };
+  
+      global.getMockRequestMethod = function() {
+        var fetchData = fetchesData[0];
+        return fetchData.method;
+      };
+  
+      global.getMockRequestUrl = function() {
+        var fetchData = fetchesData[0];
+        return fetchData.url;
+      };
+  
+      global.getMockRequestHeader = function (headerName) {
+        var fetchData = fetchesData[0];
+        return fetchData.requestHeaders[headerName];
+      };
+  
+      global.getMockRequestBody = function () {
+        var fetchData = fetchesData[0];
+        return fetchData.requestBody;
+      };
+  
+      global.mockRequestSuccess = function (param) {
+        var fetchData = fetchesData.shift();
+  
+        var responseHeaders = {   // mock Headers obj
+          _headers: param.responseHeaders || {},   // POJSO
+          forEach: function (callback, thisArg) {
+            var thisObj = thisArg || responseHeaders;
+            for (headerName in responseHeaders._headers) {
+              callback.call(thisObj, responseHeaders._headers[headerName], headerName, responseHeaders);
+            }
+          }
+        };
+        var response = {   // mock Response obj
+          headers: responseHeaders,
+          ok: param.status >= 200 && param.status < 300,
+          redirected: false,
+          status: param.status,
+          statusText: param.statusText || '',
+          type: param.corsResponseType || 'basic',
+          url: fetchData.url,
+          useFinalURL: true,
+          body: function () {   // getter for ReadableStream
+            throw new Error("not implemented in mock");
+          },
+          bodyUsed: false,
+          arrayBuffer: function () {
+            return Promise.resolve(param.arrayBuffer);
+          },
+          blob: function () {
+            throw new Error("not implemented in mock");
+          },
+          text: function () {
+            return Promise.resolve(param.responseText);
+          },
+          json: function () {
+            throw new Error("not implemented in mock");
+          }
+        };
+  
+        fetchData.resolve(response);
+      };
+  
+      global.mockRequestFail = function (errMsg) {
+        var fetchData = fetchesData.shift();
+        fetchData.reject(errMsg);
+      };      
     }
   };
 });