From 4811da45f2ac9d2c29736554a6129b5d77e6e8cd Mon Sep 17 00:00:00 2001
From: Naz <nazargargol@gmail.com>
Date: Wed, 24 Nov 2021 18:03:45 +0400
Subject: [PATCH] Fixed redirects test suites

refs https://github.com/TryGhost/Toolbox/issues/138

- These tests still rely on the frontend to be present. Needs further investigation to remove "frontend: true" flag - it slows down test runs!
---
 .../api/canary/admin/redirects.test.js         | 12 ++++++++++--
 test/regression/api/v2/admin/redirects.test.js |  6 +++++-
 test/regression/api/v3/admin/redirects.test.js | 18 +++++++++++++++---
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/test/regression/api/canary/admin/redirects.test.js b/test/regression/api/canary/admin/redirects.test.js
index cd6513e83d..cfecd38f73 100644
--- a/test/regression/api/canary/admin/redirects.test.js
+++ b/test/regression/api/canary/admin/redirects.test.js
@@ -31,6 +31,7 @@ describe('Redirects API', function () {
                 fs.writeFileSync(path.join(contentFolder, 'data', 'redirects.json'), JSON.stringify([]));
 
                 return startGhost({
+                    frontend: true,
                     redirectsFile: false,
                     contentFolder: contentFolder,
                     forceStart: true
@@ -71,7 +72,10 @@ describe('Redirects API', function () {
             });
 
             it('override', function () {
-                return startGhost({forceStart: true})
+                return startGhost({
+                    frontend: true,
+                    forceStart: true
+                })
                     .then(() => {
                         return request
                             .get('/my-old-blog-post/')
@@ -149,7 +153,11 @@ describe('Redirects API', function () {
             it('override', function () {
                 // We want to test if we can override old redirects.json with new redirects.yaml
                 // That's why we start with .json.
-                return startGhost({forceStart: true, redirectsFileExt: '.json'})
+                return startGhost({
+                    frontend: true,
+                    forceStart: true,
+                    redirectsFileExt: '.json'
+                })
                     .then(() => {
                         return request
                             .get('/my-old-blog-post/')
diff --git a/test/regression/api/v2/admin/redirects.test.js b/test/regression/api/v2/admin/redirects.test.js
index 567417e694..d8ea134ee5 100644
--- a/test/regression/api/v2/admin/redirects.test.js
+++ b/test/regression/api/v2/admin/redirects.test.js
@@ -31,6 +31,7 @@ describe('Redirects API', function () {
                 fs.writeFileSync(path.join(contentFolder, 'data', 'redirects.json'), JSON.stringify([]));
 
                 return startGhost({
+                    frontend: true,
                     redirectsFile: false,
                     contentFolder: contentFolder,
                     forceStart: true
@@ -71,7 +72,10 @@ describe('Redirects API', function () {
             });
 
             it('override', function () {
-                return startGhost({forceStart: true})
+                return startGhost({
+                    frontend: true,
+                    forceStart: true
+                })
                     .then(() => {
                         return request
                             .get('/my-old-blog-post/')
diff --git a/test/regression/api/v3/admin/redirects.test.js b/test/regression/api/v3/admin/redirects.test.js
index 0352484d25..472c4c1b71 100644
--- a/test/regression/api/v3/admin/redirects.test.js
+++ b/test/regression/api/v3/admin/redirects.test.js
@@ -31,6 +31,7 @@ describe('Redirects API', function () {
                 fs.writeFileSync(path.join(contentFolder, 'data', 'redirects.json'), JSON.stringify([]));
 
                 return startGhost({
+                    frontend: true,
                     redirectsFile: false,
                     contentFolder: contentFolder,
                     forceStart: true
@@ -71,7 +72,10 @@ describe('Redirects API', function () {
             });
 
             it('override', function () {
-                return startGhost({forceStart: true})
+                return startGhost({
+                    frontend: true,
+                    forceStart: true
+                })
                     .then(() => {
                         return request
                             .get('/my-old-blog-post/')
@@ -147,7 +151,11 @@ describe('Redirects API', function () {
     describe('Upload yaml', function () {
         describe('Ensure re-registering redirects works', function () {
             it('no redirects file exists', function () {
-                return startGhost({redirectsFile: false, forceStart: true})
+                return startGhost({
+                    frontend: true,
+                    redirectsFile: false,
+                    forceStart: true
+                })
                     .then(() => {
                         return request
                             .get('/my-old-blog-post/')
@@ -183,7 +191,11 @@ describe('Redirects API', function () {
             it('override', function () {
                 // We want to test if we can override old redirects.json with new redirects.yaml
                 // That's why we start with .json.
-                return startGhost({forceStart: true, redirectsFileExt: '.json'})
+                return startGhost({
+                    frontend: true,
+                    forceStart: true,
+                    redirectsFileExt: '.json'
+                })
                     .then(() => {
                         return request
                             .get('/my-old-blog-post/')