From 499f2e852e9ea4b7448aef7f32db8a650692363d Mon Sep 17 00:00:00 2001 From: Hannah Wolfe Date: Sun, 6 Feb 2022 16:18:41 +0000 Subject: [PATCH] Removed canary folder from regression tests - we no longer have any concept of testing other versions than canary, therefore this folder doesn't mean anything --- .../{canary => }/admin/authentication.test.js | 8 ++++---- .../admin/authentication.test.js.snap | 0 .../api/{canary => }/admin/db.test.js | 14 +++++++------- .../api/{canary => }/admin/identities.test.js | 4 ++-- .../api/{canary => }/admin/images.test.js | 10 +++++----- .../api/{canary => }/admin/labels.test.js | 4 ++-- .../api/{canary => }/admin/members.test.js | 18 +++++++++--------- .../admin/members_signin_url.test.js | 6 +++--- .../{canary => }/admin/notifications.test.js | 4 ++-- .../api/{canary => }/admin/pages.test.js | 4 ++-- .../api/{canary => }/admin/posts.test.js | 6 +++--- .../api/{canary => }/admin/redirects.test.js | 4 ++-- .../api/{canary => }/admin/schedules.test.js | 8 ++++---- .../api/{canary => }/admin/settings.test.js | 6 +++--- .../api/{canary => }/admin/site.test.js | 2 +- .../api/{canary => }/admin/site.test.js.snap | 0 .../api/{canary => }/admin/slack.test.js | 6 +++--- .../api/{canary => }/admin/users.test.js | 4 ++-- .../regression/api/{canary => }/admin/utils.js | 2 +- .../api/{canary => }/admin/webhooks.test.js | 4 ++-- .../api/{canary => }/content/authors.test.js | 6 +++--- .../api/{canary => }/content/pages.test.js | 6 +++--- .../api/{canary => }/content/posts.test.js | 10 +++++----- .../api/{canary => }/content/tags.test.js | 6 +++--- .../api/{canary => }/content/utils.js | 4 ++-- 25 files changed, 73 insertions(+), 73 deletions(-) rename test/regression/api/{canary => }/admin/authentication.test.js (98%) rename test/regression/api/{canary => }/admin/authentication.test.js.snap (100%) rename test/regression/api/{canary => }/admin/db.test.js (96%) rename test/regression/api/{canary => }/admin/identities.test.js (96%) rename test/regression/api/{canary => }/admin/images.test.js (83%) rename test/regression/api/{canary => }/admin/labels.test.js (95%) rename test/regression/api/{canary => }/admin/members.test.js (97%) rename test/regression/api/{canary => }/admin/members_signin_url.test.js (96%) rename test/regression/api/{canary => }/admin/notifications.test.js (98%) rename test/regression/api/{canary => }/admin/pages.test.js (93%) rename test/regression/api/{canary => }/admin/posts.test.js (99%) rename test/regression/api/{canary => }/admin/redirects.test.js (97%) rename test/regression/api/{canary => }/admin/schedules.test.js (95%) rename test/regression/api/{canary => }/admin/settings.test.js (99%) rename test/regression/api/{canary => }/admin/site.test.js (91%) rename test/regression/api/{canary => }/admin/site.test.js.snap (100%) rename test/regression/api/{canary => }/admin/slack.test.js (86%) rename test/regression/api/{canary => }/admin/users.test.js (98%) rename test/regression/api/{canary => }/admin/utils.js (99%) rename test/regression/api/{canary => }/admin/webhooks.test.js (98%) rename test/regression/api/{canary => }/content/authors.test.js (91%) rename test/regression/api/{canary => }/content/pages.test.js (93%) rename test/regression/api/{canary => }/content/posts.test.js (98%) rename test/regression/api/{canary => }/content/tags.test.js (95%) rename test/regression/api/{canary => }/content/utils.js (95%) diff --git a/test/regression/api/canary/admin/authentication.test.js b/test/regression/api/admin/authentication.test.js similarity index 98% rename from test/regression/api/canary/admin/authentication.test.js rename to test/regression/api/admin/authentication.test.js index bf10294107..6fa1a0e07e 100644 --- a/test/regression/api/canary/admin/authentication.test.js +++ b/test/regression/api/admin/authentication.test.js @@ -2,10 +2,10 @@ const {expect} = require('chai'); const {any} = require('expect'); const security = require('@tryghost/security'); -const testUtils = require('../../../../utils/index'); -const framework = require('../../../../utils/e2e-framework'); -const models = require('../../../../../core/server/models/index'); -const settingsCache = require('../../../../../core/shared/settings-cache'); +const testUtils = require('../../../utils'); +const framework = require('../../../utils/e2e-framework'); +const models = require('../../../../core/server/models'); +const settingsCache = require('../../../../core/shared/settings-cache'); describe('Authentication API canary', function () { let agent; diff --git a/test/regression/api/canary/admin/authentication.test.js.snap b/test/regression/api/admin/authentication.test.js.snap similarity index 100% rename from test/regression/api/canary/admin/authentication.test.js.snap rename to test/regression/api/admin/authentication.test.js.snap diff --git a/test/regression/api/canary/admin/db.test.js b/test/regression/api/admin/db.test.js similarity index 96% rename from test/regression/api/canary/admin/db.test.js rename to test/regression/api/admin/db.test.js index a193369d0c..af9067f378 100644 --- a/test/regression/api/canary/admin/db.test.js +++ b/test/regression/api/admin/db.test.js @@ -6,9 +6,9 @@ const uuid = require('uuid'); const should = require('should'); const supertest = require('supertest'); const sinon = require('sinon'); -const config = require('../../../../../core/shared/config'); -const events = require('../../../../../core/server/lib/common/events'); -const testUtils = require('../../../../utils'); +const config = require('../../../../core/shared/config'); +const events = require('../../../../core/server/lib/common/events'); +const testUtils = require('../../../utils'); const localUtils = require('./utils'); let request; @@ -120,7 +120,7 @@ describe('DB API (canary)', function () { return request.post(localUtils.API.getApiQuery('db/')) .set('Origin', config.get('url')) .expect('Content-Type', /json/) - .attach('importfile', path.join(__dirname, '/../../../../utils/fixtures/csv/single-column-with-header.csv')) + .attach('importfile', path.join(__dirname, '/../../../utils/fixtures/csv/single-column-with-header.csv')) .expect(415); }); @@ -186,7 +186,7 @@ describe('DB API (canary)', function () { .set('Origin', config.get('url')) .set('Accept', 'application/json') .expect('Content-Type', /json/) - .attach('importfile', path.join(__dirname, '/../../../../utils/fixtures/export/v2_export.json')) + .attach('importfile', path.join(__dirname, '/../../../utils/fixtures/export/v2_export.json')) .expect(200); const jsonResponse = res.body; @@ -233,7 +233,7 @@ describe('DB API (canary)', function () { .set('Origin', config.get('url')) .set('Accept', 'application/json') .expect('Content-Type', /json/) - .attach('importfile', path.join(__dirname, '/../../../../utils/fixtures/export/v3_export.json')) + .attach('importfile', path.join(__dirname, '/../../../utils/fixtures/export/v3_export.json')) .expect(200); const jsonResponse = res.body; @@ -280,7 +280,7 @@ describe('DB API (canary)', function () { .set('Origin', config.get('url')) .set('Accept', 'application/json') .expect('Content-Type', /json/) - .attach('importfile', path.join(__dirname, '/../../../../utils/fixtures/export/v4_export.json')) + .attach('importfile', path.join(__dirname, '/../../../utils/fixtures/export/v4_export.json')) .expect(200); const jsonResponse = res.body; diff --git a/test/regression/api/canary/admin/identities.test.js b/test/regression/api/admin/identities.test.js similarity index 96% rename from test/regression/api/canary/admin/identities.test.js rename to test/regression/api/admin/identities.test.js index f8c220c60d..c338fb1ea6 100644 --- a/test/regression/api/canary/admin/identities.test.js +++ b/test/regression/api/admin/identities.test.js @@ -2,9 +2,9 @@ const should = require('should'); const supertest = require('supertest'); const jwt = require('jsonwebtoken'); const jwksClient = require('jwks-rsa'); -const testUtils = require('../../../../utils'); +const testUtils = require('../../../utils'); const localUtils = require('./utils'); -const config = require('../../../../../core/shared/config'); +const config = require('../../../../core/shared/config'); let request; diff --git a/test/regression/api/canary/admin/images.test.js b/test/regression/api/admin/images.test.js similarity index 83% rename from test/regression/api/canary/admin/images.test.js rename to test/regression/api/admin/images.test.js index 4faaed8e53..a2413e058a 100644 --- a/test/regression/api/canary/admin/images.test.js +++ b/test/regression/api/admin/images.test.js @@ -3,8 +3,8 @@ const fs = require('fs-extra'); const should = require('should'); const supertest = require('supertest'); const localUtils = require('./utils'); -const testUtils = require('../../../../utils'); -const config = require('../../../../../core/shared/config'); +const testUtils = require('../../../utils'); +const config = require('../../../../core/shared/config'); describe('Images API', function () { const images = []; @@ -35,7 +35,7 @@ describe('Images API', function () { request.post(localUtils.API.getApiQuery('images/upload')) .set('Origin', config.get('url')) .expect('Content-Type', /json/) - .attach('file', path.join(__dirname, '/../../../../utils/fixtures/csv/single-column-with-header.csv')) + .attach('file', path.join(__dirname, '/../../../utils/fixtures/csv/single-column-with-header.csv')) .expect(415) .end(function (err) { if (err) { @@ -51,7 +51,7 @@ describe('Images API', function () { .set('Origin', config.get('url')) .set('content-type', 'image/png') .expect('Content-Type', /json/) - .attach('file', path.join(__dirname, '/../../../../utils/fixtures/images/ghost-logo.pngx')) + .attach('file', path.join(__dirname, '/../../../utils/fixtures/images/ghost-logo.pngx')) .expect(415) .end(function (err) { if (err) { @@ -67,7 +67,7 @@ describe('Images API', function () { .set('Origin', config.get('url')) .expect('Content-Type', /json/) .field('purpose', 'profile_image') - .attach('file', path.join(__dirname, '/../../../../utils/fixtures/images/favicon_not_square.png')) + .attach('file', path.join(__dirname, '/../../../utils/fixtures/images/favicon_not_square.png')) .expect(422) .end(function (err) { if (err) { diff --git a/test/regression/api/canary/admin/labels.test.js b/test/regression/api/admin/labels.test.js similarity index 95% rename from test/regression/api/canary/admin/labels.test.js rename to test/regression/api/admin/labels.test.js index 1e63232118..0e5f957b15 100644 --- a/test/regression/api/canary/admin/labels.test.js +++ b/test/regression/api/admin/labels.test.js @@ -2,9 +2,9 @@ const path = require('path'); const should = require('should'); const supertest = require('supertest'); const sinon = require('sinon'); -const testUtils = require('../../../../utils'); +const testUtils = require('../../../utils'); const localUtils = require('./utils'); -const config = require('../../../../../core/shared/config'); +const config = require('../../../../core/shared/config'); let request; diff --git a/test/regression/api/canary/admin/members.test.js b/test/regression/api/admin/members.test.js similarity index 97% rename from test/regression/api/canary/admin/members.test.js rename to test/regression/api/admin/members.test.js index 9f265857a7..ab6fda457c 100644 --- a/test/regression/api/canary/admin/members.test.js +++ b/test/regression/api/admin/members.test.js @@ -3,11 +3,11 @@ const querystring = require('querystring'); const should = require('should'); const supertest = require('supertest'); const sinon = require('sinon'); -const testUtils = require('../../../../utils'); +const testUtils = require('../../../utils'); const localUtils = require('./utils'); -const config = require('../../../../../core/shared/config'); -const labs = require('../../../../../core/shared/labs'); -const mailService = require('../../../../../core/server/services/mail'); +const config = require('../../../../core/shared/config'); +const labs = require('../../../../core/shared/labs'); +const mailService = require('../../../../core/server/services/mail'); let request; @@ -321,7 +321,7 @@ describe('Members API (canary)', function () { return request .post(localUtils.API.getApiQuery(`members/upload/`)) .field('labels', ['global-label-1', 'global-label-1']) - .attach('membersfile', path.join(__dirname, '/../../../../utils/fixtures/csv/valid-members-labels.csv')) + .attach('membersfile', path.join(__dirname, '/../../../utils/fixtures/csv/valid-members-labels.csv')) .set('Origin', config.get('url')) .expect('Content-Type', /json/) .expect('Cache-Control', testUtils.cacheRules.private) @@ -387,7 +387,7 @@ describe('Members API (canary)', function () { .post(localUtils.API.getApiQuery(`members/upload/`)) .field('mapping[correo_electrpnico]', 'email') .field('mapping[nombre]', 'name') - .attach('membersfile', path.join(__dirname, '/../../../../utils/fixtures/csv/members-with-mappings.csv')) + .attach('membersfile', path.join(__dirname, '/../../../utils/fixtures/csv/members-with-mappings.csv')) .set('Origin', config.get('url')) .expect('Content-Type', /json/) .expect('Cache-Control', testUtils.cacheRules.private) @@ -437,7 +437,7 @@ describe('Members API (canary)', function () { it('Can import CSV with labels and provide additional labels', function () { return request .post(localUtils.API.getApiQuery(`members/upload/`)) - .attach('membersfile', path.join(__dirname, '/../../../../utils/fixtures/csv/valid-members-defaults.csv')) + .attach('membersfile', path.join(__dirname, '/../../../utils/fixtures/csv/valid-members-defaults.csv')) .set('Origin', config.get('url')) .expect('Content-Type', /json/) .expect('Cache-Control', testUtils.cacheRules.private) @@ -485,7 +485,7 @@ describe('Members API (canary)', function () { it('Runs imports with stripe_customer_id as background job', function () { return request .post(localUtils.API.getApiQuery(`members/upload/`)) - .attach('membersfile', path.join(__dirname, '/../../../../utils/fixtures/csv/members-with-stripe-ids.csv')) + .attach('membersfile', path.join(__dirname, '/../../../utils/fixtures/csv/members-with-stripe-ids.csv')) .set('Origin', config.get('url')) .expect('Content-Type', /json/) .expect('Cache-Control', testUtils.cacheRules.private) @@ -504,7 +504,7 @@ describe('Members API (canary)', function () { return request .post(localUtils.API.getApiQuery(`members/upload/`)) .field('labels', ['new-global-label']) - .attach('membersfile', path.join(__dirname, '/../../../../utils/fixtures/csv/members-invalid-values.csv')) + .attach('membersfile', path.join(__dirname, '/../../../utils/fixtures/csv/members-invalid-values.csv')) .set('Origin', config.get('url')) .expect('Content-Type', /json/) .expect('Cache-Control', testUtils.cacheRules.private) diff --git a/test/regression/api/canary/admin/members_signin_url.test.js b/test/regression/api/admin/members_signin_url.test.js similarity index 96% rename from test/regression/api/canary/admin/members_signin_url.test.js rename to test/regression/api/admin/members_signin_url.test.js index ccaff64925..b8a1bfac3c 100644 --- a/test/regression/api/canary/admin/members_signin_url.test.js +++ b/test/regression/api/admin/members_signin_url.test.js @@ -2,10 +2,10 @@ const path = require('path'); const should = require('should'); const supertest = require('supertest'); const sinon = require('sinon'); -const testUtils = require('../../../../utils'); +const testUtils = require('../../../utils'); const localUtils = require('./utils'); -const config = require('../../../../../core/shared/config'); -const labs = require('../../../../../core/shared/labs'); +const config = require('../../../../core/shared/config'); +const labs = require('../../../../core/shared/labs'); let request; diff --git a/test/regression/api/canary/admin/notifications.test.js b/test/regression/api/admin/notifications.test.js similarity index 98% rename from test/regression/api/canary/admin/notifications.test.js rename to test/regression/api/admin/notifications.test.js index 03375492a1..84856ad016 100644 --- a/test/regression/api/canary/admin/notifications.test.js +++ b/test/regression/api/admin/notifications.test.js @@ -1,7 +1,7 @@ const should = require('should'); const supertest = require('supertest'); -const testUtils = require('../../../../utils'); -const config = require('../../../../../core/shared/config'); +const testUtils = require('../../../utils'); +const config = require('../../../../core/shared/config'); const localUtils = require('./utils'); describe('Notifications API', function () { diff --git a/test/regression/api/canary/admin/pages.test.js b/test/regression/api/admin/pages.test.js similarity index 93% rename from test/regression/api/canary/admin/pages.test.js rename to test/regression/api/admin/pages.test.js index 3bc48c023a..811ab59a02 100644 --- a/test/regression/api/canary/admin/pages.test.js +++ b/test/regression/api/admin/pages.test.js @@ -1,7 +1,7 @@ const should = require('should'); const supertest = require('supertest'); -const testUtils = require('../../../../utils'); -const config = require('../../../../../core/shared/config'); +const testUtils = require('../../../utils'); +const config = require('../../../../core/shared/config'); const localUtils = require('./utils'); let request; diff --git a/test/regression/api/canary/admin/posts.test.js b/test/regression/api/admin/posts.test.js similarity index 99% rename from test/regression/api/canary/admin/posts.test.js rename to test/regression/api/admin/posts.test.js index 7b3fc77801..b6fb9a27fa 100644 --- a/test/regression/api/canary/admin/posts.test.js +++ b/test/regression/api/admin/posts.test.js @@ -3,9 +3,9 @@ const should = require('should'); const supertest = require('supertest'); const ObjectId = require('bson-objectid'); const moment = require('moment-timezone'); -const testUtils = require('../../../../utils'); -const config = require('../../../../../core/shared/config'); -const models = require('../../../../../core/server/models'); +const testUtils = require('../../../utils'); +const config = require('../../../../core/shared/config'); +const models = require('../../../../core/server/models'); const localUtils = require('./utils'); describe('Posts API (canary)', function () { diff --git a/test/regression/api/canary/admin/redirects.test.js b/test/regression/api/admin/redirects.test.js similarity index 97% rename from test/regression/api/canary/admin/redirects.test.js rename to test/regression/api/admin/redirects.test.js index 71e324c72d..f0ea35b6c5 100644 --- a/test/regression/api/canary/admin/redirects.test.js +++ b/test/regression/api/admin/redirects.test.js @@ -4,9 +4,9 @@ const fs = require('fs-extra'); const path = require('path'); const os = require('os'); const uuid = require('uuid'); -const testUtils = require('../../../../utils'); +const testUtils = require('../../../utils'); const localUtils = require('./utils'); -const config = require('../../../../../core/shared/config'); +const config = require('../../../../core/shared/config'); let request; diff --git a/test/regression/api/canary/admin/schedules.test.js b/test/regression/api/admin/schedules.test.js similarity index 95% rename from test/regression/api/canary/admin/schedules.test.js rename to test/regression/api/admin/schedules.test.js index d59b0b0a3b..f6fabe5524 100644 --- a/test/regression/api/canary/admin/schedules.test.js +++ b/test/regression/api/admin/schedules.test.js @@ -4,10 +4,10 @@ const supertest = require('supertest'); const Promise = require('bluebird'); const sinon = require('sinon'); const moment = require('moment-timezone'); -const SchedulingDefault = require('../../../../../core/server/adapters/scheduling/SchedulingDefault'); -const models = require('../../../../../core/server/models/index'); -const config = require('../../../../../core/shared/config/index'); -const testUtils = require('../../../../utils/index'); +const SchedulingDefault = require('../../../../core/server/adapters/scheduling/SchedulingDefault'); +const models = require('../../../../core/server/models'); +const config = require('../../../../core/shared/config'); +const testUtils = require('../../../utils'); const localUtils = require('./utils'); describe('Canary Schedules API', function () { diff --git a/test/regression/api/canary/admin/settings.test.js b/test/regression/api/admin/settings.test.js similarity index 99% rename from test/regression/api/canary/admin/settings.test.js rename to test/regression/api/admin/settings.test.js index 890ec2ccf8..9fc5bc1daa 100644 --- a/test/regression/api/canary/admin/settings.test.js +++ b/test/regression/api/admin/settings.test.js @@ -1,10 +1,10 @@ const _ = require('lodash'); const should = require('should'); const supertest = require('supertest'); -const config = require('../../../../../core/shared/config'); -const testUtils = require('../../../../utils'); +const config = require('../../../../core/shared/config'); +const testUtils = require('../../../utils'); const localUtils = require('./utils'); -const db = require('../../../../../core/server/data/db'); +const db = require('../../../../core/server/data/db'); // NOTE: in future iterations these fields should be fetched from a central module. // Have put a list as is here for the lack of better place for it. diff --git a/test/regression/api/canary/admin/site.test.js b/test/regression/api/admin/site.test.js similarity index 91% rename from test/regression/api/canary/admin/site.test.js rename to test/regression/api/admin/site.test.js index d834d5d84f..45abcd9116 100644 --- a/test/regression/api/canary/admin/site.test.js +++ b/test/regression/api/admin/site.test.js @@ -1,7 +1,7 @@ const {expect} = require('chai'); const {any, stringMatching} = require('expect'); -const framework = require('../../../../utils/e2e-framework'); +const framework = require('../../../utils/e2e-framework'); describe('Config API', function () { let agent; diff --git a/test/regression/api/canary/admin/site.test.js.snap b/test/regression/api/admin/site.test.js.snap similarity index 100% rename from test/regression/api/canary/admin/site.test.js.snap rename to test/regression/api/admin/site.test.js.snap diff --git a/test/regression/api/canary/admin/slack.test.js b/test/regression/api/admin/slack.test.js similarity index 86% rename from test/regression/api/canary/admin/slack.test.js rename to test/regression/api/admin/slack.test.js index 7701891ed4..3380f953fb 100644 --- a/test/regression/api/canary/admin/slack.test.js +++ b/test/regression/api/admin/slack.test.js @@ -1,10 +1,10 @@ const should = require('should'); const supertest = require('supertest'); const sinon = require('sinon'); -const testUtils = require('../../../../utils'); +const testUtils = require('../../../utils'); const localUtils = require('./utils'); -const config = require('../../../../../core/shared/config'); -const events = require('../../../../../core/server/lib/common/events'); +const config = require('../../../../core/shared/config'); +const events = require('../../../../core/server/lib/common/events'); let request; diff --git a/test/regression/api/canary/admin/users.test.js b/test/regression/api/admin/users.test.js similarity index 98% rename from test/regression/api/canary/admin/users.test.js rename to test/regression/api/admin/users.test.js index 51519634ac..dc04724634 100644 --- a/test/regression/api/canary/admin/users.test.js +++ b/test/regression/api/admin/users.test.js @@ -1,8 +1,8 @@ const should = require('should'); const supertest = require('supertest'); const ObjectId = require('bson-objectid'); -const testUtils = require('../../../../utils'); -const config = require('../../../../../core/shared/config'); +const testUtils = require('../../../utils'); +const config = require('../../../../core/shared/config'); const localUtils = require('./utils'); let request; diff --git a/test/regression/api/canary/admin/utils.js b/test/regression/api/admin/utils.js similarity index 99% rename from test/regression/api/canary/admin/utils.js rename to test/regression/api/admin/utils.js index 0c14729104..eb74f13fae 100644 --- a/test/regression/api/canary/admin/utils.js +++ b/test/regression/api/admin/utils.js @@ -1,5 +1,5 @@ const url = require('url'); -const testUtils = require('../../../../utils'); +const testUtils = require('../../../utils'); const API_URL = '/ghost/api/canary/admin/'; diff --git a/test/regression/api/canary/admin/webhooks.test.js b/test/regression/api/admin/webhooks.test.js similarity index 98% rename from test/regression/api/canary/admin/webhooks.test.js rename to test/regression/api/admin/webhooks.test.js index 9ab3f4a489..c629662420 100644 --- a/test/regression/api/canary/admin/webhooks.test.js +++ b/test/regression/api/admin/webhooks.test.js @@ -1,7 +1,7 @@ const should = require('should'); const supertest = require('supertest'); -const testUtils = require('../../../../utils'); -const config = require('../../../../../core/shared/config'); +const testUtils = require('../../../utils'); +const config = require('../../../../core/shared/config'); const localUtils = require('./utils'); describe('Webhooks API (canary)', function () { diff --git a/test/regression/api/canary/content/authors.test.js b/test/regression/api/content/authors.test.js similarity index 91% rename from test/regression/api/canary/content/authors.test.js rename to test/regression/api/content/authors.test.js index 933a22c79a..4ff742a592 100644 --- a/test/regression/api/canary/content/authors.test.js +++ b/test/regression/api/content/authors.test.js @@ -1,9 +1,9 @@ const should = require('should'); const supertest = require('supertest'); const localUtils = require('./utils'); -const testUtils = require('../../../../utils'); -const configUtils = require('../../../../utils/configUtils'); -const config = require('../../../../../core/shared/config'); +const testUtils = require('../../../utils'); +const configUtils = require('../../../utils/configUtils'); +const config = require('../../../../core/shared/config'); describe('Authors Content API', function () { const validKey = localUtils.getValidKey(); diff --git a/test/regression/api/canary/content/pages.test.js b/test/regression/api/content/pages.test.js similarity index 93% rename from test/regression/api/canary/content/pages.test.js rename to test/regression/api/content/pages.test.js index 2b1db8d108..c1def740bd 100644 --- a/test/regression/api/canary/content/pages.test.js +++ b/test/regression/api/content/pages.test.js @@ -1,9 +1,9 @@ const should = require('should'); const supertest = require('supertest'); -const testUtils = require('../../../../utils'); +const testUtils = require('../../../utils'); const localUtils = require('./utils'); -const configUtils = require('../../../../utils/configUtils'); -const config = require('../../../../../core/shared/config'); +const configUtils = require('../../../utils/configUtils'); +const config = require('../../../../core/shared/config'); let request; diff --git a/test/regression/api/canary/content/posts.test.js b/test/regression/api/content/posts.test.js similarity index 98% rename from test/regression/api/canary/content/posts.test.js rename to test/regression/api/content/posts.test.js index b4ef0388d0..5afd6576c2 100644 --- a/test/regression/api/canary/content/posts.test.js +++ b/test/regression/api/content/posts.test.js @@ -3,12 +3,12 @@ const sinon = require('sinon'); const moment = require('moment'); const supertest = require('supertest'); const _ = require('lodash'); -const labs = require('../../../../../core/shared/labs'); -const testUtils = require('../../../../utils'); +const labs = require('../../../../core/shared/labs'); +const testUtils = require('../../../utils'); const localUtils = require('./utils'); -const configUtils = require('../../../../utils/configUtils'); -const urlUtils = require('../../../../utils/urlUtils'); -const config = require('../../../../../core/shared/config'); +const configUtils = require('../../../utils/configUtils'); +const urlUtils = require('../../../utils/urlUtils'); +const config = require('../../../../core/shared/config'); describe('api/canary/content/posts', function () { let request; diff --git a/test/regression/api/canary/content/tags.test.js b/test/regression/api/content/tags.test.js similarity index 95% rename from test/regression/api/canary/content/tags.test.js rename to test/regression/api/content/tags.test.js index 561c4faa18..d3c99652c2 100644 --- a/test/regression/api/canary/content/tags.test.js +++ b/test/regression/api/content/tags.test.js @@ -2,9 +2,9 @@ const should = require('should'); const supertest = require('supertest'); const _ = require('lodash'); const localUtils = require('./utils'); -const testUtils = require('../../../../utils'); -const configUtils = require('../../../../utils/configUtils'); -const config = require('../../../../../core/shared/config'); +const testUtils = require('../../../utils'); +const configUtils = require('../../../utils/configUtils'); +const config = require('../../../../core/shared/config'); let request; diff --git a/test/regression/api/canary/content/utils.js b/test/regression/api/content/utils.js similarity index 95% rename from test/regression/api/canary/content/utils.js rename to test/regression/api/content/utils.js index f7ca9444f5..6830928fd1 100644 --- a/test/regression/api/canary/content/utils.js +++ b/test/regression/api/content/utils.js @@ -1,7 +1,7 @@ const url = require('url'); const _ = require('lodash'); -const testUtils = require('../../../../utils'); -const schema = require('../../../../../core/server/data/schema').tables; +const testUtils = require('../../../utils'); +const schema = require('../../../../core/server/data/schema').tables; const API_URL = '/ghost/api/canary/content/'; const expectedProperties = {