Merge branch 'master' into master

generators/api/templates/index.test.js

@@ -6,7 +6,7 @@ var hasAnotherSession = storeUser &&
   (userMethods.indexOf('PUT') >= 0 || userMethods.indexOf('DELETE') >= 0);
 _%>
 <%_ if (methods.length) { _%>
-import request from 'supertest-as-promised'
+import request from 'supertest'
 <%_ } _%>
 <%_ if (hasMaster) { _%>
 import { masterKey, apiRoot } from '../../config'

generators/app/templates/api/auth/index.test.js

@@ -1,7 +1,7 @@
 <%_ if (authServices.length) { _%>
 import { stub } from 'sinon'
 <%_ } _%>
-import request from 'supertest-as-promised'
+import request from 'supertest'
 <%_ if (passwordSignup) { _%>
 import { masterKey, apiRoot } from '../../config'
 import { User } from '../user'

generators/app/templates/api/password-reset/index.test.js

@@ -1,4 +1,4 @@
-import request from 'supertest-as-promised'
+import request from 'supertest'
 import nock from 'nock'
 import express from '../../services/express'
 import { masterKey, apiRoot } from '../../config'

generators/app/templates/api/user/index.test.js

@@ -1,4 +1,4 @@
-import request from 'supertest-as-promised'
+import request from 'supertest'
 import { masterKey, apiRoot } from '../../config'
 import { signSync } from '../../services/jwt'
 import express from '../../services/express'

package.json

@@ -92,8 +92,6 @@
     "request": "^2.83.0",
     "request-promise": "^4.2.2",
     "sendgrid": "^4.0.2",
-    "sinon": "^4.1.1",
-    "supertest": "^3.0.0",
     "supertest-as-promised": "^4.0.0",
     "yeoman-assert": "^2.0.0",
     "yeoman-test": "^1.0.0"

yarn.lock

@@ -4853,6 +4853,10 @@ mimic-fn@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
 
+mime@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
+
 [email protected]:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.3.0.tgz#275d8edaac4f1bb3326472089e7949c8394699dd"
@@ -5726,6 +5730,10 @@ qs@^6.0.2, qs@~6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.0.tgz#3b7848c03c2dece69a9522b0fae8c4126d745f3b"
 
+qs@^6.5.1:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
+
 qs@~6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.0.tgz#f403b264f23bc01228c74131b407f18d5ea5d442"
@@ -6693,7 +6701,7 @@ subcommand@^2.0.3:
     debug "^2.1.3"
     minimist "^1.2.0"
     xtend "^4.0.0"
-
+    
 superagent@^3.0.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/superagent/-/superagent-3.8.0.tgz#87e3ed536c8860c08c7c7d1225da9a80cab064c6"
@@ -6715,7 +6723,7 @@ supertest-as-promised@^4.0.0:
   dependencies:
     bluebird "^3.3.1"
     methods "^1.1.1"
-
+    
 supertest@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/supertest/-/supertest-3.0.0.tgz#8d4bb68fd1830ee07033b1c5a5a9a4021c965296"