Add fetch test

Author: pik

fetch/karma.conf.js

@@ -52,6 +52,7 @@ module.exports = function (config) {
     browsers: browsers,
     files: [
       'node_modules/babel-polyfill/dist/polyfill.js',
+      'node_modules/whatwg-fetch/fetch.js',
       'node_modules/js-data/dist/js-data.js',
       'fetch/dist/js-data-fetch.js',
       'fetch/karma.start.js',

fetch/karma.start.js

@@ -1,6 +1,8 @@
 /* global JSData:true, JSDataHttp:true, sinon:true, chai:true */
+
 before(function () {
   var Test = this
+  Test.TEST_FETCH = true
   Test.fail = function (msg) {
     if (msg instanceof Error) {
       console.log(msg.stack)

fetch/package.json

@@ -18,8 +18,7 @@
     "axios",
     "rest",
     "adapter",
-    "http",
-    "fetch"
+    "http"
   ],
   "dependencies": {
     "js-data-adapter": "~0.8.1"

karma.conf.js

@@ -52,6 +52,7 @@ module.exports = function (config) {
     browsers: browsers,
     files: [
       'node_modules/babel-polyfill/dist/polyfill.js',
+      'node_modules/whatwg-fetch/fetch.js',
       'node_modules/js-data/dist/js-data.js',
       'dist/js-data-http.js',
       'karma.start.js',

karma.start.js

@@ -1,6 +1,8 @@
 /* global JSData:true, JSDataHttp:true, sinon:true, chai:true */
+
 before(function () {
   var Test = this
+  Test.TEST_FETCH = false
   Test.fail = function (msg) {
     if (msg instanceof Error) {
       console.log(msg.stack)

package.json

@@ -95,6 +95,7 @@
     "phantomjs-prebuilt": "2.1.12",
     "rollup-plugin-commonjs": "3.3.1",
     "rollup-plugin-replace": "1.1.1",
-    "uglify-js": "2.7.0"
+    "uglify-js": "2.7.0",
+    "whatwg-fetch": "^1.0.0"
   }
 }

src/index.js

@@ -1,4 +1,4 @@
-/* global fetch:true Headers:true Request:true */
+/* global fetch:true Headers:true */
 
 import {utils} from 'js-data'
 import axios from '../node_modules/axios/dist/axios'
@@ -53,7 +53,7 @@ function buildUrl (url, params) {
     }
 
     val.forEach(function (v) {
-      if (window.toString.call(v) === '[object Date]') {
+      if (toString.call(v) === '[object Date]') {
         v = v.toISOString()
       } else if (utils.isObject(v)) {
         v = utils.toJson(v)
@@ -558,20 +558,19 @@ Adapter.extend({
    * @param {Object} config.headers Headers for the request.
    * @param {Object} config.params Querystring for the request.
    * @param {string} config.url Url for the request.
-   * @param {Object} [opts] Configuration options.
    */
-  fetch (config, opts) {
+  fetch (config) {
     const requestConfig = {
       method: config.method,
       // turn the plain headers object into the Fetch Headers object
-      headers: new Headers(config.headers)
+      headers: new Headers(config.headers || {})
     }
 
     if (config.data) {
       requestConfig.body = utils.toJson(config.data)
     }
 
-    return fetch(new Request(buildUrl(config.url, config.params), requestConfig))
+    return fetch(buildUrl(config.url, config.params), requestConfig)
       .then((response) => {
         response.config = {
           method: config.method,

test/fetch.test.js

@@ -1,3 +1,36 @@
 describe('fetch', function () {
-  it('should fetch')
+  it('should fetch from a URL', function (done) {
+    var Test = this
+    // Don't test fetch for Node
+    try {
+      fetch // eslint-disable-line
+    } catch (e) {
+      return this.skip()
+    }
+    if (Test.TEST_FETCH) {
+      Test.xhr = Test.sinon.useFakeXMLHttpRequest()
+      Test.requests = []
+      Test.xhr.onCreate = function (xhr) {
+        Test.requests.push(xhr)
+      }
+    }
+
+    setTimeout(function () {
+      Test.requests[0].respond(200, { 'Content-Type': 'application/json' }, '{}')
+    }, 300)
+
+    Test.adapter.fetch({
+      method: 'get',
+      params: { active: true },
+      url: '/api/foos'
+    }).then(function (response) {
+      var request = Test.requests[0]
+      Test.assert.equal(request.method, 'GET')
+      Test.assert.equal(request.url, '/api/foos?active=true')
+      if (Test.TEST_FETCH) {
+        Test.xhr.restore()
+      }
+      done()
+    })
+  })
 })