Support complex request and bump new version

Author: WhatAKitty

README.md

@@ -16,7 +16,7 @@ So, I create one by myself.
 __ mocks__/index.js
 ```
 export default {
-  '/api/path': (options) => {
+  '/api/path': ({ method, url, params, headers }) => {
     const all = Mock.mock({
       'list|2': [{
         'id|+1': 1,

__mocks__/index.js

@@ -1,7 +1,7 @@
 import { Mock } from '../';
 
 export default {
-  '/api/users': (options) => {
+  '/api/users': ({ params }) => {
     const all = [
       {
         name: 'John',
@@ -13,14 +13,14 @@ export default {
       }
     ];
     let filtered;
-    if ('undefined' !== typeof options) {
+    if ('undefined' !== typeof params) {
       filtered = all.filter(item => {
         let result = true;
-        const keys = Object.keys(options);
+        const keys = Object.keys(params);
         keys.forEach(key => {
-          const option = options[key];
+          const param = params[key];
 
-          if (item[key] && item[key] !== option) {
+          if (item[key] && item[key] !== param) {
             result = false;
           }
         });
@@ -34,7 +34,7 @@ export default {
       data: filtered,
     });
   },
-  '/api/users/mockjs': (options) => {
+  '/api/users/mockjs': ({ params }) => {
     const all = Mock.mock({
       'list|2': [{
         'id|+1': 1,
@@ -43,14 +43,14 @@ export default {
       }]
     }).list;
     let filtered;
-    if ('undefined' !== typeof options) {
+    if ('undefined' !== typeof params) {
       filtered = all.filter(item => {
         let result = true;
-        const keys = Object.keys(options);
+        const keys = Object.keys(params);
         keys.forEach(key => {
-          const option = options[key];
+          const param = params[key];
 
-          if (item[key] && item[key] !== option) {
+          if (item[key] && item[key] !== param) {
             result = false;
           }
         });

example/Basic/__mocks__/index.js

@@ -1,6 +1,6 @@
 
 export default {
-  '/api/users': (options) => {
+  '/api/users': ({ params }) => {
     const all = [
       {
         name: 'John',
@@ -12,14 +12,14 @@ export default {
       }
     ];
     let filtered;
-    if ('undefined' !== typeof options) {
+    if ('undefined' !== typeof params) {
       filtered = all.filter(item => {
         let result = true;
-        const keys = Object.keys(options);
+        const keys = Object.keys(params);
         keys.forEach(key => {
-          const option = options[key];
+          const param = params[key];
 
-          if (item[key] && item[key] !== option) {
+          if (item[key] && item[key] !== param) {
             result = false;
           }
         });

example/WithMockJs/__mocks__/index.js

@@ -1,7 +1,7 @@
 import { Mock } from 'react-native-fetch-mock';
 
 export default {
-  '/api/users/mockjs': (options) => {
+  '/api/users/mockjs': ({ params }) => {
     const all = Mock.mock({
       'list|1-10': [{
         'id|+1': 1,
@@ -10,14 +10,14 @@ export default {
       }]
     }).list;
     let filtered;
-    if ('undefined' !== typeof options) {
+    if ('undefined' !== typeof params) {
       filtered = all.filter(item => {
         let result = true;
-        const keys = Object.keys(options);
+        const keys = Object.keys(params);
         keys.forEach(key => {
-          const option = options[key];
+          const param = params[key];
 
-          if (item[key] && item[key] !== option) {
+          if (item[key] && item[key] !== param) {
             result = false;
           }
         });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-fetch-mock",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "fetch mock for react-native",
   "main": "index.js",
   "scripts": {

src/index.js

@@ -1,4 +1,4 @@
-import { prueUrl } from './util';
+import { parseRequest } from './util';
 
 class FetchMock {
   constructor(required) {
@@ -39,13 +39,14 @@ class FetchMock {
   }
 
   fetch(url, options) {
-    const filters = this.urls.filter(uri => uri.url === prueUrl(url));
+    const request = parseRequest(url, options);
+    const filters = this.urls.filter(uri => uri.url === request.url);
     if (!filters || filters.length == 0) throw new Error(`No url ${url} is defined.`);
     const mock = filters[0];
     if ('function' !== typeof mock.func) {
       throw new Error('There is no url defined in __mocks__');
     }
-    const promise = mock.func(options);
+    const promise = mock.func(request);
     if (!promise || 'function' !== typeof promise.then) {
       throw new Error('The result of mock function should be a promise.');
     }

src/util.js

@@ -1,4 +1,59 @@
 
+const parseParamStr = (paramStr, isGet) => {
+  let params = {};
+  const paramPairs = paramStr.split('&');
+  for (var i = 0; i < paramPairs.length; i++) {
+    const paramPair = paramPairs[i];
+    if (paramPair.indexOf('=') === -1) {
+      continue;
+    }
+    const paramPairArray = paramPair.split('=');
+
+    const paramValue = isGet ? decodeURI(paramPairArray[1]) : paramPairArray[1];
+    params[paramPairArray[0]] = paramPairArray.length === 2 ? paramValue : null;
+  }
+  return params;
+}
+
+const parseBody = (body) => {
+  if ('object' === typeof body) {
+    return body;
+  }
+  try {
+    return JSON.parse(body);
+  } catch (e) {
+    return parseParamStr(body);
+  }
+}
+
+const parseUrl = (url) => {
+  const index = url.indexOf('?');
+  const items = index > -1 ? url.split('?') : [url];
+  if (items.length === 1) {
+    return {
+      url: items[0],
+      params: {},
+    };
+  }
+
+  return {
+    url: items[0],
+    params: parseParamStr(items[1], true),
+  };
+}
+
+
+const parseRequest = (url, options = {}) => {
+  const urlObj = parseUrl(url);
+  const data = parseBody(options.body || {});
+  return {
+    method: options.method || 'GET',
+    url: urlObj.url,
+    headers: options.headers,
+    params: Object.assign({}, urlObj.params, data),
+  };
+}
+
 const prueUrl = (url) => {
   const index = url.indexOf('?');
   const result = index > -1 ? url.substring(0, index) : url;
@@ -7,4 +62,6 @@ const prueUrl = (url) => {
 
 export {
   prueUrl,
+  parseUrl,
+  parseRequest,
 }

test/index.test.js

@@ -20,9 +20,23 @@ describe('test fetch mock', () => {
     expect(data).to.have.length(2);
   });
 
-  it('fetch /api/users with parameters', async () => {
+  it('fetch /api/users with url parameters', async () => {
+    const { data } = await fetch('/api/users?name=John');
+    expect(data).not.to.be(undefined);
+    expect(data).not.to.be.empty();
+    expect(data).to.be.an('array');
+    expect(data).to.have.length(1);
+  });
+
+  it('fetch /api/users with post parameters', async () => {
     const { data } = await fetch('/api/users', {
-      name: 'John',
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
+        name: 'John',
+      }),
     });
     expect(data).not.to.be(undefined);
     expect(data).not.to.be.empty();
@@ -37,4 +51,12 @@ describe('test fetch mock', () => {
     expect(data).to.be.an('array');
     expect(data).to.have.length(2);
   });
+
+  it('fetch /api/users/mockjs with mockjs', async () => {
+    const { data } = await fetch('/api/users/mockjs');
+    expect(data).not.to.be(undefined);
+    expect(data).not.to.be.empty();
+    expect(data).to.be.an('array');
+    expect(data).to.have.length(2);
+  });
 });

test/util.test.js

@@ -1,10 +1,69 @@
 import 'babel-polyfill';
 import expect from 'expect.js';
-import { prueUrl } from '../src/util';
+import { prueUrl, parseUrl, parseRequest } from '../src/util';
 
 describe('test util methods', () => {
   it('get prue url', async () => {
     expect(prueUrl('http://www.baidu.com?')).to.eql('http://www.baidu.com');
     expect(prueUrl('http://www.baidu.com?ab=23')).to.eql('http://www.baidu.com');
   });
+  it('parse basic url', async () => {
+    expect(parseUrl('http://www.baidu.com?')).to.eql({
+      url: 'http://www.baidu.com',
+      params: {},
+    });
+    expect(parseUrl('http://www.baidu.com?ab=23')).to.eql({
+      url: 'http://www.baidu.com',
+      params: {
+        ab: '23',
+      },
+    });
+    expect(parseUrl('http://www.baidu.com?ab=23&name=123')).to.eql({
+      url: 'http://www.baidu.com',
+      params: {
+        ab: '23',
+        name: '123',
+      },
+    });
+  });
+  it('parse error url', async () => {
+    expect(parseUrl('http://www.baidu.com?a')).to.eql({
+      url: 'http://www.baidu.com',
+      params: {},
+    });
+    expect(parseUrl('http://www.baidu.com?a??=1')).to.eql({
+      url: 'http://www.baidu.com',
+      params: {},
+    });
+    expect(parseUrl('http://www.baidu.com?a=1?b=1')).to.eql({
+      url: 'http://www.baidu.com',
+      params: {
+        a: '1',
+      },
+    });
+  });
+  it('parse encoded url', async () => {
+    expect(parseUrl('http://www.baidu.com?callback=http%20%201')).to.eql({
+      url: 'http://www.baidu.com',
+      params: {
+        callback: 'http  1'
+      },
+    });
+  });
+  it('parse request', async () => {
+    expect(parseRequest('http://www.baidu.com?callback=http%20%201', {
+      headers: {
+        'Content-Type': 'application/json',
+      }
+    })).to.eql({
+      method: 'GET',
+      url: 'http://www.baidu.com',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      params: {
+        callback: 'http  1'
+      },
+    });
+  });
 });