Merge pull request #6 from Typeform/fix-release

jepser · web-flow · commit cd659b283c2a · 2018-08-17T15:12:30.000+02:00
Fixes for release
diff --git a/.eslintrc.json b/.eslintrc.json
diff --git a/.prettierrc.json b/.prettierrc.json
diff --git a/package.json b/package.json
@@ -29,37 +29,32 @@
     "isomorphic-fetch": "^2.2.1"
   },
   "devDependencies": {
-    "@babel/cli": "^7.0.0-beta.44",
-    "@babel/core": "^7.0.0-beta.44",
-    "@babel/node": "^7.0.0-beta.44",
-    "@babel/plugin-proposal-object-rest-spread": "^7.0.0-beta.44",
-    "@babel/preset-env": "^7.0.0-beta.44",
+    "@babel/cli": "^7.0.0-rc.1",
+    "@babel/core": "^7.0.0-rc.1",
+    "@babel/node": "^7.0.0-rc.1",
+    "@babel/plugin-proposal-object-rest-spread": "^7.0.0-rc.1",
+    "@babel/preset-env": "^7.0.0-rc.1",
     "@commitlint/cli": "^6.1.3",
     "@commitlint/config-conventional": "^6.1.3",
-    "axios-mock-adapter": "^1.15.0",
     "babel-core": "^7.0.0-bridge.0",
     "babel-eslint": "^8.2.3",
     "babel-jest": "^22.4.3",
     "babel-loader": "^7.1.4",
-    "eslint": "^4.19.1",
-    "eslint-config-prettier": "^2.9.0",
-    "eslint-plugin-prettier": "^2.6.0",
     "husky": "^0.14.3",
     "in-publish": "^2.0.0",
     "jest": "^22.4.3",
     "jest-fetch-mock": "^1.6.5",
     "json-server": "^0.14.0",
     "lint-staged": "^7.0.4",
     "nodemon": "^1.18.3",
-    "prettier": "^1.12.1",
     "semantic-release": "^15.1.7",
-    "sinon": "^4.5.0",
+    "standard": "^11.0.1",
     "webpack": "^4.6.0",
     "webpack-cli": "^2.0.14"
   },
   "lint-staged": {
     "*.js": [
-      "eslint",
+      "standard",
       "git add"
     ]
   },
@@ -78,10 +73,16 @@
     "build:dist": "webpack --mode production",
     "build:lib": "NODE_ENV=production babel src --out-dir lib",
     "prepublish": "in-publish && npm run build:dist && npm run build:lib || not-in-publish",
-    "pretty": "prettier './{src,tests}/**/*.js' --write",
+    "lint": "standard ./src",
     "semantic-release": "semantic-release",
     "server": "node ./tests/integration/mockServer.js",
     "server:dev": "nodemon ./tests/integration/mockServer.js"
   },
+  "standard": {
+    "env": [
+      "jest"
+    ],
+    "globals": ["fetch"]
+  },
   "peerDependencies": {}
 }
diff --git a/src/create-client.js b/src/create-client.js
@@ -1,28 +1,37 @@
+/* globals fetch */
 import 'isomorphic-fetch'
 import { API_BASE_URL } from './constants'
 
 export const clientConstructor = ({ token, ...options }) => {
   return {
     request: (args) => {
-
       const {
         url,
+        data,
+        headers: argsHeaders = {},
         ...otherArgs
       } = args
 
+      const {
+        headers = {}
+      } = options
+
       const requestParameters = {
         ...options,
         ...otherArgs
       }
 
       return fetch(`${API_BASE_URL}${url}`, {
+        ...requestParameters,
+        body: JSON.stringify(data),
         headers: {
+          ...headers,
+          ...argsHeaders,
           Authorization: `bearer ${token}`
-        },
-        ...requestParameters
+        }
       })
         .then(response => response.json())
-      // .catch(error => { throw `${error}` })
+        .catch(error => { throw new Error(error) })
     }
   }
 }
diff --git a/src/forms.js b/src/forms.js
@@ -10,12 +10,12 @@ export default http => ({
   }
 })
 
-const getForms = (http, { page, page_size, search } = {}) => {
+const getForms = (http, { page, pageSize, search } = {}) => {
   return http.request({
     method: 'get',
     url: `/forms`,
     page,
-    page_size,
+    page_size: pageSize,
     search
   })
 }
diff --git a/src/images.js b/src/images.js
@@ -4,14 +4,14 @@ export default http => ({
   add: args => addImage(http, args),
   delete: args => deleteImage(http, args)
 })
-export const getImages = http => {
+const getImages = http => {
   return http.request({
     method: 'get',
     url: '/images'
   })
 }
 
-export const getImage = (
+const getImage = (
   http,
   { id, returns, size, backgroundSize, choiceSize }
 ) => {
@@ -21,7 +21,7 @@ export const getImage = (
   }
 
   if (returns === 'json') {
-    requestQuery['headers'] = {
+    requestQuery.headers = {
       Accept: 'application/json'
     }
   }
@@ -30,15 +30,15 @@ export const getImage = (
     if (['default', 'thumbnail', 'mobile'].includes(size)) {
       requestQuery['url'] += `/image/${size}`
     } else {
-      throw `Image size doesn't exists`
+      throw new Error(`Image size doesn't exists`)
     }
   }
 
   if (backgroundSize !== undefined) {
     if (['default', 'thumbnail', 'mobile', 'tablet'].includes(backgroundSize)) {
       requestQuery['url'] += `/background/${backgroundSize}`
     } else {
-      throw `Image background size doesn't exists`
+      throw new Error(`Image background size doesn't exists`)
     }
   }
 
@@ -54,26 +54,26 @@ export const getImage = (
     if (choiceImageSizes.includes(choiceSize)) {
       requestQuery['url'] += `/choice/${choiceSize}`
     } else {
-      throw `Image choice size doesn't exists`
+      throw new Error(`Image choice size doesn't exists`)
     }
   }
 
   return http.request(requestQuery)
 }
 
-export const addImage = (http, { image, media_type, file_name }) => {
+const addImage = (http, { image, mediaType, fileName }) => {
   return http.request({
     method: 'post',
     url: `/images`,
     data: {
       image,
-      file_name,
-      media_type
+      file_name: fileName,
+      media_type: mediaType
     }
   })
 }
 
-export const deleteImage = (http, { id }) => {
+const deleteImage = (http, { id }) => {
   return http.request({
     method: 'delete',
     url: `/images/${id}`
diff --git a/src/responses.js b/src/responses.js
@@ -2,7 +2,7 @@ export default http => ({
   list: args => getResponses(http, args)
 })
 
-export const getResponses = (
+const getResponses = (
   http,
   {
     uid,
diff --git a/src/teams.js b/src/teams.js
@@ -14,14 +14,14 @@ export default http => {
   }
 }
 
-export const getTeam = http => {
+const getTeam = http => {
   return http.request({
     method: 'get',
     url: '/teams/mine'
   })
 }
 
-export const addMembers = (http, { members }) => {
+const addMembers = (http, { members }) => {
   if (!isMemberPropValid(members)) {
     throw `No member provided`
   }
@@ -39,7 +39,7 @@ export const addMembers = (http, { members }) => {
   })
 }
 
-export const removeMembers = (http, { members }) => {
+const removeMembers = (http, { members }) => {
   if (!isMemberPropValid(members)) {
     throw `No member provided`
   }
diff --git a/src/themes.js b/src/themes.js
@@ -8,7 +8,7 @@ export default http => ({
   update: args => updateTheme(http, args)
 })
 
-export const getThemes = (http, { page, page_size } = {}) => {
+const getThemes = (http, { page, page_size } = {}) => {
   return http.request({
     method: 'get',
     url: '/themes',
@@ -19,14 +19,14 @@ export const getThemes = (http, { page, page_size } = {}) => {
   })
 }
 
-export const getTheme = (http, { id }) => {
+const getTheme = (http, { id }) => {
   return http.request({
     method: 'get',
     url: `/themes/${id}`
   })
 }
 
-export const createTheme = (
+const createTheme = (
   http,
   { background, colors, font, has_transparent_button, name }
 ) => {
@@ -50,14 +50,14 @@ export const createTheme = (
   })
 }
 
-export const deleteTheme = (http, { id }) => {
+const deleteTheme = (http, { id }) => {
   return http.request({
     method: 'delete',
     url: `/themes/${id}`
   })
 }
 
-export const updateTheme = (
+const updateTheme = (
   http,
   { id, background, colors, font, has_transparent_button, name }
 ) => {
diff --git a/src/typeform.js b/src/typeform.js
@@ -9,7 +9,7 @@ import webhooks from './webhooks'
 
 export const createClient = (args = {}) => {
   if (args.token === undefined) {
-    throw 'Token is missing'
+    throw new Error('Token is missing')
   }
 
   const http = clientConstructor(args)
diff --git a/src/webhooks.js b/src/webhooks.js
@@ -32,10 +32,10 @@ const createOrUpdateWebhook = (
   { uid, tag, url, enable = false }
 ) => {
   if (url === undefined) {
-    throw `Please provide an url for ${tag}`
+    throw new Error(`Please provide an url for ${tag}`)
   }
   if (tag === undefined) {
-    throw `Please provide a tag name for the webhook`
+    throw new Error(`Please provide a tag name for the webhook`)
   }
   return http.request({
     method: 'put',
diff --git a/tests/unit/create-client.test.js b/tests/unit/create-client.test.js
@@ -0,0 +1,26 @@
+import { clientConstructor } from '../../src/create-client'
+import { API_BASE_URL } from '../../src/constants'
+
+beforeEach(() => {
+  fetch.resetMocks()
+  fetch.mockResponse(JSON.stringify({}))
+})
+
+const client = clientConstructor({
+  token: 'abc'
+})
+
+test('request pass correct headers', () => {
+  client.request({
+    url: '/forms',
+    headers: {
+      Accepts: 'application/json'
+    }
+  })
+
+  expect(fetch.mock.calls[0][0]).toBe(`${API_BASE_URL}/forms`)
+  expect(fetch.mock.calls[0][1].headers).toEqual({
+    Accepts: 'application/json',
+    Authorization: 'bearer abc'
+  })
+})
diff --git a/tests/unit/forms.test.js b/tests/unit/forms.test.js
@@ -30,24 +30,26 @@ test('getForm sets get method', () => {
 
 test('updateForm sends the correct UID and data', () => {
   formsRequest.update({
-    uid: 'abc123', data: {
+    uid: 'abc123',
+    data: {
       title: 'hola'
     }
   })
+  const bodyParsed = JSON.parse(fetch.mock.calls[0][1].body)
   expect(fetch.mock.calls[0][0]).toBe(`${API_BASE_URL}/forms/abc123`)
-  expect(fetch.mock.calls[0][1].data.title).toBe('hola')
+  expect(bodyParsed.title).toBe('hola')
 })
 
 test('updateForm sets patch method in request by default', () => {
   formsRequest.update({
-    uid: 'abc123', data: {
+    uid: 'abc123',
+    data: {
       title: 'hola'
     }
   })
   expect(fetch.mock.calls[0][1].method).toBe('patch')
 })
 
-
 test('updateForm sets put method in request when override option is set', () => {
   formsRequest.update({
     uid: 'abc123',
diff --git a/tests/unit/images.test.js b/tests/unit/images.test.js
@@ -26,19 +26,19 @@ test('get images by ID', () => {
 test('adding an image pass the required values', () => {
   imagesRequest.add({
     image: 'bGRqZmxzZGpmbHNoZmtoc2RrZmpoc2tqZA==',
-    media_type: 'image/gif',
-    file_name: 'newimage.gif'
+    mediaType: 'image/gif',
+    fileName: 'newimage.gif'
   })
 
   expect(fetch.mock.calls[0][0]).toBe(`${API_BASE_URL}/images`)
   expect(fetch.mock.calls[0][1].method).toBe('post')
 
-  const imageData = fetch.mock.calls[0][1].data
-  expect(imageData).toEqual({
+  const imageData = fetch.mock.calls[0][1].body
+  expect(imageData).toEqual(JSON.stringify({
     image: 'bGRqZmxzZGpmbHNoZmtoc2RrZmpoc2tqZA==',
-    media_type: 'image/gif',
-    file_name: 'newimage.gif'
-  })
+    file_name: 'newimage.gif',
+    media_type: 'image/gif'
+  }))
 })
 
 test('deleting an image sets the correct method and id', () => {
diff --git a/tests/unit/teams.test.js b/tests/unit/teams.test.js
diff --git a/tests/unit/webhooks.test.js b/tests/unit/webhooks.test.js
diff --git a/tests/unit/workspaces.test.js b/tests/unit/workspaces.test.js
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -10,12 +10,12 @@ export default http => ({`
`10`	`10`	`}`
`11`	`11`	`})`
`12`	`12`
`13`		`-const getForms = (http, { page, page_size, search } = {}) => {`
	`13`	`+const getForms = (http, { page, pageSize, search } = {}) => {`
`14`	`14`	`return http.request({`
`15`	`15`	`method: 'get',`
`16`	`16`	url: `/forms`,
`17`	`17`	`page,`
`18`		`- page_size,`
	`18`	`+ page_size: pageSize,`
`19`	`19`	`search`
`20`	`20`	`})`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,14 @@ export default http => ({`
`4`	`4`	`add: args => addImage(http, args),`
`5`	`5`	`delete: args => deleteImage(http, args)`
`6`	`6`	`})`
`7`		`-export const getImages = http => {`
	`7`	`+const getImages = http => {`
`8`	`8`	`return http.request({`
`9`	`9`	`method: 'get',`
`10`	`10`	`url: '/images'`
`11`	`11`	`})`
`12`	`12`	`}`
`13`	`13`
`14`		`-export const getImage = (`
	`14`	`+const getImage = (`
`15`	`15`	`http,`
`16`	`16`	`{ id, returns, size, backgroundSize, choiceSize }`
`17`	`17`	`) => {`
`@@ -21,7 +21,7 @@ export const getImage = (`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`if (returns === 'json') {`
`24`		`- requestQuery['headers'] = {`
	`24`	`+ requestQuery.headers = {`
`25`	`25`	`Accept: 'application/json'`
`26`	`26`	`}`
`27`	`27`	`}`
`@@ -30,15 +30,15 @@ export const getImage = (`
`30`	`30`	`if (['default', 'thumbnail', 'mobile'].includes(size)) {`
`31`	`31`	requestQuery['url'] += `/image/${size}`
`32`	`32`	`} else {`
`33`		- throw `Image size doesn't exists`
	`33`	+ throw new Error(`Image size doesn't exists`)
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`if (backgroundSize !== undefined) {`
`38`	`38`	`if (['default', 'thumbnail', 'mobile', 'tablet'].includes(backgroundSize)) {`
`39`	`39`	requestQuery['url'] += `/background/${backgroundSize}`
`40`	`40`	`} else {`
`41`		- throw `Image background size doesn't exists`
	`41`	+ throw new Error(`Image background size doesn't exists`)
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`@@ -54,26 +54,26 @@ export const getImage = (`
`54`	`54`	`if (choiceImageSizes.includes(choiceSize)) {`
`55`	`55`	requestQuery['url'] += `/choice/${choiceSize}`
`56`	`56`	`} else {`
`57`		- throw `Image choice size doesn't exists`
	`57`	+ throw new Error(`Image choice size doesn't exists`)
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`return http.request(requestQuery)`
`62`	`62`	`}`
`63`	`63`
`64`		`-export const addImage = (http, { image, media_type, file_name }) => {`
	`64`	`+const addImage = (http, { image, mediaType, fileName }) => {`
`65`	`65`	`return http.request({`
`66`	`66`	`method: 'post',`
`67`	`67`	url: `/images`,
`68`	`68`	`data: {`
`69`	`69`	`image,`
`70`		`- file_name,`
`71`		`- media_type`
	`70`	`+ file_name: fileName,`
	`71`	`+ media_type: mediaType`
`72`	`72`	`}`
`73`	`73`	`})`
`74`	`74`	`}`
`75`	`75`
`76`		`-export const deleteImage = (http, { id }) => {`
	`76`	`+const deleteImage = (http, { id }) => {`
`77`	`77`	`return http.request({`
`78`	`78`	`method: 'delete',`
`79`	`79`	url: `/images/${id}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ export default http => ({`
`2`	`2`	`list: args => getResponses(http, args)`
`3`	`3`	`})`
`4`	`4`
`5`		`-export const getResponses = (`
	`5`	`+const getResponses = (`
`6`	`6`	`http,`
`7`	`7`	`{`
`8`	`8`	`uid,`
Original file line number	Diff line number	Diff line change
`@@ -14,14 +14,14 @@ export default http => {`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
`17`		`-export const getTeam = http => {`
	`17`	`+const getTeam = http => {`
`18`	`18`	`return http.request({`
`19`	`19`	`method: 'get',`
`20`	`20`	`url: '/teams/mine'`
`21`	`21`	`})`
`22`	`22`	`}`
`23`	`23`
`24`		`-export const addMembers = (http, { members }) => {`
	`24`	`+const addMembers = (http, { members }) => {`
`25`	`25`	`if (!isMemberPropValid(members)) {`
`26`	`26`	throw `No member provided`
`27`	`27`	`}`
`@@ -39,7 +39,7 @@ export const addMembers = (http, { members }) => {`
`39`	`39`	`})`
`40`	`40`	`}`
`41`	`41`
`42`		`-export const removeMembers = (http, { members }) => {`
	`42`	`+const removeMembers = (http, { members }) => {`
`43`	`43`	`if (!isMemberPropValid(members)) {`
`44`	`44`	throw `No member provided`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import webhooks from './webhooks'`
`9`	`9`
`10`	`10`	`export const createClient = (args = {}) => {`
`11`	`11`	`if (args.token === undefined) {`
`12`		`- throw 'Token is missing'`
	`12`	`+ throw new Error('Token is missing')`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`const http = clientConstructor(args)`