Merge branch 'master' into fix-mongo-deprecations

keystonejs · Jan 10, 2020 · fd210e4 · fd210e4
2 parents 0e0b705 + 948e8c1
commit fd210e4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/keystone/tests/bin/dev-command.test.js b/packages/keystone/tests/bin/dev-command.test.js
@@ -61,7 +61,7 @@ describe('dev command', () => {
         // A mock keystone instance
         keystone: {
           auth: {},
-          prepare: () => Promise.resolve({ middlewares: (req, res, next) => res.send(200) }),
+          prepare: () => Promise.resolve({ middlewares: (req, res, next) => res.sendStatus(200) }),
           connect: () => Promise.resolve(),
         }
       }`
@@ -87,7 +87,7 @@ describe('dev command', () => {
         // A mock keystone instance
         keystone: {
           auth: {},
-          prepare: () => Promise.resolve({ middlewares: (req, res, next) => res.send(200) }),
+          prepare: () => Promise.resolve({ middlewares: (req, res, next) => res.sendStatus(200) }),
           connect: () => Promise.resolve(),
         }
       }`

diff --git a/yarn.lock b/yarn.lock
@@ -23005,7 +23005,7 @@ which-pm-runs@^1.0.0:
   resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb"
   integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=
 
-which@^1.2.9, which@^1.3.0:
+which@^1.2.14, which@^1.2.9, which@^1.3.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==