Merge pull request #31 from concordnow/raw

Add `raw` support

addon/mixins/fetch-request.js

@@ -57,13 +57,15 @@ export default Mixin.create({
   contentType: 'application/x-www-form-urlencoded; charset=UTF-8',
 
   /**
-   * Make a fetch request
+   * Make a fetch request, returning the raw fetch response
+   *
+   * Unlike ember-ajax this method returns the raw fetch response not an xhr
    * @method request
    * @param {string} url The url for the request
    * @param {object} options The options hash for the request
-   * @return {Promise<*>}
+   * @return {object} containing {response, requestOptions, builtURL}
    */
-  async request(url, options = {}) {
+  async raw(url, options = {}) {
     const hash = this.options(url, options);
     const method = hash.method || hash.type || 'GET';
     const requestOptions = {
@@ -114,15 +116,29 @@ export default Mixin.create({
       if (timeout) {
         clearTimeout(timeout);
       }
-      response = await parseJSON(response);
 
-      return this._handleResponse(response, requestOptions, builtURL);
+      return {response, requestOptions, builtURL};
     } catch(error) {
       // TODO: do we want to just throw here or should some errors be okay?
       throw error;
     }
   },
 
+  /**
+   * Make a fetch request, ignoring the raw fetch response and dealing only with
+   * the response content
+   * @method request
+   * @param {string} url The url for the request
+   * @param {object} options The options hash for the request
+   * @return {Promise<*>}
+   */
+  async request(url, options = {}) {
+    let {response, requestOptions, builtURL} = await this.raw(url, options);
+    response = await parseJSON(response);
+
+    return this._handleResponse(response, requestOptions, builtURL);
+  },
+
   /**
    * Determine whether the headers should be added for this request
    *

tests/unit/mixins/fetch-request-test.js

@@ -322,6 +322,39 @@ module('Unit | Mixin | fetch-request', function(hooks) {
     assert.equal(options.contentType, defaultContentType);
   });
 
+  test('raw() response.post === options.data.post', function(assert) {
+    const service = FetchRequest.create();
+    const url = '/posts';
+    const title = 'Title';
+    const description = 'Some description.';
+    const contentType = 'application/json';
+    const customHeader = 'My custom header';
+    const options = {
+      data: {
+        post: { title, description }
+      }
+    };
+    const serverResponse = [
+      200,
+      { 'Content-Type': contentType,
+        'Custom-Header': customHeader },
+      JSON.stringify(options.data)
+    ];
+
+    this.server.get(url, () => serverResponse);
+
+    const rawPromise = service.raw(url, options);
+
+    return rawPromise.then(function({ response }) {
+      assert.equal(response.status, 200);
+      assert.equal(response.headers.get('Custom-Header'), customHeader);
+      assert.equal(response.headers.get('Content-Type'), contentType);
+      return response.json();
+    }).then((json) => {
+      assert.deepEqual(json.post, options.data.post);
+    });
+  });
+
   test('post() response.post === options.data.post', function(assert) {
     const service = FetchRequest.create();
     const url = '/posts';