diff --git a/test/regression/site/frontend_spec.js b/test/regression/site/frontend_spec.js index 427f7a8805..279525813e 100644 --- a/test/regression/site/frontend_spec.js +++ b/test/regression/site/frontend_spec.js @@ -293,7 +293,7 @@ describe('Frontend Routing', function () { }); // @TODO: unskip this, need to fix rebooting ghost with a subdirectory - describe.skip('Subdirectory (no slash)', function () { + describe('Subdirectory (no slash)', function () { let ghostServer; before(function () { @@ -374,7 +374,7 @@ describe('Frontend Routing', function () { }); // @TODO: unskip this, need to fix rebooting ghost with a subdirectory - describe.skip('Subdirectory (with slash)', function () { + describe('Subdirectory (with slash)', function () { let ghostServer; before(function () { @@ -790,7 +790,7 @@ describe('Frontend Routing', function () { }); // @TODO: unskip this, need to fix rebooting ghost with a subdirectory - describe.skip(`Subdirectory redirects (use redirects${ext} from test/utils/fixtures/data)`, function () { + describe(`Subdirectory redirects (use redirects${ext} from test/utils/fixtures/data)`, function () { var ghostServer; before(function () { diff --git a/test/utils/index.js b/test/utils/index.js index 53b8e81235..9db8a0bb91 100644 --- a/test/utils/index.js +++ b/test/utils/index.js @@ -231,9 +231,7 @@ const freshModeGhostStart = async (options) => { await knexMigrator.reset({force: true}); // Stop the serve (forceStart Mode) - if (ghostServer && ghostServer.httpServer) { - await ghostServer.stop(); - } + await stopGhost(); // Reset the settings cache // @TODO: Prob A: why/how is this different to using settingsService.init() and why to do we need this? @@ -290,6 +288,7 @@ const startGhost = async (options) => { const stopGhost = async () => { if (ghostServer && ghostServer.httpServer) { await ghostServer.stop(); + delete require.cache[require.resolve('../../core/app')]; urlService.resetGenerators(); } };