From 40fa2053e3688b104512a0bca4c07e580e16a9ab Mon Sep 17 00:00:00 2001 From: Hannah Wolfe Date: Tue, 21 Apr 2020 14:27:56 +0100 Subject: [PATCH] Moved serve-favicon mw into site app - Moved serve-favicon from shared to site as it is not shared - This file is only used in one place, this updates the code structure to reflect this - This is one of many similar changes needed to make it easier to refactor to the existing setup --- core/server/web/shared/middlewares/index.js | 4 ---- core/server/web/site/app.js | 2 +- core/server/web/site/middleware/index.js | 3 ++- .../middleware}/serve-favicon.js | 0 .../middleware/serve-favicon_spec.js | 20 +++++++++---------- 5 files changed, 13 insertions(+), 16 deletions(-) rename core/server/web/{shared/middlewares => site/middleware}/serve-favicon.js (100%) rename test/unit/web/{ => site}/middleware/serve-favicon_spec.js (90%) diff --git a/core/server/web/shared/middlewares/index.js b/core/server/web/shared/middlewares/index.js index 859523f00d..13fee844fd 100644 --- a/core/server/web/shared/middlewares/index.js +++ b/core/server/web/shared/middlewares/index.js @@ -55,10 +55,6 @@ module.exports = { return require('./request-id'); }, - get serveFavicon() { - return require('./serve-favicon'); - }, - get servePublicFile() { return require('./serve-public-file'); }, diff --git a/core/server/web/site/app.js b/core/server/web/site/app.js index 94923402ea..382763d90e 100644 --- a/core/server/web/site/app.js +++ b/core/server/web/site/app.js @@ -106,7 +106,7 @@ module.exports = function setupSiteApp(options = {}) { // Static content/assets // @TODO make sure all of these have a local 404 error handler // Favicon - siteApp.use(shared.middlewares.serveFavicon()); + siteApp.use(mw.serveFavicon()); // /public/members.js siteApp.get('/public/members.js', membersMiddleware.public); diff --git a/core/server/web/site/middleware/index.js b/core/server/web/site/middleware/index.js index daf1ba6094..b51ff4e8b6 100644 --- a/core/server/web/site/middleware/index.js +++ b/core/server/web/site/middleware/index.js @@ -1,3 +1,4 @@ module.exports = { - adminRedirects: require('./admin-redirects') + adminRedirects: require('./admin-redirects'), + serveFavicon: require('./serve-favicon') }; diff --git a/core/server/web/shared/middlewares/serve-favicon.js b/core/server/web/site/middleware/serve-favicon.js similarity index 100% rename from core/server/web/shared/middlewares/serve-favicon.js rename to core/server/web/site/middleware/serve-favicon.js diff --git a/test/unit/web/middleware/serve-favicon_spec.js b/test/unit/web/site/middleware/serve-favicon_spec.js similarity index 90% rename from test/unit/web/middleware/serve-favicon_spec.js rename to test/unit/web/site/middleware/serve-favicon_spec.js index 98e583a416..39762e21b3 100644 --- a/test/unit/web/middleware/serve-favicon_spec.js +++ b/test/unit/web/site/middleware/serve-favicon_spec.js @@ -1,10 +1,10 @@ var should = require('should'), sinon = require('sinon'), express = require('express'), - serveFavicon = require('../../../../core/server/web/shared/middlewares/serve-favicon'), - settingsCache = require('../../../../core/server/services/settings/cache'), - storage = require('../../../../core/server/adapters/storage'), - configUtils = require('../../../utils/configUtils'), + serveFavicon = require('../../../../../core/server/web/site/middleware/serve-favicon'), + settingsCache = require('../../../../../core/server/services/settings/cache'), + storage = require('../../../../../core/server/adapters/storage'), + configUtils = require('../../../../utils/configUtils'), path = require('path'); describe('Serve Favicon', function () { @@ -50,7 +50,7 @@ describe('Serve Favicon', function () { var middleware = serveFavicon(); req.path = '/favicon.png'; - storage.getStorage().storagePath = path.join(__dirname, '../../../../test/utils/fixtures/images/'); + storage.getStorage().storagePath = path.join(__dirname, '../../../../../test/utils/fixtures/images/'); localSettingsCache.icon = 'favicon.png'; res = { @@ -70,7 +70,7 @@ describe('Serve Favicon', function () { var middleware = serveFavicon(); req.path = '/favicon.ico'; - storage.getStorage().storagePath = path.join(__dirname, '../../../../test/utils/fixtures/images/'); + storage.getStorage().storagePath = path.join(__dirname, '../../../../../test/utils/fixtures/images/'); localSettingsCache.icon = 'favicon.ico'; res = { @@ -90,7 +90,7 @@ describe('Serve Favicon', function () { var middleware = serveFavicon(); req.path = '/favicon.ico'; - storage.getStorage().storagePath = path.join(__dirname, '../../../../test/utils/fixtures/images/'); + storage.getStorage().storagePath = path.join(__dirname, '../../../../../test/utils/fixtures/images/'); localSettingsCache.icon = 'myicon.ico'; res = { @@ -130,7 +130,7 @@ describe('Serve Favicon', function () { var middleware = serveFavicon(); req.path = '/favicon.png'; - configUtils.set('paths:contentPath', path.join(__dirname, '../../../../test/utils/fixtures/')); + configUtils.set('paths:contentPath', path.join(__dirname, '../../../../../test/utils/fixtures/')); localSettingsCache.icon = 'favicon.ico'; res = { @@ -147,7 +147,7 @@ describe('Serve Favicon', function () { var middleware = serveFavicon(); req.path = '/favicon.ico'; - configUtils.set('paths:contentPath', path.join(__dirname, '../../../../test/utils/fixtures/')); + configUtils.set('paths:contentPath', path.join(__dirname, '../../../../../test/utils/fixtures/')); localSettingsCache.icon = 'favicon.png'; res = { @@ -164,7 +164,7 @@ describe('Serve Favicon', function () { var middleware = serveFavicon(); req.path = '/favicon.png'; - configUtils.set('paths:publicFilePath', path.join(__dirname, '../../../../test/utils/fixtures/')); + configUtils.set('paths:publicFilePath', path.join(__dirname, '../../../../../test/utils/fixtures/')); localSettingsCache.icon = ''; res = {