From 212a1217c546ecc0aab8671c19355b0af4805f06 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 15 Apr 2021 16:49:35 +0100 Subject: [PATCH 1/2] merge --- packages/server/src/db/client.js | 14 +++++++------- packages/worker/src/api/controllers/auth.js | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/server/src/db/client.js b/packages/server/src/db/client.js index 3e3a4f50fe..3fc2cae64d 100644 --- a/packages/server/src/db/client.js +++ b/packages/server/src/db/client.js @@ -15,13 +15,13 @@ let POUCH_DB_DEFAULTS = { skip_setup: env.isProd(), } -if (env.isTest()) { - PouchDB.plugin(require("pouchdb-adapter-memory")) - POUCH_DB_DEFAULTS = { - prefix: undefined, - adapter: "memory", - } -} +// if (env.isTest()) { +// PouchDB.plugin(require("pouchdb-adapter-memory")) +// POUCH_DB_DEFAULTS = { +// prefix: undefined, +// adapter: "memory", +// } +// } const Pouch = PouchDB.defaults(POUCH_DB_DEFAULTS) diff --git a/packages/worker/src/api/controllers/auth.js b/packages/worker/src/api/controllers/auth.js index 0814a5c940..03589ab457 100644 --- a/packages/worker/src/api/controllers/auth.js +++ b/packages/worker/src/api/controllers/auth.js @@ -28,7 +28,7 @@ exports.authenticate = async (ctx, next) => { exports.logout = async ctx => { clearCookie(ctx, Cookies.Auth) - ctx.body = { messaged: "User logged out" } + ctx.body = { message: "User logged out" } } exports.googleAuth = async () => { From 9db21447c3f01b9a476d8e81d2a04427cb687e97 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 15 Apr 2021 16:50:06 +0100 Subject: [PATCH 2/2] uncomment code --- packages/server/src/db/client.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/server/src/db/client.js b/packages/server/src/db/client.js index 3fc2cae64d..3e3a4f50fe 100644 --- a/packages/server/src/db/client.js +++ b/packages/server/src/db/client.js @@ -15,13 +15,13 @@ let POUCH_DB_DEFAULTS = { skip_setup: env.isProd(), } -// if (env.isTest()) { -// PouchDB.plugin(require("pouchdb-adapter-memory")) -// POUCH_DB_DEFAULTS = { -// prefix: undefined, -// adapter: "memory", -// } -// } +if (env.isTest()) { + PouchDB.plugin(require("pouchdb-adapter-memory")) + POUCH_DB_DEFAULTS = { + prefix: undefined, + adapter: "memory", + } +} const Pouch = PouchDB.defaults(POUCH_DB_DEFAULTS)