Moved server e2e tests to own folder

- We have a bunch of important server-related e2e tests
- Make these clear in their own folder
- "server" is everything that isn't the api or the frontend - kind of a catch-all concept
This commit is contained in:
Hannah Wolfe 2021-10-06 12:38:40 +01:00
parent 1dec3d56b1
commit 624414e0c1
No known key found for this signature in database
GPG Key ID: 9F8C7532D0A6BA55
3 changed files with 15 additions and 15 deletions

View File

@ -30,7 +30,7 @@
"test:all": "yarn test:unit && yarn test:e2e && yarn lint",
"test:debug": "DEBUG=ghost:test* yarn test",
"test:unit": "c8 --all -n 'core/{*.js,frontend,server,shared}' --reporter text-summary mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js './test/unit' --timeout=2000",
"test:e2e": "mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js './test/e2e-api' './test/e2e-frontend' --timeout=10000",
"test:e2e": "mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js './test/e2e-api' './test/e2e-frontend' './test/e2e-server' --timeout=10000",
"test:regression": "mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js './test/regression' --timeout=60000",
"test:reg:slow": "mocha --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js './test/regression' --timeout=60000 --reporter=mocha-slow-test-reporter",
"test:slow": "yarn test:unit --reporter=mocha-slow-test-reporter && yarn test:e2e --reporter=mocha-slow-test-reporter",

View File

@ -6,13 +6,13 @@
const should = require('should');
const supertest = require('supertest');
const testUtils = require('../../utils');
const configUtils = require('../../utils/configUtils');
const urlUtils = require('../../utils/urlUtils');
const adminUtils = require('../../utils/admin-utils');
const testUtils = require('../utils');
const configUtils = require('../utils/configUtils');
const urlUtils = require('../utils/urlUtils');
const adminUtils = require('../utils/admin-utils');
const ghost = testUtils.startGhost;
const i18n = require('../../../core/shared/i18n');
const config = require('../../../core/shared/config');
const i18n = require('../../core/shared/i18n');
const config = require('../../core/shared/config');
let request;
i18n.init();

View File

@ -1,14 +1,14 @@
const should = require('should');
const sinon = require('sinon');
const _ = require('lodash');
const testUtils = require('../../utils');
const adminUtils = require('../../utils/admin-utils');
const mockUtils = require('../../utils/mocks');
const configUtils = require('../../utils/configUtils');
const urlUtils = require('../../utils/urlUtils');
const appService = require('../../../core/frontend/services/apps');
const themeEngine = require('../../../core/frontend/services/theme-engine');
const siteApp = require('../../../core/server/web/parent/app');
const testUtils = require('../utils');
const adminUtils = require('../utils/admin-utils');
const mockUtils = require('../utils/mocks');
const configUtils = require('../utils/configUtils');
const urlUtils = require('../utils/urlUtils');
const appService = require('../../core/frontend/services/apps');
const themeEngine = require('../../core/frontend/services/theme-engine');
const siteApp = require('../../core/server/web/parent/app');
describe('Integration - Web - vhosts', function () {
let app;