diff --git a/test/e2e-api/admin/actions.test.js b/test/e2e-api/admin/actions.test.js index e247e19398..2252afb437 100644 --- a/test/e2e-api/admin/actions.test.js +++ b/test/e2e-api/admin/actions.test.js @@ -9,7 +9,7 @@ describe('Actions API', function () { let request; before(async function () { - await testUtils.startGhost(); + await localUtils.startGhost(); request = supertest.agent(config.get('url')); await localUtils.doAuth(request, 'integrations', 'api_keys'); }); diff --git a/test/e2e-api/admin/config.test.js b/test/e2e-api/admin/config.test.js index 5468786791..33bce240f7 100644 --- a/test/e2e-api/admin/config.test.js +++ b/test/e2e-api/admin/config.test.js @@ -9,7 +9,7 @@ describe('Config API', function () { let request; before(async function () { - await testUtils.startGhost(); + await localUtils.startGhost(); request = supertest.agent(config.get('url')); await localUtils.doAuth(request); }); diff --git a/test/e2e-api/admin/custom_theme_settings.test.js b/test/e2e-api/admin/custom_theme_settings.test.js index f55e0cf794..644e0bd3cd 100644 --- a/test/e2e-api/admin/custom_theme_settings.test.js +++ b/test/e2e-api/admin/custom_theme_settings.test.js @@ -10,7 +10,7 @@ describe('Custom Theme Settings API', function () { before(async function () { // NOTE: needs force start to be able to reinitialize Ghost process with frontend services - custom-theme-settings, to be specific - await testUtils.startGhost({ + await localUtils.startGhost({ forceStart: true, withFrontend: true }); diff --git a/test/e2e-api/admin/db.test.js b/test/e2e-api/admin/db.test.js index bfb86b673c..4bc5c270ab 100644 --- a/test/e2e-api/admin/db.test.js +++ b/test/e2e-api/admin/db.test.js @@ -13,7 +13,7 @@ describe('DB API', function () { let eventsTriggered; before(async function () { - await testUtils.startGhost(); + await localUtils.startGhost(); request = supertest.agent(config.get('url')); await localUtils.doAuth(request); }); diff --git a/test/e2e-api/admin/email_preview.test.js b/test/e2e-api/admin/email_preview.test.js index 890c189721..3256758b42 100644 --- a/test/e2e-api/admin/email_preview.test.js +++ b/test/e2e-api/admin/email_preview.test.js @@ -10,7 +10,7 @@ describe('Email Preview API', function () { let request; before(async function () { - await testUtils.startGhost(); + await localUtils.startGhost(); request = supertest.agent(config.get('url')); await localUtils.doAuth(request, 'users:extra', 'posts'); }); diff --git a/test/e2e-api/admin/emails.test.js b/test/e2e-api/admin/emails.test.js index 43a8f71c9d..ce411f2da3 100644 --- a/test/e2e-api/admin/emails.test.js +++ b/test/e2e-api/admin/emails.test.js @@ -8,7 +8,7 @@ describe('Email API', function () { let request; before(async function () { - await testUtils.startGhost(); + await localUtils.startGhost(); request = supertest.agent(config.get('url')); await localUtils.doAuth(request, 'posts', 'emails'); }); diff --git a/test/e2e-api/admin/files.test.js b/test/e2e-api/admin/files.test.js index 4c7f283daf..f2a9da844a 100644 --- a/test/e2e-api/admin/files.test.js +++ b/test/e2e-api/admin/files.test.js @@ -11,7 +11,7 @@ describe('Files API', function () { let request; before(async function () { - await testUtils.startGhost(); + await localUtils.startGhost(); request = supertest.agent(config.get('url')); await localUtils.doAuth(request); }); diff --git a/test/e2e-api/admin/images.test.js b/test/e2e-api/admin/images.test.js index b1cf5365ae..426682fe1d 100644 --- a/test/e2e-api/admin/images.test.js +++ b/test/e2e-api/admin/images.test.js @@ -11,7 +11,7 @@ describe('Images API', function () { let request; before(async function () { - await testUtils.startGhost(); + await localUtils.startGhost(); request = supertest.agent(config.get('url')); await localUtils.doAuth(request); }); diff --git a/test/e2e-api/admin/integrations.test.js b/test/e2e-api/admin/integrations.test.js index 161c0078b4..6a4c8903af 100644 --- a/test/e2e-api/admin/integrations.test.js +++ b/test/e2e-api/admin/integrations.test.js @@ -9,7 +9,7 @@ describe('Integrations API', function () { let request; before(async function () { - await testUtils.startGhost(); + await localUtils.startGhost(); request = supertest.agent(config.get('url')); await localUtils.doAuth(request, 'integrations'); }); diff --git a/test/e2e-api/admin/invites.test.js b/test/e2e-api/admin/invites.test.js index 47233f5b09..a294ca7765 100644 --- a/test/e2e-api/admin/invites.test.js +++ b/test/e2e-api/admin/invites.test.js @@ -10,7 +10,7 @@ describe('Invites API', function () { let request; before(async function () { - await testUtils.startGhost(); + await localUtils.startGhost(); request = supertest.agent(config.get('url')); await localUtils.doAuth(request, 'invites'); }); diff --git a/test/e2e-api/admin/key_authentication.test.js b/test/e2e-api/admin/key_authentication.test.js index 73ec05623b..69b0770951 100644 --- a/test/e2e-api/admin/key_authentication.test.js +++ b/test/e2e-api/admin/key_authentication.test.js @@ -9,7 +9,7 @@ describe('Admin API key authentication', function () { let request; before(async function () { - await testUtils.startGhost(); + await localUtils.startGhost(); request = supertest.agent(config.get('url')); await testUtils.initFixtures('api_keys'); }); @@ -84,7 +84,7 @@ describe('Admin API key authentication', function () { }); // NOTE: need to do a full reboot to reinitialize hostSettings - await testUtils.startGhost(); + await localUtils.startGhost(); await testUtils.initFixtures('api_keys'); const response = await request.get(localUtils.API.getApiQuery('posts/')) diff --git a/test/e2e-api/admin/labels.test.js b/test/e2e-api/admin/labels.test.js index c378991e43..a2c0b2c3b5 100644 --- a/test/e2e-api/admin/labels.test.js +++ b/test/e2e-api/admin/labels.test.js @@ -3,7 +3,7 @@ const should = require('should'); const supertest = require('supertest'); const sinon = require('sinon'); const testUtils = require('../../utils'); -const localUtils = require('../../regression/api/canary/admin/utils'); +const localUtils = require('./utils'); const config = require('../../../core/shared/config'); describe('Labels API', function () { @@ -14,7 +14,7 @@ describe('Labels API', function () { }); before(async function () { - await testUtils.startGhost(); + await localUtils.startGhost(); request = supertest.agent(config.get('url')); await localUtils.doAuth(request); }); diff --git a/test/e2e-api/admin/mail.test.js b/test/e2e-api/admin/mail.test.js index 4a53f48759..47d8082094 100644 --- a/test/e2e-api/admin/mail.test.js +++ b/test/e2e-api/admin/mail.test.js @@ -10,7 +10,7 @@ describe('Mail API', function () { let request; before(async function () { - await testUtils.startGhost(); + await localUtils.startGhost(); request = supertest.agent(config.get('url')); await localUtils.doAuth(request, 'invites'); }); diff --git a/test/e2e-api/admin/media.test.js b/test/e2e-api/admin/media.test.js index 0c639ae8ee..b6d10eb0cb 100644 --- a/test/e2e-api/admin/media.test.js +++ b/test/e2e-api/admin/media.test.js @@ -12,7 +12,7 @@ describe('Media API', function () { let request; before(async function () { - await testUtils.startGhost(); + await localUtils.startGhost(); request = supertest.agent(config.get('url')); await localUtils.doAuth(request); }); diff --git a/test/e2e-api/admin/members.test.js b/test/e2e-api/admin/members.test.js index c19dd56c7c..e2169a082b 100644 --- a/test/e2e-api/admin/members.test.js +++ b/test/e2e-api/admin/members.test.js @@ -16,7 +16,7 @@ describe('Members API', function () { }); before(async function () { - await testUtils.startGhost(); + await localUtils.startGhost(); request = supertest.agent(config.get('url')); await localUtils.doAuth(request, 'members', 'members:emails'); sinon.stub(labs, 'isSet').withArgs('members').returns(true); diff --git a/test/e2e-api/admin/notifications.test.js b/test/e2e-api/admin/notifications.test.js index 1e2b4ae928..000aa132ce 100644 --- a/test/e2e-api/admin/notifications.test.js +++ b/test/e2e-api/admin/notifications.test.js @@ -8,7 +8,7 @@ describe('Notifications API', function () { let request; before(async function () { - await testUtils.startGhost(); + await localUtils.startGhost(); request = supertest.agent(config.get('url')); await localUtils.doAuth(request); }); diff --git a/test/e2e-api/admin/oembed.test.js b/test/e2e-api/admin/oembed.test.js index fc672d00d0..998e4bc704 100644 --- a/test/e2e-api/admin/oembed.test.js +++ b/test/e2e-api/admin/oembed.test.js @@ -13,7 +13,7 @@ describe('Oembed API', function () { let request; before(async function () { - await testUtils.startGhost(); + await localUtils.startGhost(); request = supertest.agent(config.get('url')); await localUtils.doAuth(request); }); diff --git a/test/e2e-api/admin/pages.test.js b/test/e2e-api/admin/pages.test.js index aefdb83706..1c75fe1594 100644 --- a/test/e2e-api/admin/pages.test.js +++ b/test/e2e-api/admin/pages.test.js @@ -10,7 +10,7 @@ describe('Pages API', function () { let request; before(async function () { - await testUtils.startGhost(); + await localUtils.startGhost(); request = supertest.agent(config.get('url')); await localUtils.doAuth(request, 'users:extra', 'posts'); }); diff --git a/test/e2e-api/admin/posts.test.js b/test/e2e-api/admin/posts.test.js index 6052f76507..4ed36b8933 100644 --- a/test/e2e-api/admin/posts.test.js +++ b/test/e2e-api/admin/posts.test.js @@ -15,7 +15,7 @@ describe('Posts API', function () { let request; before(async function () { - await testUtils.startGhost(); + await localUtils.startGhost(); request = supertest.agent(config.get('url')); await localUtils.doAuth(request, 'users:extra', 'posts', 'emails'); }); @@ -387,7 +387,7 @@ describe('Posts API', function () { }); // NOTE: need to do a full reboot to reinitialize hostSettings - await testUtils.startGhost(); + await localUtils.startGhost(); request = supertest.agent(config.get('url')); await localUtils.doAuth(request, 'users:extra', 'posts', 'emails'); diff --git a/test/e2e-api/admin/roles.test.js b/test/e2e-api/admin/roles.test.js index b2b6f763d9..374d678a93 100644 --- a/test/e2e-api/admin/roles.test.js +++ b/test/e2e-api/admin/roles.test.js @@ -8,7 +8,7 @@ describe('Roles API', function () { let request; before(async function () { - await testUtils.startGhost(); + await localUtils.startGhost(); request = supertest.agent(config.get('url')); await localUtils.doAuth(request, 'posts'); }); diff --git a/test/e2e-api/admin/settings.test.js b/test/e2e-api/admin/settings.test.js index bf04e5070f..e84549f8d8 100644 --- a/test/e2e-api/admin/settings.test.js +++ b/test/e2e-api/admin/settings.test.js @@ -13,7 +13,7 @@ describe('Settings API', function () { let ghostServer; before(async function () { - ghostServer = await testUtils.startGhost(); + ghostServer = await localUtils.startGhost(); request = supertest.agent(config.get('url')); await localUtils.doAuth(request); }); diff --git a/test/e2e-api/admin/slugs.test.js b/test/e2e-api/admin/slugs.test.js index 0a551b72ee..c939764bc8 100644 --- a/test/e2e-api/admin/slugs.test.js +++ b/test/e2e-api/admin/slugs.test.js @@ -8,7 +8,7 @@ describe('Slug API', function () { let request; before(async function () { - await testUtils.startGhost(); + await localUtils.startGhost(); request = supertest.agent(config.get('url')); await localUtils.doAuth(request); }); diff --git a/test/e2e-api/admin/snippets.test.js b/test/e2e-api/admin/snippets.test.js index 442fd93d6a..4ddf6bee64 100644 --- a/test/e2e-api/admin/snippets.test.js +++ b/test/e2e-api/admin/snippets.test.js @@ -14,7 +14,7 @@ describe('Snippets API', function () { }); before(async function () { - await testUtils.startGhost(); + await localUtils.startGhost(); request = supertest.agent(config.get('url')); await localUtils.doAuth(request, 'snippets'); }); diff --git a/test/e2e-api/admin/tags.test.js b/test/e2e-api/admin/tags.test.js index 49e74985c8..d0fee5a3a8 100644 --- a/test/e2e-api/admin/tags.test.js +++ b/test/e2e-api/admin/tags.test.js @@ -8,7 +8,7 @@ describe('Tag API', function () { let request; before(async function () { - await testUtils.startGhost(); + await localUtils.startGhost(); request = supertest.agent(config.get('url')); await localUtils.doAuth(request, 'posts'); }); diff --git a/test/e2e-api/admin/themes.test.js b/test/e2e-api/admin/themes.test.js index 618d47832b..6c3092aa1c 100644 --- a/test/e2e-api/admin/themes.test.js +++ b/test/e2e-api/admin/themes.test.js @@ -26,7 +26,7 @@ describe('Themes API', function () { }; before(async function () { - await testUtils.startGhost({ + await localUtils.startGhost({ forceStart: true, // NOTE: this flag should not be here! the URL service re-initialization should be fixe instead withFrontend: true }); diff --git a/test/e2e-api/admin/users.test.js b/test/e2e-api/admin/users.test.js index 42a27c224c..d6332647d9 100644 --- a/test/e2e-api/admin/users.test.js +++ b/test/e2e-api/admin/users.test.js @@ -13,7 +13,7 @@ describe('User API', function () { let admin; before(async function () { - await testUtils.startGhost(); + await localUtils.startGhost(); request = supertest.agent(config.get('url')); // create inactive user diff --git a/test/e2e-api/admin/webhooks.test.js b/test/e2e-api/admin/webhooks.test.js index 54824e06ae..42ab701b6e 100644 --- a/test/e2e-api/admin/webhooks.test.js +++ b/test/e2e-api/admin/webhooks.test.js @@ -9,7 +9,7 @@ describe('Webhooks API', function () { const API_VERSION = 'canary'; before(async function () { - await testUtils.startGhost(); + await localUtils.startGhost(); request = supertest.agent(config.get('url')); await localUtils.doAuth(request, 'integrations'); }); diff --git a/test/e2e-api/content/authors.test.js b/test/e2e-api/content/authors.test.js index 475a638c8d..306697704e 100644 --- a/test/e2e-api/content/authors.test.js +++ b/test/e2e-api/content/authors.test.js @@ -12,7 +12,7 @@ describe('Authors Content API', function () { let request; before(async function () { - await testUtils.startGhost(); + await localUtils.startGhost(); request = supertest.agent(config.get('url')); await testUtils.initFixtures('owner:post', 'users:no-owner', 'user:inactive', 'posts', 'api_keys'); }); diff --git a/test/e2e-api/content/key_authentication.test.js b/test/e2e-api/content/key_authentication.test.js index 67f99f2a57..252adac4da 100644 --- a/test/e2e-api/content/key_authentication.test.js +++ b/test/e2e-api/content/key_authentication.test.js @@ -9,7 +9,7 @@ describe('Content API key authentication', function () { let request; before(async function () { - await testUtils.startGhost(); + await localUtils.startGhost(); request = supertest.agent(config.get('url')); await testUtils.initFixtures('api_keys'); }); @@ -44,7 +44,7 @@ describe('Content API key authentication', function () { }); // NOTE: need to do a full reboot to reinitialize hostSettings - await testUtils.startGhost(); + await localUtils.startGhost(); await testUtils.initFixtures('api_keys'); const key = localUtils.getValidKey(); diff --git a/test/e2e-api/content/pages.test.js b/test/e2e-api/content/pages.test.js index 14b1467541..c1f19f33a1 100644 --- a/test/e2e-api/content/pages.test.js +++ b/test/e2e-api/content/pages.test.js @@ -10,7 +10,7 @@ describe('Pages Content API', function () { let request; before(async function () { - await testUtils.startGhost(); + await localUtils.startGhost(); request = supertest.agent(config.get('url')); await testUtils.initFixtures('users:no-owner', 'user:inactive', 'posts', 'tags:extra', 'api_keys'); }); diff --git a/test/e2e-api/content/posts.test.js b/test/e2e-api/content/posts.test.js index cacb14e240..e66aa3a28f 100644 --- a/test/e2e-api/content/posts.test.js +++ b/test/e2e-api/content/posts.test.js @@ -13,7 +13,7 @@ describe('Posts Content API', function () { let request; before(async function () { - await testUtils.startGhost(); + await localUtils.startGhost(); request = supertest.agent(config.get('url')); await testUtils.initFixtures('owner:post', 'users:no-owner', 'user:inactive', 'posts', 'tags:extra', 'api_keys'); }); diff --git a/test/e2e-api/content/settings.test.js b/test/e2e-api/content/settings.test.js index c3fff26f3d..c798f8ab14 100644 --- a/test/e2e-api/content/settings.test.js +++ b/test/e2e-api/content/settings.test.js @@ -41,7 +41,7 @@ describe('Settings Content API', function () { let request; before(async function () { - await testUtils.startGhost(); + await localUtils.startGhost(); request = supertest.agent(config.get('url')); await testUtils.initFixtures('api_keys'); }); diff --git a/test/e2e-api/content/tags.test.js b/test/e2e-api/content/tags.test.js index cf118ce4e8..650cc63e22 100644 --- a/test/e2e-api/content/tags.test.js +++ b/test/e2e-api/content/tags.test.js @@ -11,7 +11,7 @@ describe('Tags Content API', function () { let request; before(async function () { - await testUtils.startGhost(); + await localUtils.startGhost(); request = supertest.agent(config.get('url')); await testUtils.initFixtures('users:no-owner', 'user:inactive', 'posts', 'tags:extra', 'api_keys'); });