diff --git a/.gitignore b/.gitignore index 32fc1b012b..ed1f59e6f1 100644 --- a/.gitignore +++ b/.gitignore @@ -76,7 +76,7 @@ b-cov *.out *.gz -!core/test/utils/fixtures/**/*.csv +!test/utils/fixtures/**/*.csv results @@ -114,8 +114,8 @@ projectFilesBackup CHANGELOG.md # Test generated files -/core/test/functional/*.png -/core/test/coverage +test/functional/*.png +test/coverage # ignore all custom json files for config /config.*.json diff --git a/.npmignore b/.npmignore index 8943c84de0..8e9b5ef3f6 100644 --- a/.npmignore +++ b/.npmignore @@ -35,7 +35,7 @@ core/built/**/*.map core/built/**/test-* core/built/**/tests-* core/client/** -core/test/** +test/** CONTRIBUTING.md content/themes/casper/SECURITY.md SECURITY.md diff --git a/Gruntfile.js b/Gruntfile.js index 04acc3f21b..3cd4df62a7 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -123,20 +123,20 @@ const configureGrunt = function (grunt) { unit: { src: [ - 'core/test/unit/**/*_spec.js' + 'test/unit/**/*_spec.js' ] }, acceptance: { src: [ - 'core/test/api-acceptance/**/*_spec.js', - 'core/test/frontend-acceptance/**/*_spec.js' + 'test/api-acceptance/**/*_spec.js', + 'test/frontend-acceptance/**/*_spec.js' ] }, regression: { src: [ - 'core/test/regression/**/*_spec.js' + 'test/regression/**/*_spec.js' ] }, @@ -383,17 +383,17 @@ const configureGrunt = function (grunt) { // // `grunt test:unit/apps_spec.js` will run just the tests inside the apps_spec.js file // - // It works for any path relative to the core/test folder. It will also run all the tests in a single directory - // You can also run a test with grunt test:core/test/unit/... to get bash autocompletion + // It works for any path relative to the /test/ folder. It will also run all the tests in a single directory + // You can also run a test with grunt test:test/unit/... to get bash autocompletion // // `grunt test:regression/api` - runs the api regression tests - grunt.registerTask('test', 'Run a particular spec file from the core/test directory e.g. `grunt test:unit/apps_spec.js`', function (test) { + grunt.registerTask('test', 'Run a particular spec file from the /test/ directory e.g. `grunt test:unit/apps_spec.js`', function (test) { if (!test) { grunt.fail.fatal('No test provided. `grunt test` expects a filename. e.g.: `grunt test:unit/apps_spec.js`. Did you mean `npm test` or `grunt validate`?'); } - if (!test.match(/core\/test/) && !test.match(/core\/server/)) { - test = 'core/test/' + test; + if (!test.match(/test\//) && !test.match(/core\/server/)) { + test = 'test/' + test; } // CASE: execute folder diff --git a/core/test/.eslintignore b/core/test/.eslintignore deleted file mode 100644 index c7f13e5863..0000000000 --- a/core/test/.eslintignore +++ /dev/null @@ -1 +0,0 @@ -core/test/coverage/** diff --git a/package.json b/package.json index bdaf6709c5..4d4af77d74 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "setup": "yarn install && knex-migrator init && grunt symlink && grunt init || true", "lint:server": "eslint --ignore-path .eslintignore 'core/server/**/*.js' 'core/*.js' '*.js'", "lint:frontend": "eslint --ignore-path .eslintignore 'core/frontend/**/*.js'", - "lint:test": "eslint -c core/test/.eslintrc.json --ignore-path core/test/.eslintignore 'core/test/**/*.js'", + "lint:test": "eslint -c test/.eslintrc.json --ignore-path test/.eslintignore 'test/**/*.js'", "lint": "yarn lint:server && yarn lint:frontend && yarn lint:test", "posttest": "yarn lint", "fixmodulenotdefined": "yarn cache clean && cd core/client && rm -rf node_modules tmp dist && yarn && cd ../../" diff --git a/renovate.json b/renovate.json index 9c308ef019..0cdce5c738 100644 --- a/renovate.json +++ b/renovate.json @@ -15,7 +15,7 @@ "validator", "simple-dom" ], - "ignorePaths": ["core/test"], + "ignorePaths": ["test"], "packageRules": [ { "packagePatterns": [ "metascraper" ], diff --git a/test/.eslintignore b/test/.eslintignore new file mode 100644 index 0000000000..038fe8425e --- /dev/null +++ b/test/.eslintignore @@ -0,0 +1 @@ +test/coverage/** diff --git a/core/test/.eslintrc.json b/test/.eslintrc.json similarity index 100% rename from core/test/.eslintrc.json rename to test/.eslintrc.json diff --git a/core/test/.jshintrc b/test/.jshintrc similarity index 100% rename from core/test/.jshintrc rename to test/.jshintrc diff --git a/core/test/api-acceptance/README.md b/test/api-acceptance/README.md similarity index 100% rename from core/test/api-acceptance/README.md rename to test/api-acceptance/README.md diff --git a/core/test/api-acceptance/admin/actions_spec.js b/test/api-acceptance/admin/actions_spec.js similarity index 99% rename from core/test/api-acceptance/admin/actions_spec.js rename to test/api-acceptance/admin/actions_spec.js index 3cf3f30cef..bea4ef73db 100644 --- a/core/test/api-acceptance/admin/actions_spec.js +++ b/test/api-acceptance/admin/actions_spec.js @@ -3,7 +3,7 @@ const Promise = require('bluebird'); const supertest = require('supertest'); const testUtils = require('../../utils'); const localUtils = require('./utils'); -const config = require('../../../server/config'); +const config = require('../../../core/server/config'); const ghost = testUtils.startGhost; let request; diff --git a/core/test/api-acceptance/admin/config_spec.js b/test/api-acceptance/admin/config_spec.js similarity index 95% rename from core/test/api-acceptance/admin/config_spec.js rename to test/api-acceptance/admin/config_spec.js index d2823d2201..3972d20520 100644 --- a/core/test/api-acceptance/admin/config_spec.js +++ b/test/api-acceptance/admin/config_spec.js @@ -2,7 +2,7 @@ const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../utils'); const localUtils = require('./utils'); -const config = require('../../../server/config'); +const config = require('../../../core/server/config'); const ghost = testUtils.startGhost; let request; diff --git a/core/test/api-acceptance/admin/db_spec.js b/test/api-acceptance/admin/db_spec.js similarity index 97% rename from core/test/api-acceptance/admin/db_spec.js rename to test/api-acceptance/admin/db_spec.js index e8ce460497..58f3d51d23 100644 --- a/core/test/api-acceptance/admin/db_spec.js +++ b/test/api-acceptance/admin/db_spec.js @@ -2,8 +2,8 @@ const path = require('path'); const should = require('should'); const supertest = require('supertest'); const sinon = require('sinon'); -const config = require('../../../server/config'); -const common = require('../../../server/lib/common'); +const config = require('../../../core/server/config'); +const common = require('../../../core/server/lib/common'); const testUtils = require('../../utils'); const localUtils = require('./utils'); diff --git a/core/test/api-acceptance/admin/email_preview_spec.js b/test/api-acceptance/admin/email_preview_spec.js similarity index 98% rename from core/test/api-acceptance/admin/email_preview_spec.js rename to test/api-acceptance/admin/email_preview_spec.js index 47b6d76e9b..73888c7524 100644 --- a/core/test/api-acceptance/admin/email_preview_spec.js +++ b/test/api-acceptance/admin/email_preview_spec.js @@ -3,7 +3,7 @@ const supertest = require('supertest'); const ObjectId = require('bson-objectid'); const testUtils = require('../../utils'); const localUtils = require('./utils'); -const config = require('../../../server/config'); +const config = require('../../../core/server/config'); const ghost = testUtils.startGhost; diff --git a/core/test/api-acceptance/admin/emails_spec.js b/test/api-acceptance/admin/emails_spec.js similarity index 96% rename from core/test/api-acceptance/admin/emails_spec.js rename to test/api-acceptance/admin/emails_spec.js index 282f9c7daf..e3773dfcb0 100644 --- a/core/test/api-acceptance/admin/emails_spec.js +++ b/test/api-acceptance/admin/emails_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../utils'); -const config = require('../../../server/config'); +const config = require('../../../core/server/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/core/test/api-acceptance/admin/images_spec.js b/test/api-acceptance/admin/images_spec.js similarity index 98% rename from core/test/api-acceptance/admin/images_spec.js rename to test/api-acceptance/admin/images_spec.js index f8f2dbbca1..790b59cfe2 100644 --- a/core/test/api-acceptance/admin/images_spec.js +++ b/test/api-acceptance/admin/images_spec.js @@ -4,7 +4,7 @@ const should = require('should'); const supertest = require('supertest'); const localUtils = require('./utils'); const testUtils = require('../../utils'); -const config = require('../../../server/config'); +const config = require('../../../core/server/config'); const ghost = testUtils.startGhost; diff --git a/core/test/api-acceptance/admin/integrations_spec.js b/test/api-acceptance/admin/integrations_spec.js similarity index 99% rename from core/test/api-acceptance/admin/integrations_spec.js rename to test/api-acceptance/admin/integrations_spec.js index d8a185e310..7cdc8785de 100644 --- a/core/test/api-acceptance/admin/integrations_spec.js +++ b/test/api-acceptance/admin/integrations_spec.js @@ -1,7 +1,7 @@ const _ = require('lodash'); const should = require('should'); const supertest = require('supertest'); -const config = require('../../../server/config'); +const config = require('../../../core/server/config'); const testUtils = require('../../utils'); const localUtils = require('./utils'); diff --git a/core/test/api-acceptance/admin/invites_spec.js b/test/api-acceptance/admin/invites_spec.js similarity index 97% rename from core/test/api-acceptance/admin/invites_spec.js rename to test/api-acceptance/admin/invites_spec.js index a44a81309b..571eb531bb 100644 --- a/core/test/api-acceptance/admin/invites_spec.js +++ b/test/api-acceptance/admin/invites_spec.js @@ -2,8 +2,8 @@ const should = require('should'); const supertest = require('supertest'); const sinon = require('sinon'); const testUtils = require('../../utils'); -const config = require('../../../server/config'); -const mailService = require('../../../server/services/mail'); +const config = require('../../../core/server/config'); +const mailService = require('../../../core/server/services/mail'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/core/test/api-acceptance/admin/key_authentication_spec.js b/test/api-acceptance/admin/key_authentication_spec.js similarity index 98% rename from core/test/api-acceptance/admin/key_authentication_spec.js rename to test/api-acceptance/admin/key_authentication_spec.js index 92750d1f6b..7f48ce7b7b 100644 --- a/core/test/api-acceptance/admin/key_authentication_spec.js +++ b/test/api-acceptance/admin/key_authentication_spec.js @@ -2,7 +2,7 @@ const should = require('should'); const supertest = require('supertest'); const _ = require('lodash'); const testUtils = require('../../utils'); -const config = require('../../../server/config'); +const config = require('../../../core/server/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/core/test/api-acceptance/admin/mail_spec.js b/test/api-acceptance/admin/mail_spec.js similarity index 94% rename from core/test/api-acceptance/admin/mail_spec.js rename to test/api-acceptance/admin/mail_spec.js index 7c379c0024..f6ae982361 100644 --- a/core/test/api-acceptance/admin/mail_spec.js +++ b/test/api-acceptance/admin/mail_spec.js @@ -2,8 +2,8 @@ const should = require('should'); const supertest = require('supertest'); const sinon = require('sinon'); const testUtils = require('../../utils'); -const config = require('../../../server/config'); -const mailService = require('../../../server/services/mail'); +const config = require('../../../core/server/config'); +const mailService = require('../../../core/server/services/mail'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/core/test/api-acceptance/admin/notifications_spec.js b/test/api-acceptance/admin/notifications_spec.js similarity index 98% rename from core/test/api-acceptance/admin/notifications_spec.js rename to test/api-acceptance/admin/notifications_spec.js index ec67d9e45b..1b9cecff36 100644 --- a/core/test/api-acceptance/admin/notifications_spec.js +++ b/test/api-acceptance/admin/notifications_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../utils'); -const config = require('../../../server/config'); +const config = require('../../../core/server/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/core/test/api-acceptance/admin/oembed_spec.js b/test/api-acceptance/admin/oembed_spec.js similarity index 99% rename from core/test/api-acceptance/admin/oembed_spec.js rename to test/api-acceptance/admin/oembed_spec.js index 455002abd3..d4e70b93d7 100644 --- a/core/test/api-acceptance/admin/oembed_spec.js +++ b/test/api-acceptance/admin/oembed_spec.js @@ -2,7 +2,7 @@ const nock = require('nock'); const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../utils/index'); -const config = require('../../../server/config/index'); +const config = require('../../../core/server/config/index'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/core/test/api-acceptance/admin/pages_spec.js b/test/api-acceptance/admin/pages_spec.js similarity index 98% rename from core/test/api-acceptance/admin/pages_spec.js rename to test/api-acceptance/admin/pages_spec.js index 707bcaab52..87906c639c 100644 --- a/core/test/api-acceptance/admin/pages_spec.js +++ b/test/api-acceptance/admin/pages_spec.js @@ -2,8 +2,8 @@ const should = require('should'); const supertest = require('supertest'); const _ = require('lodash'); const testUtils = require('../../utils'); -const config = require('../../../server/config'); -const models = require('../../../server/models'); +const config = require('../../../core/server/config'); +const models = require('../../../core/server/models'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/core/test/api-acceptance/admin/posts_spec.js b/test/api-acceptance/admin/posts_spec.js similarity index 99% rename from core/test/api-acceptance/admin/posts_spec.js rename to test/api-acceptance/admin/posts_spec.js index 8d88b6b104..d6fe4cba3c 100644 --- a/core/test/api-acceptance/admin/posts_spec.js +++ b/test/api-acceptance/admin/posts_spec.js @@ -4,8 +4,8 @@ const _ = require('lodash'); const ObjectId = require('bson-objectid'); const moment = require('moment-timezone'); const testUtils = require('../../utils'); -const config = require('../../../server/config'); -const models = require('../../../server/models'); +const config = require('../../../core/server/config'); +const models = require('../../../core/server/models'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/core/test/api-acceptance/admin/roles_spec.js b/test/api-acceptance/admin/roles_spec.js similarity index 98% rename from core/test/api-acceptance/admin/roles_spec.js rename to test/api-acceptance/admin/roles_spec.js index 06065a8652..eb9fe9b3ab 100644 --- a/core/test/api-acceptance/admin/roles_spec.js +++ b/test/api-acceptance/admin/roles_spec.js @@ -1,6 +1,6 @@ const should = require('should'); const supertest = require('supertest'); -const config = require('../../../server/config'); +const config = require('../../../core/server/config'); const testUtils = require('../../utils'); const localUtils = require('./utils'); diff --git a/core/test/api-acceptance/admin/settings_spec.js b/test/api-acceptance/admin/settings_spec.js similarity index 99% rename from core/test/api-acceptance/admin/settings_spec.js rename to test/api-acceptance/admin/settings_spec.js index 63d8f6dfd6..14cd3e8782 100644 --- a/core/test/api-acceptance/admin/settings_spec.js +++ b/test/api-acceptance/admin/settings_spec.js @@ -3,7 +3,7 @@ const _ = require('lodash'); const supertest = require('supertest'); const os = require('os'); const fs = require('fs-extra'); -const config = require('../../../server/config'); +const config = require('../../../core/server/config'); const testUtils = require('../../utils'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/core/test/api-acceptance/admin/slugs_spec.js b/test/api-acceptance/admin/slugs_spec.js similarity index 96% rename from core/test/api-acceptance/admin/slugs_spec.js rename to test/api-acceptance/admin/slugs_spec.js index 61efb03a42..9997998e09 100644 --- a/core/test/api-acceptance/admin/slugs_spec.js +++ b/test/api-acceptance/admin/slugs_spec.js @@ -1,7 +1,7 @@ var should = require('should'), supertest = require('supertest'), testUtils = require('../../utils'), - config = require('../../../server/config'), + config = require('../../../core/server/config'), localUtils = require('./utils'), ghost = testUtils.startGhost, diff --git a/core/test/api-acceptance/admin/tags_spec.js b/test/api-acceptance/admin/tags_spec.js similarity index 99% rename from core/test/api-acceptance/admin/tags_spec.js rename to test/api-acceptance/admin/tags_spec.js index fd8998724d..7db86bf858 100644 --- a/core/test/api-acceptance/admin/tags_spec.js +++ b/test/api-acceptance/admin/tags_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../utils'); -const config = require('../../../server/config'); +const config = require('../../../core/server/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/core/test/api-acceptance/admin/themes_spec.js b/test/api-acceptance/admin/themes_spec.js similarity index 99% rename from core/test/api-acceptance/admin/themes_spec.js rename to test/api-acceptance/admin/themes_spec.js index ce4ede6741..848b953174 100644 --- a/core/test/api-acceptance/admin/themes_spec.js +++ b/test/api-acceptance/admin/themes_spec.js @@ -4,7 +4,7 @@ const fs = require('fs'); const _ = require('lodash'); const supertest = require('supertest'); const testUtils = require('../../utils'); -const config = require('../../../server/config'); +const config = require('../../../core/server/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/core/test/api-acceptance/admin/users_spec.js b/test/api-acceptance/admin/users_spec.js similarity index 98% rename from core/test/api-acceptance/admin/users_spec.js rename to test/api-acceptance/admin/users_spec.js index 699ebdcf7d..8571dad1eb 100644 --- a/core/test/api-acceptance/admin/users_spec.js +++ b/test/api-acceptance/admin/users_spec.js @@ -3,9 +3,9 @@ const _ = require('lodash'); const supertest = require('supertest'); const Promise = require('bluebird'); const testUtils = require('../../utils'); -const config = require('../../../server/config'); -const db = require('../../../server/data/db'); -const models = require('../../../server/models'); +const config = require('../../../core/server/config'); +const db = require('../../../core/server/data/db'); +const models = require('../../../core/server/models'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/core/test/api-acceptance/admin/utils.js b/test/api-acceptance/admin/utils.js similarity index 98% rename from core/test/api-acceptance/admin/utils.js rename to test/api-acceptance/admin/utils.js index 6bb08eea6e..7ac9d2f17b 100644 --- a/core/test/api-acceptance/admin/utils.js +++ b/test/api-acceptance/admin/utils.js @@ -1,7 +1,7 @@ const url = require('url'); const _ = require('lodash'); const testUtils = require('../../utils'); -const schema = require('../../../server/data/schema').tables; +const schema = require('../../../core/server/data/schema').tables; const API_URL = '/ghost/api/canary/admin/'; const expectedProperties = { diff --git a/core/test/api-acceptance/admin/webhooks_spec.js b/test/api-acceptance/admin/webhooks_spec.js similarity index 99% rename from core/test/api-acceptance/admin/webhooks_spec.js rename to test/api-acceptance/admin/webhooks_spec.js index 595d1ac491..fda1253756 100644 --- a/core/test/api-acceptance/admin/webhooks_spec.js +++ b/test/api-acceptance/admin/webhooks_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../utils'); -const config = require('../../../server/config'); +const config = require('../../../core/server/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/core/test/api-acceptance/content/authors_spec.js b/test/api-acceptance/content/authors_spec.js similarity index 98% rename from core/test/api-acceptance/content/authors_spec.js rename to test/api-acceptance/content/authors_spec.js index 6f8f40a54c..da5a927cae 100644 --- a/core/test/api-acceptance/content/authors_spec.js +++ b/test/api-acceptance/content/authors_spec.js @@ -3,8 +3,8 @@ const supertest = require('supertest'); const _ = require('lodash'); const url = require('url'); const configUtils = require('../../utils/configUtils'); -const config = require('../../../server/config'); -const models = require('../../../server/models'); +const config = require('../../../core/server/config'); +const models = require('../../../core/server/models'); const testUtils = require('../../utils'); const localUtils = require('./utils'); diff --git a/core/test/api-acceptance/content/key_authentication_spec.js b/test/api-acceptance/content/key_authentication_spec.js similarity index 95% rename from core/test/api-acceptance/content/key_authentication_spec.js rename to test/api-acceptance/content/key_authentication_spec.js index 7ebc19ced4..2ba7adb310 100644 --- a/core/test/api-acceptance/content/key_authentication_spec.js +++ b/test/api-acceptance/content/key_authentication_spec.js @@ -3,7 +3,7 @@ const supertest = require('supertest'); const _ = require('lodash'); const testUtils = require('../../utils'); const localUtils = require('./utils'); -const config = require('../../../server/config'); +const config = require('../../../core/server/config'); const ghost = testUtils.startGhost; diff --git a/core/test/api-acceptance/content/pages_spec.js b/test/api-acceptance/content/pages_spec.js similarity index 98% rename from core/test/api-acceptance/content/pages_spec.js rename to test/api-acceptance/content/pages_spec.js index d1c3ccc0a4..a4fefdb923 100644 --- a/core/test/api-acceptance/content/pages_spec.js +++ b/test/api-acceptance/content/pages_spec.js @@ -3,7 +3,7 @@ const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../utils'); const configUtils = require('../../utils/configUtils'); -const config = require('../../../server/config'); +const config = require('../../../core/server/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/core/test/api-acceptance/content/posts_spec.js b/test/api-acceptance/content/posts_spec.js similarity index 99% rename from core/test/api-acceptance/content/posts_spec.js rename to test/api-acceptance/content/posts_spec.js index 42e57bb25d..d2b8015ee1 100644 --- a/core/test/api-acceptance/content/posts_spec.js +++ b/test/api-acceptance/content/posts_spec.js @@ -6,7 +6,7 @@ const cheerio = require('cheerio'); const moment = require('moment'); const testUtils = require('../../utils'); const configUtils = require('../../utils/configUtils'); -const config = require('../../../server/config'); +const config = require('../../../core/server/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/core/test/api-acceptance/content/settings_spec.js b/test/api-acceptance/content/settings_spec.js similarity index 93% rename from core/test/api-acceptance/content/settings_spec.js rename to test/api-acceptance/content/settings_spec.js index edbe0eb90a..af6ff78130 100644 --- a/core/test/api-acceptance/content/settings_spec.js +++ b/test/api-acceptance/content/settings_spec.js @@ -2,12 +2,12 @@ const should = require('should'); const supertest = require('supertest'); const _ = require('lodash'); const testUtils = require('../../utils'); -const config = require('../../../server/config'); +const config = require('../../../core/server/config'); const localUtils = require('./utils'); // Values to test against -const publicSettings = require('../../../server/services/settings/public'); -const defaultSettings = require('../../../server/data/schema').defaultSettings.blog; +const publicSettings = require('../../../core/server/services/settings/public'); +const defaultSettings = require('../../../core/server/data/schema').defaultSettings.blog; const ghost = testUtils.startGhost; let request; diff --git a/core/test/api-acceptance/content/tags_spec.js b/test/api-acceptance/content/tags_spec.js similarity index 99% rename from core/test/api-acceptance/content/tags_spec.js rename to test/api-acceptance/content/tags_spec.js index d5b604b5d4..e9d29832ee 100644 --- a/core/test/api-acceptance/content/tags_spec.js +++ b/test/api-acceptance/content/tags_spec.js @@ -3,7 +3,7 @@ const supertest = require('supertest'); const _ = require('lodash'); const url = require('url'); const configUtils = require('../../utils/configUtils'); -const config = require('../../../server/config'); +const config = require('../../../core/server/config'); const testUtils = require('../../utils'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/core/test/api-acceptance/content/utils.js b/test/api-acceptance/content/utils.js similarity index 97% rename from core/test/api-acceptance/content/utils.js rename to test/api-acceptance/content/utils.js index 3bc829c0c7..b4a654c678 100644 --- a/core/test/api-acceptance/content/utils.js +++ b/test/api-acceptance/content/utils.js @@ -1,7 +1,7 @@ const url = require('url'); const _ = require('lodash'); const testUtils = require('../../utils'); -const schema = require('../../../server/data/schema').tables; +const schema = require('../../../core/server/data/schema').tables; const API_URL = '/ghost/api/canary/content/'; const expectedProperties = { diff --git a/core/test/frontend-acceptance/default_routes_spec.js b/test/frontend-acceptance/default_routes_spec.js similarity index 99% rename from core/test/frontend-acceptance/default_routes_spec.js rename to test/frontend-acceptance/default_routes_spec.js index 13f7eb94f8..0d9443ff29 100644 --- a/core/test/frontend-acceptance/default_routes_spec.js +++ b/test/frontend-acceptance/default_routes_spec.js @@ -13,8 +13,8 @@ var should = require('should'), _ = require('lodash'), testUtils = require('../utils'), configUtils = require('../utils/configUtils'), - config = require('../../server/config'), - settingsCache = require('../../server/services/settings/cache'), + config = require('../../core/server/config'), + settingsCache = require('../../core/server/services/settings/cache'), origCache = _.cloneDeep(settingsCache), ghost = testUtils.startGhost, request; diff --git a/core/test/regression/README.md b/test/regression/README.md similarity index 100% rename from core/test/regression/README.md rename to test/regression/README.md diff --git a/core/test/regression/api/admin_spec.js b/test/regression/api/admin_spec.js similarity index 96% rename from core/test/regression/api/admin_spec.js rename to test/regression/api/admin_spec.js index 7f00a1ebac..ce7eef1676 100644 --- a/core/test/regression/api/admin_spec.js +++ b/test/regression/api/admin_spec.js @@ -9,8 +9,8 @@ var should = require('should'), configUtils = require('../../utils/configUtils'), urlUtils = require('../../utils/urlUtils'), ghost = testUtils.startGhost, - common = require('../../../server/lib/common/index'), - config = require('../../../server/config/index'), + common = require('../../../core/server/lib/common/index'), + config = require('../../../core/server/config/index'), request; common.i18n.init(); diff --git a/core/test/regression/api/canary/admin/authentication_spec.js b/test/regression/api/canary/admin/authentication_spec.js similarity index 97% rename from core/test/regression/api/canary/admin/authentication_spec.js rename to test/regression/api/canary/admin/authentication_spec.js index 15c21d6047..df97ad75af 100644 --- a/core/test/regression/api/canary/admin/authentication_spec.js +++ b/test/regression/api/canary/admin/authentication_spec.js @@ -3,11 +3,11 @@ const sinon = require('sinon'); const supertest = require('supertest'); const localUtils = require('./utils'); const testUtils = require('../../../../utils/index'); -const models = require('../../../../../server/models/index'); -const security = require('../../../../../server/lib/security/index'); -const settingsCache = require('../../../../../server/services/settings/cache'); -const config = require('../../../../../server/config/index'); -const mailService = require('../../../../../server/services/mail/index'); +const models = require('../../../../../core/server/models/index'); +const security = require('../../../../../core/server/lib/security/index'); +const settingsCache = require('../../../../../core/server/services/settings/cache'); +const config = require('../../../../../core/server/config/index'); +const mailService = require('../../../../../core/server/services/mail/index'); let ghost = testUtils.startGhost; let request; diff --git a/core/test/regression/api/canary/admin/db_spec.js b/test/regression/api/canary/admin/db_spec.js similarity index 96% rename from core/test/regression/api/canary/admin/db_spec.js rename to test/regression/api/canary/admin/db_spec.js index 6fc215d5bd..f4c84963dc 100644 --- a/core/test/regression/api/canary/admin/db_spec.js +++ b/test/regression/api/canary/admin/db_spec.js @@ -6,9 +6,9 @@ const uuid = require('uuid'); const should = require('should'); const supertest = require('supertest'); const sinon = require('sinon'); -const config = require('../../../../../server/config'); -const models = require('../../../../../server/models'); -const common = require('../../../../../server/lib/common'); +const config = require('../../../../../core/server/config'); +const models = require('../../../../../core/server/models'); +const common = require('../../../../../core/server/lib/common'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); diff --git a/core/test/regression/api/canary/admin/identities_spec.js b/test/regression/api/canary/admin/identities_spec.js similarity index 98% rename from core/test/regression/api/canary/admin/identities_spec.js rename to test/regression/api/canary/admin/identities_spec.js index 92350492d2..10becb5e55 100644 --- a/core/test/regression/api/canary/admin/identities_spec.js +++ b/test/regression/api/canary/admin/identities_spec.js @@ -4,7 +4,7 @@ const jwt = require('jsonwebtoken'); const jwksClient = require('jwks-rsa'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); -const config = require('../../../../../server/config'); +const config = require('../../../../../core/server/config'); const ghost = testUtils.startGhost; diff --git a/core/test/regression/api/v3/admin/images_spec.js b/test/regression/api/canary/admin/images_spec.js similarity index 97% rename from core/test/regression/api/v3/admin/images_spec.js rename to test/regression/api/canary/admin/images_spec.js index 34e20ae61c..d52cb66ec0 100644 --- a/core/test/regression/api/v3/admin/images_spec.js +++ b/test/regression/api/canary/admin/images_spec.js @@ -4,7 +4,7 @@ const should = require('should'); const supertest = require('supertest'); const localUtils = require('./utils'); const testUtils = require('../../../../utils'); -const config = require('../../../../../server/config'); +const config = require('../../../../../core/server/config'); const ghost = testUtils.startGhost; diff --git a/core/test/regression/api/canary/admin/members_signin_url_spec.js b/test/regression/api/canary/admin/members_signin_url_spec.js similarity index 95% rename from core/test/regression/api/canary/admin/members_signin_url_spec.js rename to test/regression/api/canary/admin/members_signin_url_spec.js index b75c14689e..c6533f5249 100644 --- a/core/test/regression/api/canary/admin/members_signin_url_spec.js +++ b/test/regression/api/canary/admin/members_signin_url_spec.js @@ -4,8 +4,8 @@ const supertest = require('supertest'); const sinon = require('sinon'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); -const config = require('../../../../../server/config'); -const labs = require('../../../../../server/services/labs'); +const config = require('../../../../../core/server/config'); +const labs = require('../../../../../core/server/services/labs'); const ghost = testUtils.startGhost; diff --git a/core/test/regression/api/canary/admin/members_spec.js b/test/regression/api/canary/admin/members_spec.js similarity index 99% rename from core/test/regression/api/canary/admin/members_spec.js rename to test/regression/api/canary/admin/members_spec.js index 326f98c274..0098082bac 100644 --- a/core/test/regression/api/canary/admin/members_spec.js +++ b/test/regression/api/canary/admin/members_spec.js @@ -4,8 +4,8 @@ const supertest = require('supertest'); const sinon = require('sinon'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); -const config = require('../../../../../server/config'); -const labs = require('../../../../../server/services/labs'); +const config = require('../../../../../core/server/config'); +const labs = require('../../../../../core/server/services/labs'); const ghost = testUtils.startGhost; diff --git a/core/test/regression/api/v3/admin/notifications_spec.js b/test/regression/api/canary/admin/notifications_spec.js similarity index 99% rename from core/test/regression/api/v3/admin/notifications_spec.js rename to test/regression/api/canary/admin/notifications_spec.js index b67a3a8ab3..e77020dc13 100644 --- a/core/test/regression/api/v3/admin/notifications_spec.js +++ b/test/regression/api/canary/admin/notifications_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../../../utils'); -const config = require('../../../../../server/config'); +const config = require('../../../../../core/server/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/core/test/regression/api/v2/admin/pages_spec.js b/test/regression/api/canary/admin/pages_spec.js similarity index 96% rename from core/test/regression/api/v2/admin/pages_spec.js rename to test/regression/api/canary/admin/pages_spec.js index d9d0fe175b..6c0cc48e50 100644 --- a/core/test/regression/api/v2/admin/pages_spec.js +++ b/test/regression/api/canary/admin/pages_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../../../utils'); -const config = require('../../../../../server/config'); +const config = require('../../../../../core/server/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; let request; diff --git a/core/test/regression/api/canary/admin/posts_spec.js b/test/regression/api/canary/admin/posts_spec.js similarity index 99% rename from core/test/regression/api/canary/admin/posts_spec.js rename to test/regression/api/canary/admin/posts_spec.js index 70757ed86a..4d1803ac92 100644 --- a/core/test/regression/api/canary/admin/posts_spec.js +++ b/test/regression/api/canary/admin/posts_spec.js @@ -3,8 +3,8 @@ const supertest = require('supertest'); const ObjectId = require('bson-objectid'); const moment = require('moment-timezone'); const testUtils = require('../../../../utils'); -const config = require('../../../../../server/config'); -const models = require('../../../../../server/models'); +const config = require('../../../../../core/server/config'); +const models = require('../../../../../core/server/models'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; let request; diff --git a/core/test/regression/api/canary/admin/redirects_spec.js b/test/regression/api/canary/admin/redirects_spec.js similarity index 99% rename from core/test/regression/api/canary/admin/redirects_spec.js rename to test/regression/api/canary/admin/redirects_spec.js index 9f9e4f1fbb..f24d04f651 100644 --- a/core/test/regression/api/canary/admin/redirects_spec.js +++ b/test/regression/api/canary/admin/redirects_spec.js @@ -6,7 +6,7 @@ const path = require('path'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); const configUtils = require('../../../../utils/configUtils'); -const config = require('../../../../../server/config'); +const config = require('../../../../../core/server/config'); const ghost = testUtils.startGhost; let request; diff --git a/core/test/regression/api/canary/admin/schedules_spec.js b/test/regression/api/canary/admin/schedules_spec.js similarity index 97% rename from core/test/regression/api/canary/admin/schedules_spec.js rename to test/regression/api/canary/admin/schedules_spec.js index 1bb968dcfe..77fac94c52 100644 --- a/core/test/regression/api/canary/admin/schedules_spec.js +++ b/test/regression/api/canary/admin/schedules_spec.js @@ -4,9 +4,9 @@ const supertest = require('supertest'); const Promise = require('bluebird'); const sinon = require('sinon'); const moment = require('moment-timezone'); -const SchedulingDefault = require('../../../../../server/adapters/scheduling/SchedulingDefault'); -const models = require('../../../../../server/models/index'); -const config = require('../../../../../server/config/index'); +const SchedulingDefault = require('../../../../../core/server/adapters/scheduling/SchedulingDefault'); +const models = require('../../../../../core/server/models/index'); +const config = require('../../../../../core/server/config/index'); const testUtils = require('../../../../utils/index'); const localUtils = require('./utils'); diff --git a/core/test/regression/api/canary/admin/settings_spec.js b/test/regression/api/canary/admin/settings_spec.js similarity index 99% rename from core/test/regression/api/canary/admin/settings_spec.js rename to test/regression/api/canary/admin/settings_spec.js index dec329fab3..0c851254f1 100644 --- a/core/test/regression/api/canary/admin/settings_spec.js +++ b/test/regression/api/canary/admin/settings_spec.js @@ -1,6 +1,6 @@ const should = require('should'); const supertest = require('supertest'); -const config = require('../../../../../server/config'); +const config = require('../../../../../core/server/config'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/core/test/regression/api/v3/admin/slack_spec.js b/test/regression/api/canary/admin/slack_spec.js similarity index 91% rename from core/test/regression/api/v3/admin/slack_spec.js rename to test/regression/api/canary/admin/slack_spec.js index 124d9785a7..6d832085e3 100644 --- a/core/test/regression/api/v3/admin/slack_spec.js +++ b/test/regression/api/canary/admin/slack_spec.js @@ -3,8 +3,8 @@ const supertest = require('supertest'); const sinon = require('sinon'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); -const config = require('../../../../../server/config'); -const common = require('../../../../../server/lib/common'); +const config = require('../../../../../core/server/config'); +const common = require('../../../../../core/server/lib/common'); const ghost = testUtils.startGhost; let request; diff --git a/core/test/regression/api/v3/admin/users_spec.js b/test/regression/api/canary/admin/users_spec.js similarity index 99% rename from core/test/regression/api/v3/admin/users_spec.js rename to test/regression/api/canary/admin/users_spec.js index 4d468be1c2..21d5382f4c 100644 --- a/core/test/regression/api/v3/admin/users_spec.js +++ b/test/regression/api/canary/admin/users_spec.js @@ -2,7 +2,7 @@ const should = require('should'); const supertest = require('supertest'); const ObjectId = require('bson-objectid'); const testUtils = require('../../../../utils'); -const config = require('../../../../../server/config'); +const config = require('../../../../../core/server/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; let request; diff --git a/core/test/regression/api/canary/admin/utils.js b/test/regression/api/canary/admin/utils.js similarity index 97% rename from core/test/regression/api/canary/admin/utils.js rename to test/regression/api/canary/admin/utils.js index 9714c384a7..fd4fcd9395 100644 --- a/core/test/regression/api/canary/admin/utils.js +++ b/test/regression/api/canary/admin/utils.js @@ -1,7 +1,7 @@ const url = require('url'); const _ = require('lodash'); const testUtils = require('../../../../utils'); -const schema = require('../../../../../server/data/schema').tables; +const schema = require('../../../../../core/server/data/schema').tables; const API_URL = '/ghost/api/canary/admin/'; const expectedProperties = { diff --git a/core/test/regression/api/v2/content/authors_spec.js b/test/regression/api/canary/content/authors_spec.js similarity index 95% rename from core/test/regression/api/v2/content/authors_spec.js rename to test/regression/api/canary/content/authors_spec.js index 4527f4b461..43a19db267 100644 --- a/core/test/regression/api/v2/content/authors_spec.js +++ b/test/regression/api/canary/content/authors_spec.js @@ -3,7 +3,7 @@ const supertest = require('supertest'); const localUtils = require('./utils'); const testUtils = require('../../../../utils'); const configUtils = require('../../../../utils/configUtils'); -const config = require('../../../../../server/config'); +const config = require('../../../../../core/server/config'); const ghost = testUtils.startGhost; diff --git a/core/test/regression/api/canary/content/pages_spec.js b/test/regression/api/canary/content/pages_spec.js similarity index 97% rename from core/test/regression/api/canary/content/pages_spec.js rename to test/regression/api/canary/content/pages_spec.js index 080fb33081..1a036c2932 100644 --- a/core/test/regression/api/canary/content/pages_spec.js +++ b/test/regression/api/canary/content/pages_spec.js @@ -3,7 +3,7 @@ const supertest = require('supertest'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); const configUtils = require('../../../../utils/configUtils'); -const config = require('../../../../../server/config'); +const config = require('../../../../../core/server/config'); const ghost = testUtils.startGhost; let request; diff --git a/core/test/regression/api/canary/content/posts_spec.js b/test/regression/api/canary/content/posts_spec.js similarity index 99% rename from core/test/regression/api/canary/content/posts_spec.js rename to test/regression/api/canary/content/posts_spec.js index feb0d5bdde..775b71f823 100644 --- a/core/test/regression/api/canary/content/posts_spec.js +++ b/test/regression/api/canary/content/posts_spec.js @@ -3,12 +3,12 @@ const sinon = require('sinon'); const moment = require('moment'); const supertest = require('supertest'); const _ = require('lodash'); -const labs = require('../../../../../server/services/labs'); +const labs = require('../../../../../core/server/services/labs'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); const configUtils = require('../../../../utils/configUtils'); const urlUtils = require('../../../../utils/urlUtils'); -const config = require('../../../../../server/config'); +const config = require('../../../../../core/server/config'); const ghost = testUtils.startGhost; let request; diff --git a/core/test/regression/api/canary/content/tags_spec.js b/test/regression/api/canary/content/tags_spec.js similarity index 95% rename from core/test/regression/api/canary/content/tags_spec.js rename to test/regression/api/canary/content/tags_spec.js index c3e4e95904..8815c9ac18 100644 --- a/core/test/regression/api/canary/content/tags_spec.js +++ b/test/regression/api/canary/content/tags_spec.js @@ -3,7 +3,7 @@ const supertest = require('supertest'); const localUtils = require('./utils'); const testUtils = require('../../../../utils'); const configUtils = require('../../../../utils/configUtils'); -const config = require('../../../../../server/config'); +const config = require('../../../../../core/server/config'); const ghost = testUtils.startGhost; let request; diff --git a/core/test/regression/api/canary/content/utils.js b/test/regression/api/canary/content/utils.js similarity index 97% rename from core/test/regression/api/canary/content/utils.js rename to test/regression/api/canary/content/utils.js index 77030878bb..3b0df72970 100644 --- a/core/test/regression/api/canary/content/utils.js +++ b/test/regression/api/canary/content/utils.js @@ -1,7 +1,7 @@ const url = require('url'); const _ = require('lodash'); const testUtils = require('../../../../utils'); -const schema = require('../../../../../server/data/schema').tables; +const schema = require('../../../../../core/server/data/schema').tables; const API_URL = '/ghost/api/canary/content/'; const expectedProperties = { diff --git a/core/test/regression/api/v2/admin/authentication_spec.js b/test/regression/api/v2/admin/authentication_spec.js similarity index 97% rename from core/test/regression/api/v2/admin/authentication_spec.js rename to test/regression/api/v2/admin/authentication_spec.js index fb114c2053..9ea1cc8233 100644 --- a/core/test/regression/api/v2/admin/authentication_spec.js +++ b/test/regression/api/v2/admin/authentication_spec.js @@ -3,11 +3,11 @@ const sinon = require('sinon'); const supertest = require('supertest'); const localUtils = require('./utils'); const testUtils = require('../../../../utils/index'); -const models = require('../../../../../server/models/index'); -const security = require('../../../../../server/lib/security/index'); -const settingsCache = require('../../../../../server/services/settings/cache'); -const config = require('../../../../../server/config/index'); -const mailService = require('../../../../../server/services/mail/index'); +const models = require('../../../../../core/server/models/index'); +const security = require('../../../../../core/server/lib/security/index'); +const settingsCache = require('../../../../../core/server/services/settings/cache'); +const config = require('../../../../../core/server/config/index'); +const mailService = require('../../../../../core/server/services/mail/index'); const configUtils = require('../../../../utils/configUtils'); let ghost = testUtils.startGhost; diff --git a/core/test/regression/api/v2/admin/db_spec.js b/test/regression/api/v2/admin/db_spec.js similarity index 96% rename from core/test/regression/api/v2/admin/db_spec.js rename to test/regression/api/v2/admin/db_spec.js index 15be3f6036..d494b2bbb8 100644 --- a/core/test/regression/api/v2/admin/db_spec.js +++ b/test/regression/api/v2/admin/db_spec.js @@ -6,9 +6,9 @@ const uuid = require('uuid'); const should = require('should'); const supertest = require('supertest'); const sinon = require('sinon'); -const config = require('../../../../../server/config'); -const models = require('../../../../../server/models'); -const common = require('../../../../../server/lib/common'); +const config = require('../../../../../core/server/config'); +const models = require('../../../../../core/server/models'); +const common = require('../../../../../core/server/lib/common'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); diff --git a/core/test/regression/api/canary/admin/images_spec.js b/test/regression/api/v2/admin/images_spec.js similarity index 97% rename from core/test/regression/api/canary/admin/images_spec.js rename to test/regression/api/v2/admin/images_spec.js index 34e20ae61c..d52cb66ec0 100644 --- a/core/test/regression/api/canary/admin/images_spec.js +++ b/test/regression/api/v2/admin/images_spec.js @@ -4,7 +4,7 @@ const should = require('should'); const supertest = require('supertest'); const localUtils = require('./utils'); const testUtils = require('../../../../utils'); -const config = require('../../../../../server/config'); +const config = require('../../../../../core/server/config'); const ghost = testUtils.startGhost; diff --git a/core/test/regression/api/v2/admin/notifications_spec.js b/test/regression/api/v2/admin/notifications_spec.js similarity index 99% rename from core/test/regression/api/v2/admin/notifications_spec.js rename to test/regression/api/v2/admin/notifications_spec.js index b67a3a8ab3..e77020dc13 100644 --- a/core/test/regression/api/v2/admin/notifications_spec.js +++ b/test/regression/api/v2/admin/notifications_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../../../utils'); -const config = require('../../../../../server/config'); +const config = require('../../../../../core/server/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/core/test/regression/api/canary/admin/pages_spec.js b/test/regression/api/v2/admin/pages_spec.js similarity index 96% rename from core/test/regression/api/canary/admin/pages_spec.js rename to test/regression/api/v2/admin/pages_spec.js index d9d0fe175b..6c0cc48e50 100644 --- a/core/test/regression/api/canary/admin/pages_spec.js +++ b/test/regression/api/v2/admin/pages_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../../../utils'); -const config = require('../../../../../server/config'); +const config = require('../../../../../core/server/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; let request; diff --git a/core/test/regression/api/v2/admin/posts_spec.js b/test/regression/api/v2/admin/posts_spec.js similarity index 99% rename from core/test/regression/api/v2/admin/posts_spec.js rename to test/regression/api/v2/admin/posts_spec.js index 3670a6ef08..47c3d9c428 100644 --- a/core/test/regression/api/v2/admin/posts_spec.js +++ b/test/regression/api/v2/admin/posts_spec.js @@ -3,8 +3,8 @@ const supertest = require('supertest'); const ObjectId = require('bson-objectid'); const moment = require('moment-timezone'); const testUtils = require('../../../../utils'); -const config = require('../../../../../server/config'); -const models = require('../../../../../server/models'); +const config = require('../../../../../core/server/config'); +const models = require('../../../../../core/server/models'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; let request; diff --git a/core/test/regression/api/v2/admin/redirects_spec.js b/test/regression/api/v2/admin/redirects_spec.js similarity index 99% rename from core/test/regression/api/v2/admin/redirects_spec.js rename to test/regression/api/v2/admin/redirects_spec.js index 9f9e4f1fbb..f24d04f651 100644 --- a/core/test/regression/api/v2/admin/redirects_spec.js +++ b/test/regression/api/v2/admin/redirects_spec.js @@ -6,7 +6,7 @@ const path = require('path'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); const configUtils = require('../../../../utils/configUtils'); -const config = require('../../../../../server/config'); +const config = require('../../../../../core/server/config'); const ghost = testUtils.startGhost; let request; diff --git a/core/test/regression/api/v2/admin/schedules_spec.js b/test/regression/api/v2/admin/schedules_spec.js similarity index 97% rename from core/test/regression/api/v2/admin/schedules_spec.js rename to test/regression/api/v2/admin/schedules_spec.js index 3f98d856b8..fc1c33d4f0 100644 --- a/core/test/regression/api/v2/admin/schedules_spec.js +++ b/test/regression/api/v2/admin/schedules_spec.js @@ -4,9 +4,9 @@ const supertest = require('supertest'); const Promise = require('bluebird'); const sinon = require('sinon'); const moment = require('moment-timezone'); -const SchedulingDefault = require('../../../../../server/adapters/scheduling/SchedulingDefault'); -const models = require('../../../../../server/models/index'); -const config = require('../../../../../server/config/index'); +const SchedulingDefault = require('../../../../../core/server/adapters/scheduling/SchedulingDefault'); +const models = require('../../../../../core/server/models/index'); +const config = require('../../../../../core/server/config/index'); const testUtils = require('../../../../utils/index'); const localUtils = require('./utils'); diff --git a/core/test/regression/api/v2/admin/settings_spec.js b/test/regression/api/v2/admin/settings_spec.js similarity index 99% rename from core/test/regression/api/v2/admin/settings_spec.js rename to test/regression/api/v2/admin/settings_spec.js index 1933e69f0d..1ca5e6ff62 100644 --- a/core/test/regression/api/v2/admin/settings_spec.js +++ b/test/regression/api/v2/admin/settings_spec.js @@ -1,6 +1,6 @@ const should = require('should'); const supertest = require('supertest'); -const config = require('../../../../../server/config'); +const config = require('../../../../../core/server/config'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/core/test/regression/api/v2/admin/slack_spec.js b/test/regression/api/v2/admin/slack_spec.js similarity index 91% rename from core/test/regression/api/v2/admin/slack_spec.js rename to test/regression/api/v2/admin/slack_spec.js index 124d9785a7..6d832085e3 100644 --- a/core/test/regression/api/v2/admin/slack_spec.js +++ b/test/regression/api/v2/admin/slack_spec.js @@ -3,8 +3,8 @@ const supertest = require('supertest'); const sinon = require('sinon'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); -const config = require('../../../../../server/config'); -const common = require('../../../../../server/lib/common'); +const config = require('../../../../../core/server/config'); +const common = require('../../../../../core/server/lib/common'); const ghost = testUtils.startGhost; let request; diff --git a/core/test/regression/api/canary/admin/users_spec.js b/test/regression/api/v2/admin/users_spec.js similarity index 99% rename from core/test/regression/api/canary/admin/users_spec.js rename to test/regression/api/v2/admin/users_spec.js index 4d468be1c2..21d5382f4c 100644 --- a/core/test/regression/api/canary/admin/users_spec.js +++ b/test/regression/api/v2/admin/users_spec.js @@ -2,7 +2,7 @@ const should = require('should'); const supertest = require('supertest'); const ObjectId = require('bson-objectid'); const testUtils = require('../../../../utils'); -const config = require('../../../../../server/config'); +const config = require('../../../../../core/server/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; let request; diff --git a/core/test/regression/api/v2/admin/utils.js b/test/regression/api/v2/admin/utils.js similarity index 97% rename from core/test/regression/api/v2/admin/utils.js rename to test/regression/api/v2/admin/utils.js index 5d8088db88..39d5b6b790 100644 --- a/core/test/regression/api/v2/admin/utils.js +++ b/test/regression/api/v2/admin/utils.js @@ -1,7 +1,7 @@ const url = require('url'); const _ = require('lodash'); const testUtils = require('../../../../utils'); -const schema = require('../../../../../server/data/schema').tables; +const schema = require('../../../../../core/server/data/schema').tables; const API_URL = '/ghost/api/v2/admin/'; const expectedProperties = { diff --git a/core/test/regression/api/v3/content/authors_spec.js b/test/regression/api/v2/content/authors_spec.js similarity index 95% rename from core/test/regression/api/v3/content/authors_spec.js rename to test/regression/api/v2/content/authors_spec.js index 4527f4b461..43a19db267 100644 --- a/core/test/regression/api/v3/content/authors_spec.js +++ b/test/regression/api/v2/content/authors_spec.js @@ -3,7 +3,7 @@ const supertest = require('supertest'); const localUtils = require('./utils'); const testUtils = require('../../../../utils'); const configUtils = require('../../../../utils/configUtils'); -const config = require('../../../../../server/config'); +const config = require('../../../../../core/server/config'); const ghost = testUtils.startGhost; diff --git a/core/test/regression/api/v2/content/pages_spec.js b/test/regression/api/v2/content/pages_spec.js similarity index 98% rename from core/test/regression/api/v2/content/pages_spec.js rename to test/regression/api/v2/content/pages_spec.js index b517259c95..0c2d88ae37 100644 --- a/core/test/regression/api/v2/content/pages_spec.js +++ b/test/regression/api/v2/content/pages_spec.js @@ -4,7 +4,7 @@ const supertest = require('supertest'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); const configUtils = require('../../../../utils/configUtils'); -const config = require('../../../../../server/config'); +const config = require('../../../../../core/server/config'); const ghost = testUtils.startGhost; let request; diff --git a/core/test/regression/api/v2/content/posts_spec.js b/test/regression/api/v2/content/posts_spec.js similarity index 99% rename from core/test/regression/api/v2/content/posts_spec.js rename to test/regression/api/v2/content/posts_spec.js index 2bd8fb9b41..0560edf211 100644 --- a/core/test/regression/api/v2/content/posts_spec.js +++ b/test/regression/api/v2/content/posts_spec.js @@ -5,12 +5,12 @@ const moment = require('moment'); const supertest = require('supertest'); const _ = require('lodash'); const cheerio = require('cheerio'); -const labs = require('../../../../../server/services/labs'); +const labs = require('../../../../../core/server/services/labs'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); const configUtils = require('../../../../utils/configUtils'); const urlUtils = require('../../../../utils/urlUtils'); -const config = require('../../../../../server/config'); +const config = require('../../../../../core/server/config'); const ghost = testUtils.startGhost; let request; diff --git a/core/test/regression/api/v2/content/tags_spec.js b/test/regression/api/v2/content/tags_spec.js similarity index 95% rename from core/test/regression/api/v2/content/tags_spec.js rename to test/regression/api/v2/content/tags_spec.js index 10a88a819a..f94b25b8de 100644 --- a/core/test/regression/api/v2/content/tags_spec.js +++ b/test/regression/api/v2/content/tags_spec.js @@ -3,7 +3,7 @@ const supertest = require('supertest'); const localUtils = require('./utils'); const testUtils = require('../../../../utils'); const configUtils = require('../../../../utils/configUtils'); -const config = require('../../../../../server/config'); +const config = require('../../../../../core/server/config'); const ghost = testUtils.startGhost; let request; diff --git a/core/test/regression/api/v2/content/utils.js b/test/regression/api/v2/content/utils.js similarity index 97% rename from core/test/regression/api/v2/content/utils.js rename to test/regression/api/v2/content/utils.js index 7dd49547b5..a54068c7c9 100644 --- a/core/test/regression/api/v2/content/utils.js +++ b/test/regression/api/v2/content/utils.js @@ -1,7 +1,7 @@ const url = require('url'); const _ = require('lodash'); const testUtils = require('../../../../utils'); -const schema = require('../../../../../server/data/schema').tables; +const schema = require('../../../../../core/server/data/schema').tables; const API_URL = '/ghost/api/v2/content/'; const expectedProperties = { diff --git a/core/test/regression/api/v3/admin/authentication_spec.js b/test/regression/api/v3/admin/authentication_spec.js similarity index 97% rename from core/test/regression/api/v3/admin/authentication_spec.js rename to test/regression/api/v3/admin/authentication_spec.js index 15c21d6047..df97ad75af 100644 --- a/core/test/regression/api/v3/admin/authentication_spec.js +++ b/test/regression/api/v3/admin/authentication_spec.js @@ -3,11 +3,11 @@ const sinon = require('sinon'); const supertest = require('supertest'); const localUtils = require('./utils'); const testUtils = require('../../../../utils/index'); -const models = require('../../../../../server/models/index'); -const security = require('../../../../../server/lib/security/index'); -const settingsCache = require('../../../../../server/services/settings/cache'); -const config = require('../../../../../server/config/index'); -const mailService = require('../../../../../server/services/mail/index'); +const models = require('../../../../../core/server/models/index'); +const security = require('../../../../../core/server/lib/security/index'); +const settingsCache = require('../../../../../core/server/services/settings/cache'); +const config = require('../../../../../core/server/config/index'); +const mailService = require('../../../../../core/server/services/mail/index'); let ghost = testUtils.startGhost; let request; diff --git a/core/test/regression/api/v3/admin/db_spec.js b/test/regression/api/v3/admin/db_spec.js similarity index 97% rename from core/test/regression/api/v3/admin/db_spec.js rename to test/regression/api/v3/admin/db_spec.js index c0f657f91b..4ed70bb6b8 100644 --- a/core/test/regression/api/v3/admin/db_spec.js +++ b/test/regression/api/v3/admin/db_spec.js @@ -6,9 +6,9 @@ const uuid = require('uuid'); const should = require('should'); const supertest = require('supertest'); const sinon = require('sinon'); -const config = require('../../../../../server/config'); -const models = require('../../../../../server/models'); -const common = require('../../../../../server/lib/common'); +const config = require('../../../../../core/server/config'); +const models = require('../../../../../core/server/models'); +const common = require('../../../../../core/server/lib/common'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); diff --git a/core/test/regression/api/v2/admin/images_spec.js b/test/regression/api/v3/admin/images_spec.js similarity index 97% rename from core/test/regression/api/v2/admin/images_spec.js rename to test/regression/api/v3/admin/images_spec.js index 34e20ae61c..d52cb66ec0 100644 --- a/core/test/regression/api/v2/admin/images_spec.js +++ b/test/regression/api/v3/admin/images_spec.js @@ -4,7 +4,7 @@ const should = require('should'); const supertest = require('supertest'); const localUtils = require('./utils'); const testUtils = require('../../../../utils'); -const config = require('../../../../../server/config'); +const config = require('../../../../../core/server/config'); const ghost = testUtils.startGhost; diff --git a/core/test/regression/api/canary/admin/notifications_spec.js b/test/regression/api/v3/admin/notifications_spec.js similarity index 99% rename from core/test/regression/api/canary/admin/notifications_spec.js rename to test/regression/api/v3/admin/notifications_spec.js index b67a3a8ab3..e77020dc13 100644 --- a/core/test/regression/api/canary/admin/notifications_spec.js +++ b/test/regression/api/v3/admin/notifications_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const supertest = require('supertest'); const testUtils = require('../../../../utils'); -const config = require('../../../../../server/config'); +const config = require('../../../../../core/server/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/core/test/regression/api/v3/admin/posts_spec.js b/test/regression/api/v3/admin/posts_spec.js similarity index 99% rename from core/test/regression/api/v3/admin/posts_spec.js rename to test/regression/api/v3/admin/posts_spec.js index 21ebca9685..81c99163e4 100644 --- a/core/test/regression/api/v3/admin/posts_spec.js +++ b/test/regression/api/v3/admin/posts_spec.js @@ -3,8 +3,8 @@ const supertest = require('supertest'); const ObjectId = require('bson-objectid'); const moment = require('moment-timezone'); const testUtils = require('../../../../utils'); -const config = require('../../../../../server/config'); -const models = require('../../../../../server/models'); +const config = require('../../../../../core/server/config'); +const models = require('../../../../../core/server/models'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; let request; diff --git a/core/test/regression/api/v3/admin/redirects_spec.js b/test/regression/api/v3/admin/redirects_spec.js similarity index 99% rename from core/test/regression/api/v3/admin/redirects_spec.js rename to test/regression/api/v3/admin/redirects_spec.js index 9f9e4f1fbb..f24d04f651 100644 --- a/core/test/regression/api/v3/admin/redirects_spec.js +++ b/test/regression/api/v3/admin/redirects_spec.js @@ -6,7 +6,7 @@ const path = require('path'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); const configUtils = require('../../../../utils/configUtils'); -const config = require('../../../../../server/config'); +const config = require('../../../../../core/server/config'); const ghost = testUtils.startGhost; let request; diff --git a/core/test/regression/api/v3/admin/schedules_spec.js b/test/regression/api/v3/admin/schedules_spec.js similarity index 97% rename from core/test/regression/api/v3/admin/schedules_spec.js rename to test/regression/api/v3/admin/schedules_spec.js index 278b685f54..8ced262516 100644 --- a/core/test/regression/api/v3/admin/schedules_spec.js +++ b/test/regression/api/v3/admin/schedules_spec.js @@ -4,9 +4,9 @@ const supertest = require('supertest'); const Promise = require('bluebird'); const sinon = require('sinon'); const moment = require('moment-timezone'); -const SchedulingDefault = require('../../../../../server/adapters/scheduling/SchedulingDefault'); -const models = require('../../../../../server/models/index'); -const config = require('../../../../../server/config/index'); +const SchedulingDefault = require('../../../../../core/server/adapters/scheduling/SchedulingDefault'); +const models = require('../../../../../core/server/models/index'); +const config = require('../../../../../core/server/config/index'); const testUtils = require('../../../../utils/index'); const localUtils = require('./utils'); diff --git a/core/test/regression/api/v3/admin/settings_spec.js b/test/regression/api/v3/admin/settings_spec.js similarity index 99% rename from core/test/regression/api/v3/admin/settings_spec.js rename to test/regression/api/v3/admin/settings_spec.js index bc2e38b3df..06811bca67 100644 --- a/core/test/regression/api/v3/admin/settings_spec.js +++ b/test/regression/api/v3/admin/settings_spec.js @@ -1,6 +1,6 @@ const should = require('should'); const supertest = require('supertest'); -const config = require('../../../../../server/config'); +const config = require('../../../../../core/server/config'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; diff --git a/core/test/regression/api/canary/admin/slack_spec.js b/test/regression/api/v3/admin/slack_spec.js similarity index 91% rename from core/test/regression/api/canary/admin/slack_spec.js rename to test/regression/api/v3/admin/slack_spec.js index 124d9785a7..6d832085e3 100644 --- a/core/test/regression/api/canary/admin/slack_spec.js +++ b/test/regression/api/v3/admin/slack_spec.js @@ -3,8 +3,8 @@ const supertest = require('supertest'); const sinon = require('sinon'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); -const config = require('../../../../../server/config'); -const common = require('../../../../../server/lib/common'); +const config = require('../../../../../core/server/config'); +const common = require('../../../../../core/server/lib/common'); const ghost = testUtils.startGhost; let request; diff --git a/core/test/regression/api/v2/admin/users_spec.js b/test/regression/api/v3/admin/users_spec.js similarity index 99% rename from core/test/regression/api/v2/admin/users_spec.js rename to test/regression/api/v3/admin/users_spec.js index 4d468be1c2..21d5382f4c 100644 --- a/core/test/regression/api/v2/admin/users_spec.js +++ b/test/regression/api/v3/admin/users_spec.js @@ -2,7 +2,7 @@ const should = require('should'); const supertest = require('supertest'); const ObjectId = require('bson-objectid'); const testUtils = require('../../../../utils'); -const config = require('../../../../../server/config'); +const config = require('../../../../../core/server/config'); const localUtils = require('./utils'); const ghost = testUtils.startGhost; let request; diff --git a/core/test/regression/api/v3/admin/utils.js b/test/regression/api/v3/admin/utils.js similarity index 97% rename from core/test/regression/api/v3/admin/utils.js rename to test/regression/api/v3/admin/utils.js index 0e5162f3e6..b98c48483e 100644 --- a/core/test/regression/api/v3/admin/utils.js +++ b/test/regression/api/v3/admin/utils.js @@ -1,7 +1,7 @@ const url = require('url'); const _ = require('lodash'); const testUtils = require('../../../../utils'); -const schema = require('../../../../../server/data/schema').tables; +const schema = require('../../../../../core/server/data/schema').tables; const API_URL = '/ghost/api/v3/admin/'; const expectedProperties = { diff --git a/core/test/regression/api/canary/content/authors_spec.js b/test/regression/api/v3/content/authors_spec.js similarity index 95% rename from core/test/regression/api/canary/content/authors_spec.js rename to test/regression/api/v3/content/authors_spec.js index 4527f4b461..43a19db267 100644 --- a/core/test/regression/api/canary/content/authors_spec.js +++ b/test/regression/api/v3/content/authors_spec.js @@ -3,7 +3,7 @@ const supertest = require('supertest'); const localUtils = require('./utils'); const testUtils = require('../../../../utils'); const configUtils = require('../../../../utils/configUtils'); -const config = require('../../../../../server/config'); +const config = require('../../../../../core/server/config'); const ghost = testUtils.startGhost; diff --git a/core/test/regression/api/v3/content/pages_spec.js b/test/regression/api/v3/content/pages_spec.js similarity index 97% rename from core/test/regression/api/v3/content/pages_spec.js rename to test/regression/api/v3/content/pages_spec.js index 35eab57555..6aea0e2f6b 100644 --- a/core/test/regression/api/v3/content/pages_spec.js +++ b/test/regression/api/v3/content/pages_spec.js @@ -3,7 +3,7 @@ const supertest = require('supertest'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); const configUtils = require('../../../../utils/configUtils'); -const config = require('../../../../../server/config'); +const config = require('../../../../../core/server/config'); const ghost = testUtils.startGhost; let request; diff --git a/core/test/regression/api/v3/content/posts_spec.js b/test/regression/api/v3/content/posts_spec.js similarity index 99% rename from core/test/regression/api/v3/content/posts_spec.js rename to test/regression/api/v3/content/posts_spec.js index 76668138a3..9d423ddac0 100644 --- a/core/test/regression/api/v3/content/posts_spec.js +++ b/test/regression/api/v3/content/posts_spec.js @@ -3,12 +3,12 @@ const sinon = require('sinon'); const moment = require('moment'); const supertest = require('supertest'); const _ = require('lodash'); -const labs = require('../../../../../server/services/labs'); +const labs = require('../../../../../core/server/services/labs'); const testUtils = require('../../../../utils'); const localUtils = require('./utils'); const configUtils = require('../../../../utils/configUtils'); const urlUtils = require('../../../../utils/urlUtils'); -const config = require('../../../../../server/config'); +const config = require('../../../../../core/server/config'); const ghost = testUtils.startGhost; let request; diff --git a/core/test/regression/api/v3/content/tags_spec.js b/test/regression/api/v3/content/tags_spec.js similarity index 95% rename from core/test/regression/api/v3/content/tags_spec.js rename to test/regression/api/v3/content/tags_spec.js index 1410705893..fc0ca75e30 100644 --- a/core/test/regression/api/v3/content/tags_spec.js +++ b/test/regression/api/v3/content/tags_spec.js @@ -3,7 +3,7 @@ const supertest = require('supertest'); const localUtils = require('./utils'); const testUtils = require('../../../../utils'); const configUtils = require('../../../../utils/configUtils'); -const config = require('../../../../../server/config'); +const config = require('../../../../../core/server/config'); const ghost = testUtils.startGhost; let request; diff --git a/core/test/regression/api/v3/content/utils.js b/test/regression/api/v3/content/utils.js similarity index 97% rename from core/test/regression/api/v3/content/utils.js rename to test/regression/api/v3/content/utils.js index 0153b87e3a..c50d0571fa 100644 --- a/core/test/regression/api/v3/content/utils.js +++ b/test/regression/api/v3/content/utils.js @@ -1,7 +1,7 @@ const url = require('url'); const _ = require('lodash'); const testUtils = require('../../../../utils'); -const schema = require('../../../../../server/data/schema').tables; +const schema = require('../../../../../core/server/data/schema').tables; const API_URL = '/ghost/api/v3/content/'; const expectedProperties = { diff --git a/core/test/regression/exporter/exporter_spec.js b/test/regression/exporter/exporter_spec.js similarity index 90% rename from core/test/regression/exporter/exporter_spec.js rename to test/regression/exporter/exporter_spec.js index 933eafc3fb..2e24de29bd 100644 --- a/core/test/regression/exporter/exporter_spec.js +++ b/test/regression/exporter/exporter_spec.js @@ -4,8 +4,8 @@ var should = require('should'), _ = require('lodash'), // Stuff we are testing - exporter = require('../../../server/data/exporter'), - ghostVersion = require('../../../server/lib/ghost-version'); + exporter = require('../../../core/server/data/exporter'), + ghostVersion = require('../../../core/server/lib/ghost-version'); describe('Exporter', function () { before(testUtils.teardownDb); diff --git a/core/test/regression/importer/importer_spec.js b/test/regression/importer/importer_spec.js similarity index 99% rename from core/test/regression/importer/importer_spec.js rename to test/regression/importer/importer_spec.js index c5d8a85568..fdb9065aaf 100644 --- a/core/test/regression/importer/importer_spec.js +++ b/test/regression/importer/importer_spec.js @@ -9,9 +9,9 @@ var should = require('should'), validator = require('validator'), // Stuff we are testing - db = require('../../../server/data/db'), - models = require('../../../server/models'), - importer = require('../../../server/data/importer'), + db = require('../../../core/server/data/db'), + models = require('../../../core/server/models'), + importer = require('../../../core/server/data/importer'), dataImporter = importer.importers[1], importOptions = { returnImportedData: true diff --git a/core/test/regression/migrations/migration_spec.js b/test/regression/migrations/migration_spec.js similarity index 99% rename from core/test/regression/migrations/migration_spec.js rename to test/regression/migrations/migration_spec.js index baac1e659a..51e4d2e973 100644 --- a/core/test/regression/migrations/migration_spec.js +++ b/test/regression/migrations/migration_spec.js @@ -3,7 +3,7 @@ var should = require('should'), testUtils = require('../../utils'), _ = require('lodash'), Promise = require('bluebird'), - Models = require('../../../server/models'); + Models = require('../../../core/server/models'); describe('Database Migration (special functions)', function () { before(testUtils.teardownDb); diff --git a/core/test/regression/models/base/listeners_spec.js b/test/regression/models/base/listeners_spec.js similarity index 97% rename from core/test/regression/models/base/listeners_spec.js rename to test/regression/models/base/listeners_spec.js index 36b8b4912a..51ba7cae56 100644 --- a/core/test/regression/models/base/listeners_spec.js +++ b/test/regression/models/base/listeners_spec.js @@ -4,10 +4,10 @@ var should = require('should'), moment = require('moment-timezone'), rewire = require('rewire'), _ = require('lodash'), - common = require('../../../../server/lib/common'), - models = require('../../../../server/models'), - testUtils = require('../../../../test/utils'), - sequence = require('../../../../server/lib/promise/sequence'); + common = require('../../../../core/server/lib/common'), + models = require('../../../../core/server/models'), + testUtils = require('../../../utils'), + sequence = require('../../../../core/server/lib/promise/sequence'); describe('Models: listeners', function () { var eventsToRemember = {}, @@ -29,7 +29,7 @@ describe('Models: listeners', function () { eventsToRemember[eventName] = callback; }); - listeners = rewire('../../../../server/models/base/listeners'); + listeners = rewire('../../../../core/server/models/base/listeners'); }); afterEach(function () { diff --git a/core/test/regression/models/model_posts_spec.js b/test/regression/models/model_posts_spec.js similarity index 99% rename from core/test/regression/models/model_posts_spec.js rename to test/regression/models/model_posts_spec.js index 6f8dc93875..022ff230b4 100644 --- a/core/test/regression/models/model_posts_spec.js +++ b/test/regression/models/model_posts_spec.js @@ -4,12 +4,12 @@ var should = require('should'), moment = require('moment'), _ = require('lodash'), Promise = require('bluebird'), - sequence = require('../../../server/lib/promise/sequence'), - urlService = require('../../../frontend/services/url'), - ghostBookshelf = require('../../../server/models/base'), - models = require('../../../server/models'), - settingsCache = require('../../../server/services/settings/cache'), - common = require('../../../server/lib/common'), + sequence = require('../../../core/server/lib/promise/sequence'), + urlService = require('../../../core/frontend/services/url'), + ghostBookshelf = require('../../../core/server/models/base'), + models = require('../../../core/server/models'), + settingsCache = require('../../../core/server/services/settings/cache'), + common = require('../../../core/server/lib/common'), configUtils = require('../../utils/configUtils'), DataGenerator = testUtils.DataGenerator, context = testUtils.context.owner, diff --git a/core/test/regression/models/model_users_spec.js b/test/regression/models/model_users_spec.js similarity index 98% rename from core/test/regression/models/model_users_spec.js rename to test/regression/models/model_users_spec.js index 4652e977a4..722e385ced 100644 --- a/core/test/regression/models/model_users_spec.js +++ b/test/regression/models/model_users_spec.js @@ -5,10 +5,10 @@ var should = require('should'), _ = require('lodash'), // Stuff we are testing - common = require('../../../server/lib/common'), - imageLib = require('../../../server/lib/image'), - UserModel = require('../../../server/models/user').User, - RoleModel = require('../../../server/models/role').Role, + common = require('../../../core/server/lib/common'), + imageLib = require('../../../core/server/lib/image'), + UserModel = require('../../../core/server/models/user').User, + RoleModel = require('../../../core/server/models/role').Role, context = testUtils.context.admin; describe('User Model', function run() { diff --git a/core/test/regression/site/UrlService_spec.js b/test/regression/site/UrlService_spec.js similarity index 98% rename from core/test/regression/site/UrlService_spec.js rename to test/regression/site/UrlService_spec.js index 25087d4eba..398f27d61f 100644 --- a/core/test/regression/site/UrlService_spec.js +++ b/test/regression/site/UrlService_spec.js @@ -4,10 +4,10 @@ const sinon = require('sinon'); const rewire = require('rewire'); const testUtils = require('../../utils'); const configUtils = require('../../utils/configUtils'); -const models = require('../../../server/models'); -const common = require('../../../server/lib/common'); -const themes = require('../../../frontend/services/themes'); -const UrlService = rewire('../../../frontend/services/url/UrlService'); +const models = require('../../../core/server/models'); +const common = require('../../../core/server/lib/common'); +const themes = require('../../../core/frontend/services/themes'); +const UrlService = rewire('../../../core/frontend/services/url/UrlService'); describe('Integration: services/url/UrlService', function () { let urlService; diff --git a/core/test/regression/site/dynamic_routing_spec.js b/test/regression/site/dynamic_routing_spec.js similarity index 99% rename from core/test/regression/site/dynamic_routing_spec.js rename to test/regression/site/dynamic_routing_spec.js index 75a52cff58..906dab880f 100644 --- a/core/test/regression/site/dynamic_routing_spec.js +++ b/test/regression/site/dynamic_routing_spec.js @@ -10,9 +10,9 @@ const path = require('path'); const testUtils = require('../../utils'); const configUtils = require('../../utils/configUtils'); const cheerio = require('cheerio'); -const config = require('../../../server/config'); -const api = require('../../../server/api'); -const settingsCache = require('../../../server/services/settings/cache'); +const config = require('../../../core/server/config'); +const api = require('../../../core/server/api'); +const settingsCache = require('../../../core/server/services/settings/cache'); const ghost = testUtils.startGhost; let request; @@ -724,7 +724,7 @@ describe('Dynamic Routing', function () { return api.settings.upload.query({ context: testUtils.context.internal.context, file: { - path: path.join(config.get('paths:appRoot'), 'core', 'test', 'utils', 'fixtures', 'settings', 'newroutes.yaml') + path: path.join(config.get('paths:appRoot'), 'test', 'utils', 'fixtures', 'settings', 'newroutes.yaml') } }).then(() => { return testUtils.integrationTesting.urlService.waitTillFinished({dbIsReady: true}); diff --git a/core/test/regression/site/frontend_spec.js b/test/regression/site/frontend_spec.js similarity index 99% rename from core/test/regression/site/frontend_spec.js rename to test/regression/site/frontend_spec.js index ae04fb6710..b2587dba3c 100644 --- a/core/test/regression/site/frontend_spec.js +++ b/test/regression/site/frontend_spec.js @@ -11,8 +11,8 @@ var should = require('should'), testUtils = require('../../utils'), configUtils = require('../../utils/configUtils'), urlUtils = require('../../utils/urlUtils'), - config = require('../../../server/config'), - settingsCache = require('../../../server/services/settings/cache'), + config = require('../../../core/server/config'), + settingsCache = require('../../../core/server/services/settings/cache'), origCache = _.cloneDeep(settingsCache), ghost = testUtils.startGhost, request; diff --git a/core/test/regression/site/members_spec.js b/test/regression/site/members_spec.js similarity index 97% rename from core/test/regression/site/members_spec.js rename to test/regression/site/members_spec.js index 5c976e00bf..d7254bf39b 100644 --- a/core/test/regression/site/members_spec.js +++ b/test/regression/site/members_spec.js @@ -3,7 +3,7 @@ const sinon = require('sinon'); const supertest = require('supertest'); const testUtils = require('../../utils'); const configUtils = require('../../utils/configUtils'); -const settingsCache = require('../../../server/services/settings/cache'); +const settingsCache = require('../../../core/server/services/settings/cache'); const ghost = testUtils.startGhost; diff --git a/core/test/regression/site/site_spec.js b/test/regression/site/site_spec.js similarity index 99% rename from core/test/regression/site/site_spec.js rename to test/regression/site/site_spec.js index eb8f7ef16f..339dd7de60 100644 --- a/core/test/regression/site/site_spec.js +++ b/test/regression/site/site_spec.js @@ -6,10 +6,10 @@ const should = require('should'), mockUtils = require('../../utils/mocks'), configUtils = require('../../utils/configUtils'), urlUtils = require('../../utils/urlUtils'), - appService = require('../../../frontend/services/apps'), - frontendSettingsService = require('../../../frontend/services/settings'), - themeService = require('../../../frontend/services/themes'), - siteApp = require('../../../server/web/parent-app'); + appService = require('../../../core/frontend/services/apps'), + frontendSettingsService = require('../../../core/frontend/services/settings'), + themeService = require('../../../core/frontend/services/themes'), + siteApp = require('../../../core/server/web/parent-app'); describe('Integration - Web - Site', function () { let app; @@ -46,7 +46,7 @@ describe('Integration - Web - Site', function () { }); beforeEach(function () { - const postsAPI = require('../../../server/api/v2/posts-public'); + const postsAPI = require('../../../core/server/api/v2/posts-public'); postSpy = sinon.spy(postsAPI.browse, 'query'); }); @@ -1744,7 +1744,7 @@ describe('Integration - Web - Site', function () { }); beforeEach(function () { - const postsAPI = require('../../../server/api/canary/posts-public'); + const postsAPI = require('../../../core/server/api/canary/posts-public'); postSpy = sinon.spy(postsAPI.browse, 'query'); }); @@ -3444,7 +3444,7 @@ describe('Integration - Web - Site', function () { }); beforeEach(function () { - const postsAPI = require('../../../server/api/canary/posts-public'); + const postsAPI = require('../../../core/server/api/canary/posts-public'); postSpy = sinon.spy(postsAPI.browse, 'query'); }); diff --git a/core/test/regression/update-check/update_check_spec.js b/test/regression/update-check/update_check_spec.js similarity index 98% rename from core/test/regression/update-check/update_check_spec.js rename to test/regression/update-check/update_check_spec.js index ee2a36d9b5..170c4878b5 100644 --- a/core/test/regression/update-check/update_check_spec.js +++ b/test/regression/update-check/update_check_spec.js @@ -7,16 +7,16 @@ const moment = require('moment'); const uuid = require('uuid'); const testUtils = require('../../utils'); const configUtils = require('../../utils/configUtils'); -const packageInfo = require('../../../../package'); -const api = require('../../../server/api').v2; +const packageInfo = require('../../../package.json'); +const api = require('../../../core/server/api').v2; -let updateCheck = rewire('../../../server/update-check'); -let NotificationsAPI = rewire('../../../server/api/v2/notifications'); +let updateCheck = rewire('../../../core/server/update-check'); +let NotificationsAPI = rewire('../../../core/server/api/v2/notifications'); describe('Update Check', function () { beforeEach(function () { - updateCheck = rewire('../../../server/update-check'); - NotificationsAPI = rewire('../../../server/api/v2/notifications'); + updateCheck = rewire('../../../core/server/update-check'); + NotificationsAPI = rewire('../../../core/server/api/v2/notifications'); }); afterEach(function () { @@ -704,4 +704,3 @@ describe('Update Check', function () { }); }); }); - diff --git a/core/test/unit/adapters/scheduling/SchedulingDefault_spec.js b/test/unit/adapters/scheduling/SchedulingDefault_spec.js similarity index 98% rename from core/test/unit/adapters/scheduling/SchedulingDefault_spec.js rename to test/unit/adapters/scheduling/SchedulingDefault_spec.js index 32729a28ca..4aeb51c380 100644 --- a/core/test/unit/adapters/scheduling/SchedulingDefault_spec.js +++ b/test/unit/adapters/scheduling/SchedulingDefault_spec.js @@ -1,12 +1,11 @@ var should = require('should'), sinon = require('sinon'), - config = require(__dirname + '/../../../../server/config'), moment = require('moment'), _ = require('lodash'), express = require('express'), bodyParser = require('body-parser'), http = require('http'), - SchedulingDefault = require(config.get('paths').corePath + '/server/adapters/scheduling/SchedulingDefault'); + SchedulingDefault = require('../../../../core/server/adapters/scheduling/SchedulingDefault'); describe('Scheduling Default Adapter', function () { var scope = {}; diff --git a/core/test/unit/adapters/scheduling/index_spec.js b/test/unit/adapters/scheduling/index_spec.js similarity index 72% rename from core/test/unit/adapters/scheduling/index_spec.js rename to test/unit/adapters/scheduling/index_spec.js index f9d0a50b7d..65ebeee309 100644 --- a/core/test/unit/adapters/scheduling/index_spec.js +++ b/test/unit/adapters/scheduling/index_spec.js @@ -2,15 +2,14 @@ var should = require('should'), sinon = require('sinon'), rewire = require('rewire'), Promise = require('bluebird'), - config = require(__dirname + '/../../../../server/config'), - postScheduling = require(__dirname + '/../../../../server/adapters/scheduling/post-scheduling'); + postScheduling = require('../../../../core/server/adapters/scheduling/post-scheduling'); describe('Scheduling', function () { var scope = {}; before(function () { sinon.stub(postScheduling, 'init').returns(Promise.resolve()); - scope.scheduling = rewire(config.get('paths').corePath + '/server/adapters/scheduling'); + scope.scheduling = rewire('../../../../core/server/adapters/scheduling'); }); after(function () { diff --git a/core/test/unit/adapters/scheduling/post-scheduling/index_spec.js b/test/unit/adapters/scheduling/post-scheduling/index_spec.js similarity index 87% rename from core/test/unit/adapters/scheduling/post-scheduling/index_spec.js rename to test/unit/adapters/scheduling/post-scheduling/index_spec.js index 2631276fac..55d1e72fb2 100644 --- a/core/test/unit/adapters/scheduling/post-scheduling/index_spec.js +++ b/test/unit/adapters/scheduling/post-scheduling/index_spec.js @@ -3,13 +3,13 @@ var should = require('should'), Promise = require('bluebird'), moment = require('moment'), testUtils = require('../../../../utils'), - common = require('../../../../../server/lib/common'), - models = require('../../../../../server/models'), - api = require('../../../../../server/api'), - schedulingUtils = require('../../../../../server/adapters/scheduling/utils'), - SchedulingDefault = require('../../../../../server/adapters/scheduling/SchedulingDefault'), - postScheduling = require('../../../../../server/adapters/scheduling/post-scheduling'), - urlUtils = require('../../../../../server/lib/url-utils'); + common = require('../../../../../core/server/lib/common'), + models = require('../../../../../core/server/models'), + api = require('../../../../../core/server/api'), + schedulingUtils = require('../../../../../core/server/adapters/scheduling/utils'), + SchedulingDefault = require('../../../../../core/server/adapters/scheduling/SchedulingDefault'), + postScheduling = require('../../../../../core/server/adapters/scheduling/post-scheduling'), + urlUtils = require('../../../../../core/server/lib/url-utils'); // NOTE: to be unskiped and corrected once default scheduler code is migrated describe.skip('Scheduling: Post Scheduling', function () { diff --git a/core/test/unit/adapters/scheduling/utils_spec.js b/test/unit/adapters/scheduling/utils_spec.js similarity index 87% rename from core/test/unit/adapters/scheduling/utils_spec.js rename to test/unit/adapters/scheduling/utils_spec.js index a334f05488..278663eec7 100644 --- a/core/test/unit/adapters/scheduling/utils_spec.js +++ b/test/unit/adapters/scheduling/utils_spec.js @@ -1,14 +1,14 @@ var should = require('should'), fs = require('fs-extra'), - config = require('../../../../server/config'), - common = require('../../../../server/lib/common'), - schedulingUtils = require('../../../../server/adapters/scheduling/utils'); + config = require('../../../../core/server/config'), + common = require('../../../../core/server/lib/common'), + schedulingUtils = require('../../../../core/server/adapters/scheduling/utils'); describe('Scheduling: utils', function () { describe('success', function () { it('create good adapter', function (done) { schedulingUtils.createAdapter({ - active: __dirname + '/../../../../server/adapters/scheduling/SchedulingDefault' + active: __dirname + '/../../../../core/server/adapters/scheduling/SchedulingDefault' }).then(function (adapter) { should.exist(adapter); done(); @@ -18,7 +18,7 @@ describe('Scheduling: utils', function () { it('create good adapter', function (done) { var jsFile = '' + 'var util = require(\'util\');' + - 'var SchedulingBase = require(__dirname + \'/../../../../server/adapters/scheduling/SchedulingBase\');' + + 'var SchedulingBase = require(__dirname + \'/../../../../core/server/adapters/scheduling/SchedulingBase\');' + 'var AnotherAdapter = function (){ SchedulingBase.call(this); };' + 'util.inherits(AnotherAdapter, SchedulingBase);' + 'AnotherAdapter.prototype.run = function (){};' + @@ -62,7 +62,7 @@ describe('Scheduling: utils', function () { it('create with adapter, but missing fn\'s', function (done) { var jsFile = '' + 'var util = require(\'util\');' + - 'var SchedulingBase = require(__dirname + \'/../../../../server/adapters/scheduling/SchedulingBase\');' + + 'var SchedulingBase = require(__dirname + \'/../../../../core/server/adapters/scheduling/SchedulingBase\');' + 'var BadAdapter = function (){ SchedulingBase.call(this); };' + 'util.inherits(BadAdapter, SchedulingBase);' + 'BadAdapter.prototype.schedule = function (){};' + diff --git a/core/test/unit/adapters/storage/LocalFileStorage_spec.js b/test/unit/adapters/storage/LocalFileStorage_spec.js similarity index 98% rename from core/test/unit/adapters/storage/LocalFileStorage_spec.js rename to test/unit/adapters/storage/LocalFileStorage_spec.js index bb63e74cc1..fbff030d24 100644 --- a/core/test/unit/adapters/storage/LocalFileStorage_spec.js +++ b/test/unit/adapters/storage/LocalFileStorage_spec.js @@ -4,8 +4,8 @@ var should = require('should'), moment = require('moment'), Promise = require('bluebird'), path = require('path'), - common = require('../../../../server/lib/common'), - LocalFileStore = require('../../../../server/adapters/storage/LocalFileStorage'), + common = require('../../../../core/server/lib/common'), + LocalFileStore = require('../../../../core/server/adapters/storage/LocalFileStorage'), localFileStore, configUtils = require('../../../utils/configUtils'); diff --git a/core/test/unit/adapters/storage/index_spec.js b/test/unit/adapters/storage/index_spec.js similarity index 92% rename from core/test/unit/adapters/storage/index_spec.js rename to test/unit/adapters/storage/index_spec.js index 2d1a5c65fc..9722cf4644 100644 --- a/core/test/unit/adapters/storage/index_spec.js +++ b/test/unit/adapters/storage/index_spec.js @@ -2,9 +2,9 @@ var should = require('should'), fs = require('fs-extra'), StorageBase = require('ghost-storage-base'), configUtils = require('../../../utils/configUtils'), - storage = require('../../../../server/adapters/storage'), - common = require('../../../../server/lib/common'), - LocalFileStorage = require('../../../../server/adapters/storage/LocalFileStorage'); + storage = require('../../../../core/server/adapters/storage'), + common = require('../../../../core/server/lib/common'), + LocalFileStorage = require('../../../../core/server/adapters/storage/LocalFileStorage'); describe('storage: index_spec', function () { var scope = {adapter: null}; diff --git a/core/test/unit/adapters/storage/utils_spec.js b/test/unit/adapters/storage/utils_spec.js similarity index 98% rename from core/test/unit/adapters/storage/utils_spec.js rename to test/unit/adapters/storage/utils_spec.js index 21a757e7ff..acd67419ec 100644 --- a/core/test/unit/adapters/storage/utils_spec.js +++ b/test/unit/adapters/storage/utils_spec.js @@ -1,9 +1,9 @@ var should = require('should'), sinon = require('sinon'), - urlUtils = require('../../../../server/lib/url-utils'), + urlUtils = require('../../../../core/server/lib/url-utils'), // Stuff we are testing - storageUtils = require('../../../../server/adapters/storage/utils'); + storageUtils = require('../../../../core/server/adapters/storage/utils'); describe('storage utils', function () { var urlForStub, diff --git a/core/test/unit/api/canary/session_spec.js b/test/unit/api/canary/session_spec.js similarity index 94% rename from core/test/unit/api/canary/session_spec.js rename to test/unit/api/canary/session_spec.js index dc1624f57c..cb63444b5a 100644 --- a/core/test/unit/api/canary/session_spec.js +++ b/test/unit/api/canary/session_spec.js @@ -1,11 +1,11 @@ const should = require('should'); const sinon = require('sinon'); -const models = require('../../../../server/models'); -const {UnauthorizedError} = require('../../../../server/lib/common/errors'); +const models = require('../../../../core/server/models'); +const {UnauthorizedError} = require('../../../../core/server/lib/common/errors'); -const sessionController = require('../../../../server/api/canary/session'); -const sessionServiceMiddleware = require('../../../../server/services/auth/session/middleware'); +const sessionController = require('../../../../core/server/api/canary/session'); +const sessionServiceMiddleware = require('../../../../core/server/services/auth/session/middleware'); describe('Session controller', function () { before(function () { diff --git a/core/test/unit/api/canary/utils/index_spec.js b/test/unit/api/canary/utils/index_spec.js similarity index 91% rename from core/test/unit/api/canary/utils/index_spec.js rename to test/unit/api/canary/utils/index_spec.js index f877e222b9..041dedb157 100644 --- a/core/test/unit/api/canary/utils/index_spec.js +++ b/test/unit/api/canary/utils/index_spec.js @@ -1,6 +1,6 @@ const should = require('should'); const sinon = require('sinon'); -const utils = require('../../../../../server/api/canary/utils'); +const utils = require('../../../../../core/server/api/canary/utils'); describe('Unit: canary/utils/index', function () { afterEach(function () { diff --git a/core/test/unit/api/canary/utils/serializers/input/integrations_spec.js b/test/unit/api/canary/utils/serializers/input/integrations_spec.js similarity index 94% rename from core/test/unit/api/canary/utils/serializers/input/integrations_spec.js rename to test/unit/api/canary/utils/serializers/input/integrations_spec.js index 9e23cb429b..4757b32402 100644 --- a/core/test/unit/api/canary/utils/serializers/input/integrations_spec.js +++ b/test/unit/api/canary/utils/serializers/input/integrations_spec.js @@ -1,5 +1,5 @@ const should = require('should'); -const serializers = require('../../../../../../../server/api/canary/utils/serializers'); +const serializers = require('../../../../../../../core/server/api/canary/utils/serializers'); describe('Unit: canary/utils/serializers/input/pages', function () { describe('browse', function () { diff --git a/core/test/unit/api/canary/utils/serializers/input/pages_spec.js b/test/unit/api/canary/utils/serializers/input/pages_spec.js similarity index 98% rename from core/test/unit/api/canary/utils/serializers/input/pages_spec.js rename to test/unit/api/canary/utils/serializers/input/pages_spec.js index ba4ff130b4..d239936bcb 100644 --- a/core/test/unit/api/canary/utils/serializers/input/pages_spec.js +++ b/test/unit/api/canary/utils/serializers/input/pages_spec.js @@ -1,5 +1,5 @@ const should = require('should'); -const serializers = require('../../../../../../../server/api/canary/utils/serializers'); +const serializers = require('../../../../../../../core/server/api/canary/utils/serializers'); describe('Unit: canary/utils/serializers/input/pages', function () { describe('browse', function () { diff --git a/core/test/unit/api/canary/utils/serializers/input/posts_spec.js b/test/unit/api/canary/utils/serializers/input/posts_spec.js similarity index 99% rename from core/test/unit/api/canary/utils/serializers/input/posts_spec.js rename to test/unit/api/canary/utils/serializers/input/posts_spec.js index 1318af219e..985c651ef2 100644 --- a/core/test/unit/api/canary/utils/serializers/input/posts_spec.js +++ b/test/unit/api/canary/utils/serializers/input/posts_spec.js @@ -1,6 +1,6 @@ const should = require('should'); const sinon = require('sinon'); -const serializers = require('../../../../../../../server/api/canary/utils/serializers'); +const serializers = require('../../../../../../../core/server/api/canary/utils/serializers'); const urlUtils = require('../../../../../../utils/urlUtils'); describe('Unit: canary/utils/serializers/input/posts', function () { diff --git a/core/test/unit/api/canary/utils/serializers/output/all_spec.js b/test/unit/api/canary/utils/serializers/output/all_spec.js similarity index 95% rename from core/test/unit/api/canary/utils/serializers/output/all_spec.js rename to test/unit/api/canary/utils/serializers/output/all_spec.js index 2dadf27c18..6766c196bd 100644 --- a/core/test/unit/api/canary/utils/serializers/output/all_spec.js +++ b/test/unit/api/canary/utils/serializers/output/all_spec.js @@ -1,5 +1,5 @@ const should = require('should'); -const serializers = require('../../../../../../../server/api/canary/utils/serializers'); +const serializers = require('../../../../../../../core/server/api/canary/utils/serializers'); describe('Unit: canary/utils/serializers/output/all', function () { describe('after', function () { diff --git a/core/test/unit/api/canary/utils/serializers/output/pages_spec.js b/test/unit/api/canary/utils/serializers/output/pages_spec.js similarity index 87% rename from core/test/unit/api/canary/utils/serializers/output/pages_spec.js rename to test/unit/api/canary/utils/serializers/output/pages_spec.js index d80fcd152a..85d9be4395 100644 --- a/core/test/unit/api/canary/utils/serializers/output/pages_spec.js +++ b/test/unit/api/canary/utils/serializers/output/pages_spec.js @@ -1,8 +1,8 @@ const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../../../../../utils'); -const mapper = require('../../../../../../../server/api/canary/utils/serializers/output/utils/mapper'); -const serializers = require('../../../../../../../server/api/canary/utils/serializers'); +const mapper = require('../../../../../../../core/server/api/canary/utils/serializers/output/utils/mapper'); +const serializers = require('../../../../../../../core/server/api/canary/utils/serializers'); describe('Unit: canary/utils/serializers/output/pages', function () { let pageModel; diff --git a/core/test/unit/api/canary/utils/serializers/output/posts_spec.js b/test/unit/api/canary/utils/serializers/output/posts_spec.js similarity index 85% rename from core/test/unit/api/canary/utils/serializers/output/posts_spec.js rename to test/unit/api/canary/utils/serializers/output/posts_spec.js index 1c38122f9c..b090001245 100644 --- a/core/test/unit/api/canary/utils/serializers/output/posts_spec.js +++ b/test/unit/api/canary/utils/serializers/output/posts_spec.js @@ -1,8 +1,8 @@ const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../../../../../utils'); -const mapper = require('../../../../../../../server/api/canary/utils/serializers/output/utils/mapper'); -const serializers = require('../../../../../../../server/api/canary/utils/serializers'); +const mapper = require('../../../../../../../core/server/api/canary/utils/serializers/output/utils/mapper'); +const serializers = require('../../../../../../../core/server/api/canary/utils/serializers'); describe('Unit: canary/utils/serializers/output/posts', function () { let postModel; diff --git a/core/test/unit/api/canary/utils/serializers/output/tags_spec.js b/test/unit/api/canary/utils/serializers/output/tags_spec.js similarity index 88% rename from core/test/unit/api/canary/utils/serializers/output/tags_spec.js rename to test/unit/api/canary/utils/serializers/output/tags_spec.js index e0dca83337..61bfd5392c 100644 --- a/core/test/unit/api/canary/utils/serializers/output/tags_spec.js +++ b/test/unit/api/canary/utils/serializers/output/tags_spec.js @@ -1,8 +1,8 @@ const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../../../../../utils'); -const mapper = require('../../../../../../../server/api/canary/utils/serializers/output/utils/mapper'); -const serializers = require('../../../../../../../server/api/canary/utils/serializers'); +const mapper = require('../../../../../../../core/server/api/canary/utils/serializers/output/utils/mapper'); +const serializers = require('../../../../../../../core/server/api/canary/utils/serializers'); describe('Unit: canary/utils/serializers/output/tags', function () { let tagModel; diff --git a/core/test/unit/api/canary/utils/serializers/output/utils/date_spec.js b/test/unit/api/canary/utils/serializers/output/utils/date_spec.js similarity index 79% rename from core/test/unit/api/canary/utils/serializers/output/utils/date_spec.js rename to test/unit/api/canary/utils/serializers/output/utils/date_spec.js index 1fd479c693..f22158cff0 100644 --- a/core/test/unit/api/canary/utils/serializers/output/utils/date_spec.js +++ b/test/unit/api/canary/utils/serializers/output/utils/date_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const sinon = require('sinon'); -const settingsCache = require('../../../../../../../../server/services/settings/cache'); -const dateUtil = require('../../../../../../../../server/api/canary/utils/serializers/output/utils/date'); +const settingsCache = require('../../../../../../../../core/server/services/settings/cache'); +const dateUtil = require('../../../../../../../../core/server/api/canary/utils/serializers/output/utils/date'); describe('Unit: canary/utils/serializers/output/utils/date', function () { afterEach(function () { diff --git a/core/test/unit/api/canary/utils/serializers/output/utils/extra-attrs_spec.js b/test/unit/api/canary/utils/serializers/output/utils/extra-attrs_spec.js similarity index 91% rename from core/test/unit/api/canary/utils/serializers/output/utils/extra-attrs_spec.js rename to test/unit/api/canary/utils/serializers/output/utils/extra-attrs_spec.js index 28ddcb94cd..4e5dd7ccda 100644 --- a/core/test/unit/api/canary/utils/serializers/output/utils/extra-attrs_spec.js +++ b/test/unit/api/canary/utils/serializers/output/utils/extra-attrs_spec.js @@ -1,6 +1,6 @@ const should = require('should'); const sinon = require('sinon'); -const extraAttrsUtil = require('../../../../../../../../server/api/canary/utils/serializers/output/utils/extra-attrs'); +const extraAttrsUtil = require('../../../../../../../../core/server/api/canary/utils/serializers/output/utils/extra-attrs'); describe('Unit: canary/utils/serializers/output/utils/extra-attrs', function () { const frame = { diff --git a/core/test/unit/api/canary/utils/serializers/output/utils/mapper_spec.js b/test/unit/api/canary/utils/serializers/output/utils/mapper_spec.js similarity index 89% rename from core/test/unit/api/canary/utils/serializers/output/utils/mapper_spec.js rename to test/unit/api/canary/utils/serializers/output/utils/mapper_spec.js index caf5043c17..35d63cadf0 100644 --- a/core/test/unit/api/canary/utils/serializers/output/utils/mapper_spec.js +++ b/test/unit/api/canary/utils/serializers/output/utils/mapper_spec.js @@ -1,11 +1,11 @@ const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../../../../../../utils'); -const dateUtil = require('../../../../../../../../server/api/canary/utils/serializers/output/utils/date'); -const urlUtil = require('../../../../../../../../server/api/canary/utils/serializers/output/utils/url'); -const cleanUtil = require('../../../../../../../../server/api/canary/utils/serializers/output/utils/clean'); -const extraAttrsUtils = require('../../../../../../../../server/api/canary/utils/serializers/output/utils/extra-attrs'); -const mapper = require('../../../../../../../../server/api/canary/utils/serializers/output/utils/mapper'); +const dateUtil = require('../../../../../../../../core/server/api/canary/utils/serializers/output/utils/date'); +const urlUtil = require('../../../../../../../../core/server/api/canary/utils/serializers/output/utils/url'); +const cleanUtil = require('../../../../../../../../core/server/api/canary/utils/serializers/output/utils/clean'); +const extraAttrsUtils = require('../../../../../../../../core/server/api/canary/utils/serializers/output/utils/extra-attrs'); +const mapper = require('../../../../../../../../core/server/api/canary/utils/serializers/output/utils/mapper'); describe('Unit: canary/utils/serializers/output/utils/mapper', function () { beforeEach(function () { diff --git a/core/test/unit/api/canary/utils/serializers/output/utils/post-gating_spec.js b/test/unit/api/canary/utils/serializers/output/utils/post-gating_spec.js similarity index 95% rename from core/test/unit/api/canary/utils/serializers/output/utils/post-gating_spec.js rename to test/unit/api/canary/utils/serializers/output/utils/post-gating_spec.js index f86eef4b1e..2aa77bb7d0 100644 --- a/core/test/unit/api/canary/utils/serializers/output/utils/post-gating_spec.js +++ b/test/unit/api/canary/utils/serializers/output/utils/post-gating_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const sinon = require('sinon'); -const labs = require('../../../../../../../../server/services/labs'); -const gating = require('../../../../../../../../server/api/canary/utils/serializers/output/utils/post-gating'); +const labs = require('../../../../../../../../core/server/services/labs'); +const gating = require('../../../../../../../../core/server/api/canary/utils/serializers/output/utils/post-gating'); describe('Unit: canary/utils/serializers/output/utils/post-gating', function () { describe('for post', function () { diff --git a/core/test/unit/api/canary/utils/serializers/output/utils/url_spec.js b/test/unit/api/canary/utils/serializers/output/utils/url_spec.js similarity index 89% rename from core/test/unit/api/canary/utils/serializers/output/utils/url_spec.js rename to test/unit/api/canary/utils/serializers/output/utils/url_spec.js index 3078ab416d..98458739dc 100644 --- a/core/test/unit/api/canary/utils/serializers/output/utils/url_spec.js +++ b/test/unit/api/canary/utils/serializers/output/utils/url_spec.js @@ -1,9 +1,9 @@ const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../../../../../../utils'); -const urlService = require('../../../../../../../../frontend/services/url'); -const urlUtils = require('../../../../../../../../server/lib/url-utils'); -const urlUtil = require('../../../../../../../../server/api/canary/utils/serializers/output/utils/url'); +const urlService = require('../../../../../../../../core/frontend/services/url'); +const urlUtils = require('../../../../../../../../core/server/lib/url-utils'); +const urlUtil = require('../../../../../../../../core/server/api/canary/utils/serializers/output/utils/url'); describe('Unit: canary/utils/serializers/output/utils/url', function () { beforeEach(function () { diff --git a/core/test/unit/api/canary/utils/validators/input/pages_spec.js b/test/unit/api/canary/utils/validators/input/pages_spec.js similarity index 98% rename from core/test/unit/api/canary/utils/validators/input/pages_spec.js rename to test/unit/api/canary/utils/validators/input/pages_spec.js index 04f5d4e2f3..218075c128 100644 --- a/core/test/unit/api/canary/utils/validators/input/pages_spec.js +++ b/test/unit/api/canary/utils/validators/input/pages_spec.js @@ -2,8 +2,8 @@ const _ = require('lodash'); const should = require('should'); const sinon = require('sinon'); const Promise = require('bluebird'); -const common = require('../../../../../../../server/lib/common'); -const validators = require('../../../../../../../server/api/canary/utils/validators'); +const common = require('../../../../../../../core/server/lib/common'); +const validators = require('../../../../../../../core/server/api/canary/utils/validators'); describe('Unit: canary/utils/validators/input/pages', function () { afterEach(function () { diff --git a/core/test/unit/api/canary/utils/validators/input/posts_spec.js b/test/unit/api/canary/utils/validators/input/posts_spec.js similarity index 98% rename from core/test/unit/api/canary/utils/validators/input/posts_spec.js rename to test/unit/api/canary/utils/validators/input/posts_spec.js index 56e269bd10..335b28f28c 100644 --- a/core/test/unit/api/canary/utils/validators/input/posts_spec.js +++ b/test/unit/api/canary/utils/validators/input/posts_spec.js @@ -2,8 +2,8 @@ const _ = require('lodash'); const should = require('should'); const sinon = require('sinon'); const Promise = require('bluebird'); -const common = require('../../../../../../../server/lib/common'); -const validators = require('../../../../../../../server/api/canary/utils/validators'); +const common = require('../../../../../../../core/server/lib/common'); +const validators = require('../../../../../../../core/server/api/canary/utils/validators'); describe('Unit: canary/utils/validators/input/posts', function () { afterEach(function () { diff --git a/core/test/unit/api/canary/utils/validators/input/tags_spec.js b/test/unit/api/canary/utils/validators/input/tags_spec.js similarity index 98% rename from core/test/unit/api/canary/utils/validators/input/tags_spec.js rename to test/unit/api/canary/utils/validators/input/tags_spec.js index 1d90230b31..dfd577e099 100644 --- a/core/test/unit/api/canary/utils/validators/input/tags_spec.js +++ b/test/unit/api/canary/utils/validators/input/tags_spec.js @@ -2,8 +2,8 @@ const _ = require('lodash'); const should = require('should'); const sinon = require('sinon'); const Promise = require('bluebird'); -const common = require('../../../../../../../server/lib/common'); -const validators = require('../../../../../../../server/api/canary/utils/validators'); +const common = require('../../../../../../../core/server/lib/common'); +const validators = require('../../../../../../../core/server/api/canary/utils/validators'); describe('Unit: canary/utils/validators/input/tags', function () { afterEach(function () { diff --git a/core/test/unit/api/shared/frame_spec.js b/test/unit/api/shared/frame_spec.js similarity index 97% rename from core/test/unit/api/shared/frame_spec.js rename to test/unit/api/shared/frame_spec.js index 1d79de9ee0..70bf6b4df0 100644 --- a/core/test/unit/api/shared/frame_spec.js +++ b/test/unit/api/shared/frame_spec.js @@ -1,5 +1,5 @@ const should = require('should'); -const shared = require('../../../../server/api/shared'); +const shared = require('../../../../core/server/api/shared'); describe('Unit: api/shared/frame', function () { it('constructor', function () { diff --git a/core/test/unit/api/shared/headers_spec.js b/test/unit/api/shared/headers_spec.js similarity index 97% rename from core/test/unit/api/shared/headers_spec.js rename to test/unit/api/shared/headers_spec.js index 0ab96b3370..a2323aee5d 100644 --- a/core/test/unit/api/shared/headers_spec.js +++ b/test/unit/api/shared/headers_spec.js @@ -1,5 +1,5 @@ const should = require('should'); -const shared = require('../../../../server/api/shared'); +const shared = require('../../../../core/server/api/shared'); describe('Unit: api/shared/headers', function () { it('empty headers config', function () { diff --git a/core/test/unit/api/shared/http_spec.js b/test/unit/api/shared/http_spec.js similarity index 97% rename from core/test/unit/api/shared/http_spec.js rename to test/unit/api/shared/http_spec.js index e2b9d0b0ce..d12c4828f6 100644 --- a/core/test/unit/api/shared/http_spec.js +++ b/test/unit/api/shared/http_spec.js @@ -1,6 +1,6 @@ const should = require('should'); const sinon = require('sinon'); -const shared = require('../../../../server/api/shared'); +const shared = require('../../../../core/server/api/shared'); describe('Unit: api/shared/http', function () { let req; diff --git a/core/test/unit/api/shared/pipeline_spec.js b/test/unit/api/shared/pipeline_spec.js similarity index 98% rename from core/test/unit/api/shared/pipeline_spec.js rename to test/unit/api/shared/pipeline_spec.js index 196944816e..920e59285f 100644 --- a/core/test/unit/api/shared/pipeline_spec.js +++ b/test/unit/api/shared/pipeline_spec.js @@ -1,8 +1,8 @@ const should = require('should'); const sinon = require('sinon'); const Promise = require('bluebird'); -const common = require('../../../../server/lib/common'); -const shared = require('../../../../server/api/shared'); +const common = require('../../../../core/server/lib/common'); +const shared = require('../../../../core/server/api/shared'); describe('Unit: api/shared/pipeline', function () { afterEach(function () { diff --git a/core/test/unit/api/shared/serializers/handle_spec.js b/test/unit/api/shared/serializers/handle_spec.js similarity index 96% rename from core/test/unit/api/shared/serializers/handle_spec.js rename to test/unit/api/shared/serializers/handle_spec.js index f7e61e823c..57d76ff318 100644 --- a/core/test/unit/api/shared/serializers/handle_spec.js +++ b/test/unit/api/shared/serializers/handle_spec.js @@ -1,8 +1,8 @@ const should = require('should'); const Promise = require('bluebird'); const sinon = require('sinon'); -const common = require('../../../../../server/lib/common'); -const shared = require('../../../../../server/api/shared'); +const common = require('../../../../../core/server/lib/common'); +const shared = require('../../../../../core/server/api/shared'); describe('Unit: api/shared/serializers/handle', function () { beforeEach(function () { diff --git a/core/test/unit/api/shared/serializers/input/all_spec.js b/test/unit/api/shared/serializers/input/all_spec.js similarity index 97% rename from core/test/unit/api/shared/serializers/input/all_spec.js rename to test/unit/api/shared/serializers/input/all_spec.js index e80df14eec..63aad2d48f 100644 --- a/core/test/unit/api/shared/serializers/input/all_spec.js +++ b/test/unit/api/shared/serializers/input/all_spec.js @@ -1,5 +1,5 @@ const should = require('should'); -const shared = require('../../../../../../server/api/shared'); +const shared = require('../../../../../../core/server/api/shared'); describe('Unit: v2/utils/serializers/input/all', function () { describe('all', function () { diff --git a/core/test/unit/api/shared/serializers/input/utils/url_spec.js b/test/unit/api/shared/serializers/input/utils/url_spec.js similarity index 69% rename from core/test/unit/api/shared/serializers/input/utils/url_spec.js rename to test/unit/api/shared/serializers/input/utils/url_spec.js index bafbd960a0..7651bdaeae 100644 --- a/core/test/unit/api/shared/serializers/input/utils/url_spec.js +++ b/test/unit/api/shared/serializers/input/utils/url_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const sinon = require('sinon'); -const urlUtils = require('../../../../../../../server/lib/url-utils'); -const url = require('../../../../../../../server/api/v2/utils/serializers/input/utils/url'); +const urlUtils = require('../../../../../../../core/server/lib/url-utils'); +const url = require('../../../../../../../core/server/api/v2/utils/serializers/input/utils/url'); describe('Unit: v2/utils/serializers/input/utils/url', function () { describe('forPost', function () { diff --git a/core/test/unit/api/shared/util/options_spec.js b/test/unit/api/shared/util/options_spec.js similarity index 91% rename from core/test/unit/api/shared/util/options_spec.js rename to test/unit/api/shared/util/options_spec.js index 346d334577..b47b902f8f 100644 --- a/core/test/unit/api/shared/util/options_spec.js +++ b/test/unit/api/shared/util/options_spec.js @@ -1,5 +1,5 @@ const should = require('should'); -const optionsUtil = require('../../../../../server/api/shared/utils/options'); +const optionsUtil = require('../../../../../core/server/api/shared/utils/options'); describe('Unit: api/shared/util/options', function () { it('returns an array with empty string when no parameters are passed', function () { diff --git a/core/test/unit/api/shared/validators/handle_spec.js b/test/unit/api/shared/validators/handle_spec.js similarity index 94% rename from core/test/unit/api/shared/validators/handle_spec.js rename to test/unit/api/shared/validators/handle_spec.js index 9d6c14636b..2943f47be3 100644 --- a/core/test/unit/api/shared/validators/handle_spec.js +++ b/test/unit/api/shared/validators/handle_spec.js @@ -1,8 +1,8 @@ const should = require('should'); const Promise = require('bluebird'); const sinon = require('sinon'); -const common = require('../../../../../server/lib/common'); -const shared = require('../../../../../server/api/shared'); +const common = require('../../../../../core/server/lib/common'); +const shared = require('../../../../../core/server/api/shared'); describe('Unit: api/shared/validators/handle', function () { afterEach(function () { diff --git a/core/test/unit/api/shared/validators/input/all_spec.js b/test/unit/api/shared/validators/input/all_spec.js similarity index 98% rename from core/test/unit/api/shared/validators/input/all_spec.js rename to test/unit/api/shared/validators/input/all_spec.js index 0eb6d823f4..e7415aa87f 100644 --- a/core/test/unit/api/shared/validators/input/all_spec.js +++ b/test/unit/api/shared/validators/input/all_spec.js @@ -1,8 +1,8 @@ const should = require('should'); const sinon = require('sinon'); const Promise = require('bluebird'); -const common = require('../../../../../../server/lib/common'); -const shared = require('../../../../../../server/api/shared'); +const common = require('../../../../../../core/server/lib/common'); +const shared = require('../../../../../../core/server/api/shared'); describe('Unit: api/shared/validators/input/all', function () { afterEach(function () { diff --git a/core/test/unit/api/v2/session_spec.js b/test/unit/api/v2/session_spec.js similarity index 94% rename from core/test/unit/api/v2/session_spec.js rename to test/unit/api/v2/session_spec.js index d5954e44e4..0bec542c55 100644 --- a/core/test/unit/api/v2/session_spec.js +++ b/test/unit/api/v2/session_spec.js @@ -1,11 +1,11 @@ const should = require('should'); const sinon = require('sinon'); -const models = require('../../../../server/models'); -const {UnauthorizedError} = require('../../../../server/lib/common/errors'); +const models = require('../../../../core/server/models'); +const {UnauthorizedError} = require('../../../../core/server/lib/common/errors'); -const sessionController = require('../../../../server/api/v2/session'); -const sessionServiceMiddleware = require('../../../../server/services/auth/session/middleware'); +const sessionController = require('../../../../core/server/api/v2/session'); +const sessionServiceMiddleware = require('../../../../core/server/services/auth/session/middleware'); describe('v2 Session controller', function () { before(function () { diff --git a/core/test/unit/api/v2/utils/index_spec.js b/test/unit/api/v2/utils/index_spec.js similarity index 92% rename from core/test/unit/api/v2/utils/index_spec.js rename to test/unit/api/v2/utils/index_spec.js index fd71e765d4..5c37c692aa 100644 --- a/core/test/unit/api/v2/utils/index_spec.js +++ b/test/unit/api/v2/utils/index_spec.js @@ -1,6 +1,6 @@ const should = require('should'); const sinon = require('sinon'); -const utils = require('../../../../../server/api/v2/utils'); +const utils = require('../../../../../core/server/api/v2/utils'); describe('Unit: v2/utils/index', function () { afterEach(function () { diff --git a/core/test/unit/api/v2/utils/serializers/input/integrations_spec.js b/test/unit/api/v2/utils/serializers/input/integrations_spec.js similarity index 94% rename from core/test/unit/api/v2/utils/serializers/input/integrations_spec.js rename to test/unit/api/v2/utils/serializers/input/integrations_spec.js index 75f24e8be9..37dfeadcfe 100644 --- a/core/test/unit/api/v2/utils/serializers/input/integrations_spec.js +++ b/test/unit/api/v2/utils/serializers/input/integrations_spec.js @@ -1,5 +1,5 @@ const should = require('should'); -const serializers = require('../../../../../../../server/api/v2/utils/serializers'); +const serializers = require('../../../../../../../core/server/api/v2/utils/serializers'); describe('Unit: v2/utils/serializers/input/pages', function () { describe('browse', function () { diff --git a/core/test/unit/api/v2/utils/serializers/input/pages_spec.js b/test/unit/api/v2/utils/serializers/input/pages_spec.js similarity index 98% rename from core/test/unit/api/v2/utils/serializers/input/pages_spec.js rename to test/unit/api/v2/utils/serializers/input/pages_spec.js index 23b3254115..fb96b0ebc5 100644 --- a/core/test/unit/api/v2/utils/serializers/input/pages_spec.js +++ b/test/unit/api/v2/utils/serializers/input/pages_spec.js @@ -1,5 +1,5 @@ const should = require('should'); -const serializers = require('../../../../../../../server/api/v2/utils/serializers'); +const serializers = require('../../../../../../../core/server/api/v2/utils/serializers'); describe('Unit: v2/utils/serializers/input/pages', function () { describe('browse', function () { diff --git a/core/test/unit/api/v2/utils/serializers/input/posts_spec.js b/test/unit/api/v2/utils/serializers/input/posts_spec.js similarity index 99% rename from core/test/unit/api/v2/utils/serializers/input/posts_spec.js rename to test/unit/api/v2/utils/serializers/input/posts_spec.js index 0aadbdb734..13eb9cb4c6 100644 --- a/core/test/unit/api/v2/utils/serializers/input/posts_spec.js +++ b/test/unit/api/v2/utils/serializers/input/posts_spec.js @@ -1,6 +1,6 @@ const should = require('should'); const sinon = require('sinon'); -const serializers = require('../../../../../../../server/api/v2/utils/serializers'); +const serializers = require('../../../../../../../core/server/api/v2/utils/serializers'); const urlUtils = require('../../../../../../utils/urlUtils'); describe('Unit: v2/utils/serializers/input/posts', function () { diff --git a/core/test/unit/api/v2/utils/serializers/output/all_spec.js b/test/unit/api/v2/utils/serializers/output/all_spec.js similarity index 95% rename from core/test/unit/api/v2/utils/serializers/output/all_spec.js rename to test/unit/api/v2/utils/serializers/output/all_spec.js index 443cb0edec..17d240e1eb 100644 --- a/core/test/unit/api/v2/utils/serializers/output/all_spec.js +++ b/test/unit/api/v2/utils/serializers/output/all_spec.js @@ -1,5 +1,5 @@ const should = require('should'); -const serializers = require('../../../../../../../server/api/v2/utils/serializers'); +const serializers = require('../../../../../../../core/server/api/v2/utils/serializers'); describe('Unit: v2/utils/serializers/output/all', function () { describe('after', function () { diff --git a/core/test/unit/api/v2/utils/serializers/output/pages_spec.js b/test/unit/api/v2/utils/serializers/output/pages_spec.js similarity index 87% rename from core/test/unit/api/v2/utils/serializers/output/pages_spec.js rename to test/unit/api/v2/utils/serializers/output/pages_spec.js index 4a09230cac..2766b5bb49 100644 --- a/core/test/unit/api/v2/utils/serializers/output/pages_spec.js +++ b/test/unit/api/v2/utils/serializers/output/pages_spec.js @@ -1,8 +1,8 @@ const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../../../../../utils'); -const mapper = require('../../../../../../../server/api/v2/utils/serializers/output/utils/mapper'); -const serializers = require('../../../../../../../server/api/v2/utils/serializers'); +const mapper = require('../../../../../../../core/server/api/v2/utils/serializers/output/utils/mapper'); +const serializers = require('../../../../../../../core/server/api/v2/utils/serializers'); describe('Unit: v2/utils/serializers/output/pages', function () { let pageModel; diff --git a/core/test/unit/api/v2/utils/serializers/output/posts_spec.js b/test/unit/api/v2/utils/serializers/output/posts_spec.js similarity index 86% rename from core/test/unit/api/v2/utils/serializers/output/posts_spec.js rename to test/unit/api/v2/utils/serializers/output/posts_spec.js index 14a548ed2b..89205e1ff5 100644 --- a/core/test/unit/api/v2/utils/serializers/output/posts_spec.js +++ b/test/unit/api/v2/utils/serializers/output/posts_spec.js @@ -1,8 +1,8 @@ const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../../../../../utils'); -const mapper = require('../../../../../../../server/api/v2/utils/serializers/output/utils/mapper'); -const serializers = require('../../../../../../../server/api/v2/utils/serializers'); +const mapper = require('../../../../../../../core/server/api/v2/utils/serializers/output/utils/mapper'); +const serializers = require('../../../../../../../core/server/api/v2/utils/serializers'); describe('Unit: v2/utils/serializers/output/posts', function () { let postModel; diff --git a/core/test/unit/api/v2/utils/serializers/output/tags_spec.js b/test/unit/api/v2/utils/serializers/output/tags_spec.js similarity index 89% rename from core/test/unit/api/v2/utils/serializers/output/tags_spec.js rename to test/unit/api/v2/utils/serializers/output/tags_spec.js index 42b25cac10..c72e38790a 100644 --- a/core/test/unit/api/v2/utils/serializers/output/tags_spec.js +++ b/test/unit/api/v2/utils/serializers/output/tags_spec.js @@ -1,8 +1,8 @@ const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../../../../../utils'); -const mapper = require('../../../../../../../server/api/v2/utils/serializers/output/utils/mapper'); -const serializers = require('../../../../../../../server/api/v2/utils/serializers'); +const mapper = require('../../../../../../../core/server/api/v2/utils/serializers/output/utils/mapper'); +const serializers = require('../../../../../../../core/server/api/v2/utils/serializers'); describe('Unit: v2/utils/serializers/output/tags', function () { let tagModel; diff --git a/core/test/unit/api/v2/utils/serializers/output/utils/date_spec.js b/test/unit/api/v2/utils/serializers/output/utils/date_spec.js similarity index 79% rename from core/test/unit/api/v2/utils/serializers/output/utils/date_spec.js rename to test/unit/api/v2/utils/serializers/output/utils/date_spec.js index 91e67af4e3..10f50f89a4 100644 --- a/core/test/unit/api/v2/utils/serializers/output/utils/date_spec.js +++ b/test/unit/api/v2/utils/serializers/output/utils/date_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const sinon = require('sinon'); -const settingsCache = require('../../../../../../../../server/services/settings/cache'); -const dateUtil = require('../../../../../../../../server/api/v2/utils/serializers/output/utils/date'); +const settingsCache = require('../../../../../../../../core/server/services/settings/cache'); +const dateUtil = require('../../../../../../../../core/server/api/v2/utils/serializers/output/utils/date'); describe('Unit: v2/utils/serializers/output/utils/date', function () { afterEach(function () { diff --git a/core/test/unit/api/v2/utils/serializers/output/utils/extra-attrs_spec.js b/test/unit/api/v2/utils/serializers/output/utils/extra-attrs_spec.js similarity index 91% rename from core/test/unit/api/v2/utils/serializers/output/utils/extra-attrs_spec.js rename to test/unit/api/v2/utils/serializers/output/utils/extra-attrs_spec.js index f8cc8b5eb9..08379f2dad 100644 --- a/core/test/unit/api/v2/utils/serializers/output/utils/extra-attrs_spec.js +++ b/test/unit/api/v2/utils/serializers/output/utils/extra-attrs_spec.js @@ -1,6 +1,6 @@ const should = require('should'); const sinon = require('sinon'); -const extraAttrsUtil = require('../../../../../../../../server/api/v2/utils/serializers/output/utils/extra-attrs'); +const extraAttrsUtil = require('../../../../../../../../core/server/api/v2/utils/serializers/output/utils/extra-attrs'); describe('Unit: v2/utils/serializers/output/utils/extra-attrs', function () { const frame = { diff --git a/core/test/unit/api/v2/utils/serializers/output/utils/mapper_spec.js b/test/unit/api/v2/utils/serializers/output/utils/mapper_spec.js similarity index 90% rename from core/test/unit/api/v2/utils/serializers/output/utils/mapper_spec.js rename to test/unit/api/v2/utils/serializers/output/utils/mapper_spec.js index ab4a455f2d..c938993048 100644 --- a/core/test/unit/api/v2/utils/serializers/output/utils/mapper_spec.js +++ b/test/unit/api/v2/utils/serializers/output/utils/mapper_spec.js @@ -1,11 +1,11 @@ const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../../../../../../utils'); -const dateUtil = require('../../../../../../../../server/api/v2/utils/serializers/output/utils/date'); -const urlUtil = require('../../../../../../../../server/api/v2/utils/serializers/output/utils/url'); -const cleanUtil = require('../../../../../../../../server/api/v2/utils/serializers/output/utils/clean'); -const extraAttrsUtils = require('../../../../../../../../server/api/v2/utils/serializers/output/utils/extra-attrs'); -const mapper = require('../../../../../../../../server/api/v2/utils/serializers/output/utils/mapper'); +const dateUtil = require('../../../../../../../../core/server/api/v2/utils/serializers/output/utils/date'); +const urlUtil = require('../../../../../../../../core/server/api/v2/utils/serializers/output/utils/url'); +const cleanUtil = require('../../../../../../../../core/server/api/v2/utils/serializers/output/utils/clean'); +const extraAttrsUtils = require('../../../../../../../../core/server/api/v2/utils/serializers/output/utils/extra-attrs'); +const mapper = require('../../../../../../../../core/server/api/v2/utils/serializers/output/utils/mapper'); describe('Unit: v2/utils/serializers/output/utils/mapper', function () { beforeEach(function () { diff --git a/core/test/unit/api/v2/utils/serializers/output/utils/post-gating_spec.js b/test/unit/api/v2/utils/serializers/output/utils/post-gating_spec.js similarity index 95% rename from core/test/unit/api/v2/utils/serializers/output/utils/post-gating_spec.js rename to test/unit/api/v2/utils/serializers/output/utils/post-gating_spec.js index b2522416c7..f612f03fd5 100644 --- a/core/test/unit/api/v2/utils/serializers/output/utils/post-gating_spec.js +++ b/test/unit/api/v2/utils/serializers/output/utils/post-gating_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const sinon = require('sinon'); -const labs = require('../../../../../../../../server/services/labs'); -const gating = require('../../../../../../../../server/api/v2/utils/serializers/output/utils/post-gating'); +const labs = require('../../../../../../../../core/server/services/labs'); +const gating = require('../../../../../../../../core/server/api/v2/utils/serializers/output/utils/post-gating'); describe('Unit: v2/utils/serializers/output/utils/post-gating', function () { describe('for post', function () { diff --git a/core/test/unit/api/v2/utils/serializers/output/utils/url_spec.js b/test/unit/api/v2/utils/serializers/output/utils/url_spec.js similarity index 89% rename from core/test/unit/api/v2/utils/serializers/output/utils/url_spec.js rename to test/unit/api/v2/utils/serializers/output/utils/url_spec.js index bb8e988f3a..f423a77d69 100644 --- a/core/test/unit/api/v2/utils/serializers/output/utils/url_spec.js +++ b/test/unit/api/v2/utils/serializers/output/utils/url_spec.js @@ -1,9 +1,9 @@ const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../../../../../../utils'); -const urlService = require('../../../../../../../../frontend/services/url'); -const urlUtils = require('../../../../../../../../server/lib/url-utils'); -const urlUtil = require('../../../../../../../../server/api/v2/utils/serializers/output/utils/url'); +const urlService = require('../../../../../../../../core/frontend/services/url'); +const urlUtils = require('../../../../../../../../core/server/lib/url-utils'); +const urlUtil = require('../../../../../../../../core/server/api/v2/utils/serializers/output/utils/url'); describe('Unit: v2/utils/serializers/output/utils/url', function () { beforeEach(function () { diff --git a/core/test/unit/api/v2/utils/validators/input/pages_spec.js b/test/unit/api/v2/utils/validators/input/pages_spec.js similarity index 98% rename from core/test/unit/api/v2/utils/validators/input/pages_spec.js rename to test/unit/api/v2/utils/validators/input/pages_spec.js index 8e42f576c8..94992dbb80 100644 --- a/core/test/unit/api/v2/utils/validators/input/pages_spec.js +++ b/test/unit/api/v2/utils/validators/input/pages_spec.js @@ -2,8 +2,8 @@ const _ = require('lodash'); const should = require('should'); const sinon = require('sinon'); const Promise = require('bluebird'); -const common = require('../../../../../../../server/lib/common'); -const validators = require('../../../../../../../server/api/v2/utils/validators'); +const common = require('../../../../../../../core/server/lib/common'); +const validators = require('../../../../../../../core/server/api/v2/utils/validators'); describe('Unit: v2/utils/validators/input/pages', function () { afterEach(function () { diff --git a/core/test/unit/api/v2/utils/validators/input/posts_spec.js b/test/unit/api/v2/utils/validators/input/posts_spec.js similarity index 98% rename from core/test/unit/api/v2/utils/validators/input/posts_spec.js rename to test/unit/api/v2/utils/validators/input/posts_spec.js index 29ff716b19..3300fd8c67 100644 --- a/core/test/unit/api/v2/utils/validators/input/posts_spec.js +++ b/test/unit/api/v2/utils/validators/input/posts_spec.js @@ -2,8 +2,8 @@ const _ = require('lodash'); const should = require('should'); const sinon = require('sinon'); const Promise = require('bluebird'); -const common = require('../../../../../../../server/lib/common'); -const validators = require('../../../../../../../server/api/v2/utils/validators'); +const common = require('../../../../../../../core/server/lib/common'); +const validators = require('../../../../../../../core/server/api/v2/utils/validators'); describe('Unit: v2/utils/validators/input/posts', function () { afterEach(function () { diff --git a/core/test/unit/api/v2/utils/validators/input/tags_spec.js b/test/unit/api/v2/utils/validators/input/tags_spec.js similarity index 98% rename from core/test/unit/api/v2/utils/validators/input/tags_spec.js rename to test/unit/api/v2/utils/validators/input/tags_spec.js index 8d949641e4..eb9ed2f83d 100644 --- a/core/test/unit/api/v2/utils/validators/input/tags_spec.js +++ b/test/unit/api/v2/utils/validators/input/tags_spec.js @@ -2,8 +2,8 @@ const _ = require('lodash'); const should = require('should'); const sinon = require('sinon'); const Promise = require('bluebird'); -const common = require('../../../../../../../server/lib/common'); -const validators = require('../../../../../../../server/api/v2/utils/validators'); +const common = require('../../../../../../../core/server/lib/common'); +const validators = require('../../../../../../../core/server/api/v2/utils/validators'); describe('Unit: v2/utils/validators/input/tags', function () { afterEach(function () { diff --git a/core/test/unit/api/v3/session_spec.js b/test/unit/api/v3/session_spec.js similarity index 94% rename from core/test/unit/api/v3/session_spec.js rename to test/unit/api/v3/session_spec.js index c913b610af..a38e247489 100644 --- a/core/test/unit/api/v3/session_spec.js +++ b/test/unit/api/v3/session_spec.js @@ -1,11 +1,11 @@ const should = require('should'); const sinon = require('sinon'); -const models = require('../../../../server/models'); -const {UnauthorizedError} = require('../../../../server/lib/common/errors'); +const models = require('../../../../core/server/models'); +const {UnauthorizedError} = require('../../../../core/server/lib/common/errors'); -const sessionController = require('../../../../server/api/canary/session'); -const sessionServiceMiddleware = require('../../../../server/services/auth/session/middleware'); +const sessionController = require('../../../../core/server/api/canary/session'); +const sessionServiceMiddleware = require('../../../../core/server/services/auth/session/middleware'); describe('v3 Session controller', function () { before(function () { diff --git a/core/test/unit/api/v3/utils/index_spec.js b/test/unit/api/v3/utils/index_spec.js similarity index 91% rename from core/test/unit/api/v3/utils/index_spec.js rename to test/unit/api/v3/utils/index_spec.js index 8cb28298c6..33a7b0bc8a 100644 --- a/core/test/unit/api/v3/utils/index_spec.js +++ b/test/unit/api/v3/utils/index_spec.js @@ -1,6 +1,6 @@ const should = require('should'); const sinon = require('sinon'); -const utils = require('../../../../../server/api/canary/utils'); +const utils = require('../../../../../core/server/api/canary/utils'); describe('Unit: v3/utils/index', function () { afterEach(function () { diff --git a/core/test/unit/api/v3/utils/serializers/input/integrations_spec.js b/test/unit/api/v3/utils/serializers/input/integrations_spec.js similarity index 94% rename from core/test/unit/api/v3/utils/serializers/input/integrations_spec.js rename to test/unit/api/v3/utils/serializers/input/integrations_spec.js index 660316efab..c9b2e6b6d3 100644 --- a/core/test/unit/api/v3/utils/serializers/input/integrations_spec.js +++ b/test/unit/api/v3/utils/serializers/input/integrations_spec.js @@ -1,5 +1,5 @@ const should = require('should'); -const serializers = require('../../../../../../../server/api/canary/utils/serializers'); +const serializers = require('../../../../../../../core/server/api/canary/utils/serializers'); describe('Unit: v3/utils/serializers/input/pages', function () { describe('browse', function () { diff --git a/core/test/unit/api/v3/utils/serializers/input/pages_spec.js b/test/unit/api/v3/utils/serializers/input/pages_spec.js similarity index 98% rename from core/test/unit/api/v3/utils/serializers/input/pages_spec.js rename to test/unit/api/v3/utils/serializers/input/pages_spec.js index 43a1768af4..682d67c4b1 100644 --- a/core/test/unit/api/v3/utils/serializers/input/pages_spec.js +++ b/test/unit/api/v3/utils/serializers/input/pages_spec.js @@ -1,5 +1,5 @@ const should = require('should'); -const serializers = require('../../../../../../../server/api/v2/utils/serializers'); +const serializers = require('../../../../../../../core/server/api/v2/utils/serializers'); describe('Unit: v3/utils/serializers/input/pages', function () { describe('browse', function () { diff --git a/core/test/unit/api/v3/utils/serializers/input/posts_spec.js b/test/unit/api/v3/utils/serializers/input/posts_spec.js similarity index 99% rename from core/test/unit/api/v3/utils/serializers/input/posts_spec.js rename to test/unit/api/v3/utils/serializers/input/posts_spec.js index 4c05282ef8..d12325efda 100644 --- a/core/test/unit/api/v3/utils/serializers/input/posts_spec.js +++ b/test/unit/api/v3/utils/serializers/input/posts_spec.js @@ -1,6 +1,6 @@ const should = require('should'); const sinon = require('sinon'); -const serializers = require('../../../../../../../server/api/v2/utils/serializers'); +const serializers = require('../../../../../../../core/server/api/v2/utils/serializers'); const urlUtils = require('../../../../../../utils/urlUtils'); describe('Unit: v3/utils/serializers/input/posts', function () { diff --git a/core/test/unit/api/v3/utils/serializers/output/all_spec.js b/test/unit/api/v3/utils/serializers/output/all_spec.js similarity index 95% rename from core/test/unit/api/v3/utils/serializers/output/all_spec.js rename to test/unit/api/v3/utils/serializers/output/all_spec.js index 5d7a3e356b..c35e53a8f3 100644 --- a/core/test/unit/api/v3/utils/serializers/output/all_spec.js +++ b/test/unit/api/v3/utils/serializers/output/all_spec.js @@ -1,5 +1,5 @@ const should = require('should'); -const serializers = require('../../../../../../../server/api/canary/utils/serializers'); +const serializers = require('../../../../../../../core/server/api/canary/utils/serializers'); describe('Unit: v3/utils/serializers/output/all', function () { describe('after', function () { diff --git a/core/test/unit/api/v3/utils/serializers/output/pages_spec.js b/test/unit/api/v3/utils/serializers/output/pages_spec.js similarity index 87% rename from core/test/unit/api/v3/utils/serializers/output/pages_spec.js rename to test/unit/api/v3/utils/serializers/output/pages_spec.js index 8f9db1fbd2..9da232bb1f 100644 --- a/core/test/unit/api/v3/utils/serializers/output/pages_spec.js +++ b/test/unit/api/v3/utils/serializers/output/pages_spec.js @@ -1,8 +1,8 @@ const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../../../../../utils'); -const mapper = require('../../../../../../../server/api/canary/utils/serializers/output/utils/mapper'); -const serializers = require('../../../../../../../server/api/canary/utils/serializers'); +const mapper = require('../../../../../../../core/server/api/canary/utils/serializers/output/utils/mapper'); +const serializers = require('../../../../../../../core/server/api/canary/utils/serializers'); describe('Unit: v3/utils/serializers/output/pages', function () { let pageModel; diff --git a/core/test/unit/api/v3/utils/serializers/output/posts_spec.js b/test/unit/api/v3/utils/serializers/output/posts_spec.js similarity index 85% rename from core/test/unit/api/v3/utils/serializers/output/posts_spec.js rename to test/unit/api/v3/utils/serializers/output/posts_spec.js index 8a3b5b4b3e..8c608d9b68 100644 --- a/core/test/unit/api/v3/utils/serializers/output/posts_spec.js +++ b/test/unit/api/v3/utils/serializers/output/posts_spec.js @@ -1,8 +1,8 @@ const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../../../../../utils'); -const mapper = require('../../../../../../../server/api/canary/utils/serializers/output/utils/mapper'); -const serializers = require('../../../../../../../server/api/canary/utils/serializers'); +const mapper = require('../../../../../../../core/server/api/canary/utils/serializers/output/utils/mapper'); +const serializers = require('../../../../../../../core/server/api/canary/utils/serializers'); describe('Unit: v3/utils/serializers/output/posts', function () { let postModel; diff --git a/core/test/unit/api/v3/utils/serializers/output/tags_spec.js b/test/unit/api/v3/utils/serializers/output/tags_spec.js similarity index 88% rename from core/test/unit/api/v3/utils/serializers/output/tags_spec.js rename to test/unit/api/v3/utils/serializers/output/tags_spec.js index 0e51718e45..dca81f6de5 100644 --- a/core/test/unit/api/v3/utils/serializers/output/tags_spec.js +++ b/test/unit/api/v3/utils/serializers/output/tags_spec.js @@ -1,8 +1,8 @@ const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../../../../../utils'); -const mapper = require('../../../../../../../server/api/canary/utils/serializers/output/utils/mapper'); -const serializers = require('../../../../../../../server/api/canary/utils/serializers'); +const mapper = require('../../../../../../../core/server/api/canary/utils/serializers/output/utils/mapper'); +const serializers = require('../../../../../../../core/server/api/canary/utils/serializers'); describe('Unit: v3/utils/serializers/output/tags', function () { let tagModel; diff --git a/core/test/unit/api/v3/utils/serializers/output/utils/date_spec.js b/test/unit/api/v3/utils/serializers/output/utils/date_spec.js similarity index 79% rename from core/test/unit/api/v3/utils/serializers/output/utils/date_spec.js rename to test/unit/api/v3/utils/serializers/output/utils/date_spec.js index d539dd4f31..bbc08f741f 100644 --- a/core/test/unit/api/v3/utils/serializers/output/utils/date_spec.js +++ b/test/unit/api/v3/utils/serializers/output/utils/date_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const sinon = require('sinon'); -const settingsCache = require('../../../../../../../../server/services/settings/cache'); -const dateUtil = require('../../../../../../../../server/api/canary/utils/serializers/output/utils/date'); +const settingsCache = require('../../../../../../../../core/server/services/settings/cache'); +const dateUtil = require('../../../../../../../../core/server/api/canary/utils/serializers/output/utils/date'); describe('Unit: v3/utils/serializers/output/utils/date', function () { afterEach(function () { diff --git a/core/test/unit/api/v3/utils/serializers/output/utils/extra-attrs_spec.js b/test/unit/api/v3/utils/serializers/output/utils/extra-attrs_spec.js similarity index 91% rename from core/test/unit/api/v3/utils/serializers/output/utils/extra-attrs_spec.js rename to test/unit/api/v3/utils/serializers/output/utils/extra-attrs_spec.js index 4f3fef2fe1..6f0b3233ce 100644 --- a/core/test/unit/api/v3/utils/serializers/output/utils/extra-attrs_spec.js +++ b/test/unit/api/v3/utils/serializers/output/utils/extra-attrs_spec.js @@ -1,6 +1,6 @@ const should = require('should'); const sinon = require('sinon'); -const extraAttrsUtil = require('../../../../../../../../server/api/canary/utils/serializers/output/utils/extra-attrs'); +const extraAttrsUtil = require('../../../../../../../../core/server/api/canary/utils/serializers/output/utils/extra-attrs'); describe('Unit: v3/utils/serializers/output/utils/extra-attrs', function () { const frame = { diff --git a/core/test/unit/api/v3/utils/serializers/output/utils/mapper_spec.js b/test/unit/api/v3/utils/serializers/output/utils/mapper_spec.js similarity index 89% rename from core/test/unit/api/v3/utils/serializers/output/utils/mapper_spec.js rename to test/unit/api/v3/utils/serializers/output/utils/mapper_spec.js index 2c25027a0c..c1ef8a46fa 100644 --- a/core/test/unit/api/v3/utils/serializers/output/utils/mapper_spec.js +++ b/test/unit/api/v3/utils/serializers/output/utils/mapper_spec.js @@ -1,11 +1,11 @@ const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../../../../../../utils'); -const dateUtil = require('../../../../../../../../server/api/canary/utils/serializers/output/utils/date'); -const urlUtil = require('../../../../../../../../server/api/canary/utils/serializers/output/utils/url'); -const cleanUtil = require('../../../../../../../../server/api/canary/utils/serializers/output/utils/clean'); -const extraAttrsUtils = require('../../../../../../../../server/api/canary/utils/serializers/output/utils/extra-attrs'); -const mapper = require('../../../../../../../../server/api/canary/utils/serializers/output/utils/mapper'); +const dateUtil = require('../../../../../../../../core/server/api/canary/utils/serializers/output/utils/date'); +const urlUtil = require('../../../../../../../../core/server/api/canary/utils/serializers/output/utils/url'); +const cleanUtil = require('../../../../../../../../core/server/api/canary/utils/serializers/output/utils/clean'); +const extraAttrsUtils = require('../../../../../../../../core/server/api/canary/utils/serializers/output/utils/extra-attrs'); +const mapper = require('../../../../../../../../core/server/api/canary/utils/serializers/output/utils/mapper'); describe('Unit: v3/utils/serializers/output/utils/mapper', function () { beforeEach(function () { diff --git a/core/test/unit/api/v3/utils/serializers/output/utils/url_spec.js b/test/unit/api/v3/utils/serializers/output/utils/url_spec.js similarity index 89% rename from core/test/unit/api/v3/utils/serializers/output/utils/url_spec.js rename to test/unit/api/v3/utils/serializers/output/utils/url_spec.js index 1fa283a6d6..e4b7cb4e7b 100644 --- a/core/test/unit/api/v3/utils/serializers/output/utils/url_spec.js +++ b/test/unit/api/v3/utils/serializers/output/utils/url_spec.js @@ -1,9 +1,9 @@ const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../../../../../../utils'); -const urlService = require('../../../../../../../../frontend/services/url'); -const urlUtils = require('../../../../../../../../server/lib/url-utils'); -const urlUtil = require('../../../../../../../../server/api/v2/utils/serializers/output/utils/url'); +const urlService = require('../../../../../../../../core/frontend/services/url'); +const urlUtils = require('../../../../../../../../core/server/lib/url-utils'); +const urlUtil = require('../../../../../../../../core/server/api/v2/utils/serializers/output/utils/url'); describe('Unit: v3/utils/serializers/output/utils/url', function () { beforeEach(function () { diff --git a/core/test/unit/api/v3/utils/validators/input/pages_spec.js b/test/unit/api/v3/utils/validators/input/pages_spec.js similarity index 98% rename from core/test/unit/api/v3/utils/validators/input/pages_spec.js rename to test/unit/api/v3/utils/validators/input/pages_spec.js index e7d05e329c..4805a83a92 100644 --- a/core/test/unit/api/v3/utils/validators/input/pages_spec.js +++ b/test/unit/api/v3/utils/validators/input/pages_spec.js @@ -2,8 +2,8 @@ const _ = require('lodash'); const should = require('should'); const sinon = require('sinon'); const Promise = require('bluebird'); -const common = require('../../../../../../../server/lib/common'); -const validators = require('../../../../../../../server/api/canary/utils/validators'); +const common = require('../../../../../../../core/server/lib/common'); +const validators = require('../../../../../../../core/server/api/canary/utils/validators'); describe('Unit: v3/utils/validators/input/pages', function () { afterEach(function () { diff --git a/core/test/unit/api/v3/utils/validators/input/posts_spec.js b/test/unit/api/v3/utils/validators/input/posts_spec.js similarity index 98% rename from core/test/unit/api/v3/utils/validators/input/posts_spec.js rename to test/unit/api/v3/utils/validators/input/posts_spec.js index e1ed684939..4f7aa04563 100644 --- a/core/test/unit/api/v3/utils/validators/input/posts_spec.js +++ b/test/unit/api/v3/utils/validators/input/posts_spec.js @@ -2,8 +2,8 @@ const _ = require('lodash'); const should = require('should'); const sinon = require('sinon'); const Promise = require('bluebird'); -const common = require('../../../../../../../server/lib/common'); -const validators = require('../../../../../../../server/api/canary/utils/validators'); +const common = require('../../../../../../../core/server/lib/common'); +const validators = require('../../../../../../../core/server/api/canary/utils/validators'); describe('Unit: v3/utils/validators/input/posts', function () { afterEach(function () { diff --git a/core/test/unit/api/v3/utils/validators/input/tags_spec.js b/test/unit/api/v3/utils/validators/input/tags_spec.js similarity index 98% rename from core/test/unit/api/v3/utils/validators/input/tags_spec.js rename to test/unit/api/v3/utils/validators/input/tags_spec.js index e42dd27428..05ac997387 100644 --- a/core/test/unit/api/v3/utils/validators/input/tags_spec.js +++ b/test/unit/api/v3/utils/validators/input/tags_spec.js @@ -2,8 +2,8 @@ const _ = require('lodash'); const should = require('should'); const sinon = require('sinon'); const Promise = require('bluebird'); -const common = require('../../../../../../../server/lib/common'); -const validators = require('../../../../../../../server/api/canary/utils/validators'); +const common = require('../../../../../../../core/server/lib/common'); +const validators = require('../../../../../../../core/server/api/canary/utils/validators'); describe('Unit: v3/utils/validators/input/tags', function () { afterEach(function () { diff --git a/core/test/unit/apps/amp/amp_components_spec.js b/test/unit/apps/amp/amp_components_spec.js similarity index 97% rename from core/test/unit/apps/amp/amp_components_spec.js rename to test/unit/apps/amp/amp_components_spec.js index 56c295b630..ee0b66603d 100644 --- a/core/test/unit/apps/amp/amp_components_spec.js +++ b/test/unit/apps/amp/amp_components_spec.js @@ -1,7 +1,7 @@ var should = require('should'), // Stuff we are testing - ampComponentsHelper = require('../../../../frontend/apps/amp/lib/helpers/amp_components'); + ampComponentsHelper = require('../../../../core/frontend/apps/amp/lib/helpers/amp_components'); describe('{{amp_components}} helper', function () { it('adds script tag for a gif', function () { diff --git a/core/test/unit/apps/amp/amp_content_spec.js b/test/unit/apps/amp/amp_content_spec.js similarity index 99% rename from core/test/unit/apps/amp/amp_content_spec.js rename to test/unit/apps/amp/amp_content_spec.js index 3cb775fa5d..a628ab8f53 100644 --- a/core/test/unit/apps/amp/amp_content_spec.js +++ b/test/unit/apps/amp/amp_content_spec.js @@ -1,8 +1,8 @@ var should = require('should'), rewire = require('rewire'), nock = require('nock'), - urlUtils = require('../../../../test/utils/urlUtils'), - ampContentHelper = rewire('../../../../frontend/apps/amp/lib/helpers/amp_content'); + urlUtils = require('../../../utils/urlUtils'), + ampContentHelper = rewire('../../../../core/frontend/apps/amp/lib/helpers/amp_content'); // TODO: Amperize really needs to get stubbed, so we can test returning errors // properly and make this test faster! diff --git a/core/test/unit/apps/amp/router_spec.js b/test/unit/apps/amp/router_spec.js similarity index 94% rename from core/test/unit/apps/amp/router_spec.js rename to test/unit/apps/amp/router_spec.js index 4853f21546..0163c70a13 100644 --- a/core/test/unit/apps/amp/router_spec.js +++ b/test/unit/apps/amp/router_spec.js @@ -1,10 +1,10 @@ const should = require('should'), sinon = require('sinon'), path = require('path'), - ampController = require('../../../../frontend/apps/amp/lib/router'), - urlService = require('../../../../frontend/services/url'), - helpers = require('../../../../frontend/services/routing/helpers'), - common = require('../../../../server/lib/common'), + ampController = require('../../../../core/frontend/apps/amp/lib/router'), + urlService = require('../../../../core/frontend/services/url'), + helpers = require('../../../../core/frontend/services/routing/helpers'), + common = require('../../../../core/server/lib/common'), testUtils = require('../../../utils'), configUtils = require('../../../utils/configUtils'); diff --git a/core/test/unit/apps/private-blogging/controller_spec.js b/test/unit/apps/private-blogging/controller_spec.js similarity index 93% rename from core/test/unit/apps/private-blogging/controller_spec.js rename to test/unit/apps/private-blogging/controller_spec.js index a5e0bf8798..b52b35532c 100644 --- a/core/test/unit/apps/private-blogging/controller_spec.js +++ b/test/unit/apps/private-blogging/controller_spec.js @@ -2,8 +2,8 @@ var should = require('should'), sinon = require('sinon'), path = require('path'), configUtils = require('../../../utils/configUtils'), - themes = require('../../../../frontend/services/themes'), - privateController = require('../../../../frontend/apps/private-blogging/lib/router'); + themes = require('../../../../core/frontend/services/themes'), + privateController = require('../../../../core/frontend/apps/private-blogging/lib/router'); describe('Private Controller', function () { var res, req, defaultPath, hasTemplateStub; diff --git a/core/test/unit/apps/private-blogging/input_password_spec.js b/test/unit/apps/private-blogging/input_password_spec.js similarity index 93% rename from core/test/unit/apps/private-blogging/input_password_spec.js rename to test/unit/apps/private-blogging/input_password_spec.js index dc5e89d0d5..bfbae4d88e 100644 --- a/core/test/unit/apps/private-blogging/input_password_spec.js +++ b/test/unit/apps/private-blogging/input_password_spec.js @@ -2,7 +2,7 @@ var should = require('should'), // Stuff we are testing - input_password = require('../../../../frontend/apps/private-blogging/lib/helpers/input_password'); + input_password = require('../../../../core/frontend/apps/private-blogging/lib/helpers/input_password'); describe('{{input_password}} helper', function () { it('has input_password helper', function () { diff --git a/core/test/unit/apps/private-blogging/middleware_spec.js b/test/unit/apps/private-blogging/middleware_spec.js similarity index 98% rename from core/test/unit/apps/private-blogging/middleware_spec.js rename to test/unit/apps/private-blogging/middleware_spec.js index 21f099ecb3..d39fd4a2ed 100644 --- a/core/test/unit/apps/private-blogging/middleware_spec.js +++ b/test/unit/apps/private-blogging/middleware_spec.js @@ -2,9 +2,9 @@ var should = require('should'), sinon = require('sinon'), crypto = require('crypto'), fs = require('fs-extra'), - common = require('../../../../server/lib/common'), - settingsCache = require('../../../../server/services/settings/cache'), - privateBlogging = require('../../../../frontend/apps/private-blogging/lib/middleware'); + common = require('../../../../core/server/lib/common'), + settingsCache = require('../../../../core/server/services/settings/cache'), + privateBlogging = require('../../../../core/frontend/apps/private-blogging/lib/middleware'); function hash(password, salt) { var hasher = crypto.createHash('sha256'); diff --git a/core/test/unit/config/index_spec.js b/test/unit/config/index_spec.js similarity index 98% rename from core/test/unit/config/index_spec.js rename to test/unit/config/index_spec.js index e73eee254c..23cf0894c7 100644 --- a/core/test/unit/config/index_spec.js +++ b/test/unit/config/index_spec.js @@ -19,7 +19,7 @@ describe('Config', function () { beforeEach(function () { originalEnv = _.clone(process.env); originalArgv = _.clone(process.argv); - config = rewire('../../../server/config'); + config = rewire('../../../core/server/config'); // we manually call `loadConf` in the tests and we need to ensure that the minimum // required config properties are available @@ -102,7 +102,7 @@ describe('Config', function () { it('should have the correct values for each key', function () { var pathConfig = configUtils.config.get('paths'), - appRoot = path.resolve(__dirname, '../../../../'); + appRoot = path.resolve(__dirname, '../../../'); pathConfig.should.have.property('appRoot', appRoot); }); diff --git a/core/test/unit/config/utils_spec.js b/test/unit/config/utils_spec.js similarity index 97% rename from core/test/unit/config/utils_spec.js rename to test/unit/config/utils_spec.js index 3ae98f87d6..a617f30551 100644 --- a/core/test/unit/config/utils_spec.js +++ b/test/unit/config/utils_spec.js @@ -1,5 +1,5 @@ var should = require('should'), - configUtils = require('../../../server/config/utils'); + configUtils = require('../../../core/server/config/utils'); describe('UNIT: Config utils', function () { describe('makePathsAbsolute', function () { diff --git a/core/test/unit/data/db/backup_spec.js b/test/unit/data/db/backup_spec.js similarity index 82% rename from core/test/unit/data/db/backup_spec.js rename to test/unit/data/db/backup_spec.js index 7b2e54db75..56be963219 100644 --- a/core/test/unit/data/db/backup_spec.js +++ b/test/unit/data/db/backup_spec.js @@ -2,9 +2,9 @@ var should = require('should'), sinon = require('sinon'), _ = require('lodash'), fs = require('fs-extra'), - models = require('../../../../server/models'), - exporter = require('../../../../server/data/exporter'), - dbBackup = require('../../../../server/data/db/backup'); + models = require('../../../../core/server/models'), + exporter = require('../../../../core/server/data/exporter'), + dbBackup = require('../../../../core/server/data/db/backup'); describe('Backup', function () { var exportStub, filenameStub, fsStub; diff --git a/core/test/unit/data/exporter/index_spec.js b/test/unit/data/exporter/index_spec.js similarity index 96% rename from core/test/unit/data/exporter/index_spec.js rename to test/unit/data/exporter/index_spec.js index 2cb175be04..b39660944e 100644 --- a/core/test/unit/data/exporter/index_spec.js +++ b/test/unit/data/exporter/index_spec.js @@ -2,11 +2,11 @@ var should = require('should'), sinon = require('sinon'), rewire = require('rewire'), Promise = require('bluebird'), - db = require('../../../../server/data/db'), - common = require('../../../../server/lib/common'), - exporter = rewire('../../../../server/data/exporter'), - schema = require('../../../../server/data/schema'), - models = require('../../../../server/models'), + db = require('../../../../core/server/data/db'), + common = require('../../../../core/server/lib/common'), + exporter = rewire('../../../../core/server/data/exporter'), + schema = require('../../../../core/server/data/schema'), + models = require('../../../../core/server/models'), schemaTables = Object.keys(schema.tables); describe('Exporter', function () { diff --git a/core/test/unit/data/importer/importers/data/posts_spec.js b/test/unit/data/importer/importers/data/posts_spec.js similarity index 97% rename from core/test/unit/data/importer/importers/data/posts_spec.js rename to test/unit/data/importer/importers/data/posts_spec.js index 0bb8e0cc70..8ef1e3349c 100644 --- a/core/test/unit/data/importer/importers/data/posts_spec.js +++ b/test/unit/data/importer/importers/data/posts_spec.js @@ -1,6 +1,6 @@ const should = require('should'); const find = require('lodash/find'); -const PostsImporter = require('../../../../../../server/data/importer/importers/data/posts'); +const PostsImporter = require('../../../../../../core/server/data/importer/importers/data/posts'); describe('PostsImporter', function () { describe('#beforeImport', function () { diff --git a/core/test/unit/data/importer/importers/data/settings_spec.js b/test/unit/data/importer/importers/data/settings_spec.js similarity index 95% rename from core/test/unit/data/importer/importers/data/settings_spec.js rename to test/unit/data/importer/importers/data/settings_spec.js index df00ab92d9..acaa27d1e6 100644 --- a/core/test/unit/data/importer/importers/data/settings_spec.js +++ b/test/unit/data/importer/importers/data/settings_spec.js @@ -1,6 +1,6 @@ const find = require('lodash/find'); const should = require('should'); -const SettingsImporter = require('../../../../../../server/data/importer/importers/data/settings'); +const SettingsImporter = require('../../../../../../core/server/data/importer/importers/data/settings'); describe('SettingsImporter', function () { describe('#beforeImport', function () { diff --git a/core/test/unit/data/importer/index_spec.js b/test/unit/data/importer/index_spec.js similarity index 95% rename from core/test/unit/data/importer/index_spec.js rename to test/unit/data/importer/index_spec.js index ac8b5c2278..1f68392ce8 100644 --- a/core/test/unit/data/importer/index_spec.js +++ b/test/unit/data/importer/index_spec.js @@ -6,24 +6,24 @@ var should = require('should'), testUtils = require('../../../utils'), moment = require('moment'), path = require('path'), - common = require('../../../../server/lib/common'), + common = require('../../../../core/server/lib/common'), // Stuff we are testing - ImportManager = require('../../../../server/data/importer'), - JSONHandler = require('../../../../server/data/importer/handlers/json'), - ImageHandler = rewire('../../../../server/data/importer/handlers/image'), - MarkdownHandler = require('../../../../server/data/importer/handlers/markdown'), - DataImporter = require('../../../../server/data/importer/importers/data'), - ImageImporter = require('../../../../server/data/importer/importers/image'), + ImportManager = require('../../../../core/server/data/importer'), + JSONHandler = require('../../../../core/server/data/importer/handlers/json'), + ImageHandler = rewire('../../../../core/server/data/importer/handlers/image'), + MarkdownHandler = require('../../../../core/server/data/importer/handlers/markdown'), + DataImporter = require('../../../../core/server/data/importer/importers/data'), + ImageImporter = require('../../../../core/server/data/importer/importers/image'), - storage = require('../../../../server/adapters/storage'), + storage = require('../../../../core/server/adapters/storage'), urlUtils = require('../../../utils/urlUtils'); describe('Importer', function () { afterEach(function () { sinon.restore(); - ImageHandler = rewire('../../../../server/data/importer/handlers/image'); + ImageHandler = rewire('../../../../core/server/data/importer/handlers/image'); }); describe('ImportManager', function () { @@ -151,37 +151,37 @@ describe('Importer', function () { describe('Validate Zip', function () { it('accepts a zip with a base directory', function () { - var testDir = path.resolve('core/test/utils/fixtures/import/zips/zip-with-base-dir'); + var testDir = path.resolve('test/utils/fixtures/import/zips/zip-with-base-dir'); ImportManager.isValidZip(testDir).should.be.ok(); }); it('accepts a zip without a base directory', function () { - var testDir = path.resolve('core/test/utils/fixtures/import/zips/zip-without-base-dir'); + var testDir = path.resolve('test/utils/fixtures/import/zips/zip-without-base-dir'); ImportManager.isValidZip(testDir).should.be.ok(); }); it('accepts a zip with an image directory', function () { - var testDir = path.resolve('core/test/utils/fixtures/import/zips/zip-image-dir'); + var testDir = path.resolve('test/utils/fixtures/import/zips/zip-image-dir'); ImportManager.isValidZip(testDir).should.be.ok(); }); it('fails a zip with two base directories', function () { - var testDir = path.resolve('core/test/utils/fixtures/import/zips/zip-with-double-base-dir'); + var testDir = path.resolve('test/utils/fixtures/import/zips/zip-with-double-base-dir'); ImportManager.isValidZip.bind(ImportManager, testDir).should.throw(common.errors.UnsupportedMediaTypeError); }); it('fails a zip with no content', function () { - var testDir = path.resolve('core/test/utils/fixtures/import/zips/zip-invalid'); + var testDir = path.resolve('test/utils/fixtures/import/zips/zip-invalid'); ImportManager.isValidZip.bind(ImportManager, testDir).should.throw(common.errors.UnsupportedMediaTypeError); }); it('shows a special error for old Roon exports', function () { - var testDir = path.resolve('core/test/utils/fixtures/import/zips/zip-old-roon-export'), + var testDir = path.resolve('test/utils/fixtures/import/zips/zip-old-roon-export'), msg = 'Your zip file looks like an old format Roon export, ' + 'please re-export your Roon blog and try again.'; @@ -192,13 +192,13 @@ describe('Importer', function () { describe('Get Base Dir', function () { it('returns string for base directory', function () { - var testDir = path.resolve('core/test/utils/fixtures/import/zips/zip-with-base-dir'); + var testDir = path.resolve('test/utils/fixtures/import/zips/zip-with-base-dir'); ImportManager.getBaseDirectory(testDir).should.equal('basedir'); }); it('returns empty for no base directory', function () { - var testDir = path.resolve('core/test/utils/fixtures/import/zips/zip-without-base-dir'); + var testDir = path.resolve('test/utils/fixtures/import/zips/zip-without-base-dir'); should.not.exist(ImportManager.getBaseDirectory(testDir)); }); diff --git a/core/test/unit/data/meta/amp_url_spec.js b/test/unit/data/meta/amp_url_spec.js similarity index 91% rename from core/test/unit/data/meta/amp_url_spec.js rename to test/unit/data/meta/amp_url_spec.js index ddcaa2a0ed..e0e8711d18 100644 --- a/core/test/unit/data/meta/amp_url_spec.js +++ b/test/unit/data/meta/amp_url_spec.js @@ -1,10 +1,10 @@ const should = require('should'), sinon = require('sinon'), rewire = require('rewire'), - urlUtils = require('../../../../server/lib/url-utils'), + urlUtils = require('../../../../core/server/lib/url-utils'), testUtils = require('../../../utils'); -let getAmpUrl = rewire('../../../../frontend/meta/amp_url'); +let getAmpUrl = rewire('../../../../core/frontend/meta/amp_url'); describe('getAmpUrl', function () { let getUrlStub; @@ -12,7 +12,7 @@ describe('getAmpUrl', function () { beforeEach(function () { getUrlStub = sinon.stub(); - getAmpUrl = rewire('../../../../frontend/meta/amp_url'); + getAmpUrl = rewire('../../../../core/frontend/meta/amp_url'); getAmpUrl.__set__('getUrl', getUrlStub); sinon.stub(urlUtils, 'urlJoin'); diff --git a/core/test/unit/data/meta/asset_url_spec.js b/test/unit/data/meta/asset_url_spec.js similarity index 97% rename from core/test/unit/data/meta/asset_url_spec.js rename to test/unit/data/meta/asset_url_spec.js index c1a1e92665..7005efb1c8 100644 --- a/core/test/unit/data/meta/asset_url_spec.js +++ b/test/unit/data/meta/asset_url_spec.js @@ -1,13 +1,13 @@ var should = require('should'), sinon = require('sinon'), rewire = require('rewire'), - imageLib = require('../../../../server/lib/image'), - settingsCache = require('../../../../server/services/settings/cache'), + imageLib = require('../../../../core/server/lib/image'), + settingsCache = require('../../../../core/server/services/settings/cache'), configUtils = require('../../../utils/configUtils'), urlUtils = require('../../../utils/urlUtils'), config = configUtils.config; -const getAssetUrl = rewire('../../../../frontend/meta/asset_url'); +const getAssetUrl = rewire('../../../../core/frontend/meta/asset_url'); describe('getAssetUrl', function () { afterEach(function () { diff --git a/core/test/unit/data/meta/author_fb_url_spec.js b/test/unit/data/meta/author_fb_url_spec.js similarity index 96% rename from core/test/unit/data/meta/author_fb_url_spec.js rename to test/unit/data/meta/author_fb_url_spec.js index 628c028432..7a6617992d 100644 --- a/core/test/unit/data/meta/author_fb_url_spec.js +++ b/test/unit/data/meta/author_fb_url_spec.js @@ -1,5 +1,5 @@ var should = require('should'), - getAuthorFacebookUrl = require('../../../../frontend/meta/author_fb_url'); + getAuthorFacebookUrl = require('../../../../core/frontend/meta/author_fb_url'); describe('getAuthorFacebookUrl', function () { it('should return author facebook url if post and has url', diff --git a/core/test/unit/data/meta/author_image_spec.js b/test/unit/data/meta/author_image_spec.js similarity index 97% rename from core/test/unit/data/meta/author_image_spec.js rename to test/unit/data/meta/author_image_spec.js index 109d527780..8f7abfb6e9 100644 --- a/core/test/unit/data/meta/author_image_spec.js +++ b/test/unit/data/meta/author_image_spec.js @@ -1,6 +1,6 @@ var should = require('should'), sinon = require('sinon'), - getAuthorImage = require('../../../../frontend/meta/author_image'); + getAuthorImage = require('../../../../core/frontend/meta/author_image'); describe('getAuthorImage', function () { afterEach(function () { diff --git a/core/test/unit/data/meta/author_url_spec.js b/test/unit/data/meta/author_url_spec.js similarity index 94% rename from core/test/unit/data/meta/author_url_spec.js rename to test/unit/data/meta/author_url_spec.js index b08989d958..7c39b2aa4e 100644 --- a/core/test/unit/data/meta/author_url_spec.js +++ b/test/unit/data/meta/author_url_spec.js @@ -1,8 +1,8 @@ const should = require('should'), sinon = require('sinon'), ObjectId = require('bson-objectid'), - urlService = require('../../../../frontend/services/url'), - getAuthorUrl = require('../../../../frontend/meta/author_url'); + urlService = require('../../../../core/frontend/services/url'), + getAuthorUrl = require('../../../../core/frontend/meta/author_url'); describe('getAuthorUrl', function () { beforeEach(function () { diff --git a/core/test/unit/data/meta/blog_logo_spec.js b/test/unit/data/meta/blog_logo_spec.js similarity index 87% rename from core/test/unit/data/meta/blog_logo_spec.js rename to test/unit/data/meta/blog_logo_spec.js index fb14627e2e..5d2239f289 100644 --- a/core/test/unit/data/meta/blog_logo_spec.js +++ b/test/unit/data/meta/blog_logo_spec.js @@ -1,7 +1,7 @@ var should = require('should'), - getBlogLogo = require('../../../../frontend/meta/blog_logo'), + getBlogLogo = require('../../../../core/frontend/meta/blog_logo'), sinon = require('sinon'), - settingsCache = require('../../../../server/services/settings/cache'); + settingsCache = require('../../../../core/server/services/settings/cache'); describe('getBlogLogo', function () { afterEach(function () { diff --git a/core/test/unit/data/meta/canonical_url_spec.js b/test/unit/data/meta/canonical_url_spec.js similarity index 91% rename from core/test/unit/data/meta/canonical_url_spec.js rename to test/unit/data/meta/canonical_url_spec.js index 13ae315db0..236fa8bf55 100644 --- a/core/test/unit/data/meta/canonical_url_spec.js +++ b/test/unit/data/meta/canonical_url_spec.js @@ -1,10 +1,10 @@ const should = require('should'), sinon = require('sinon'), rewire = require('rewire'), - urlUtils = require('../../../../server/lib/url-utils'), + urlUtils = require('../../../../core/server/lib/url-utils'), testUtils = require('../../../utils'); -let getCanonicalUrl = rewire('../../../../frontend/meta/canonical_url'); +let getCanonicalUrl = rewire('../../../../core/frontend/meta/canonical_url'); describe('getCanonicalUrl', function () { let getUrlStub; @@ -12,7 +12,7 @@ describe('getCanonicalUrl', function () { beforeEach(function () { getUrlStub = sinon.stub(); - getCanonicalUrl = rewire('../../../../frontend/meta/canonical_url'); + getCanonicalUrl = rewire('../../../../core/frontend/meta/canonical_url'); getCanonicalUrl.__set__('getUrl', getUrlStub); sinon.stub(urlUtils, 'urlJoin'); diff --git a/core/test/unit/data/meta/context_object_spec.js b/test/unit/data/meta/context_object_spec.js similarity index 93% rename from core/test/unit/data/meta/context_object_spec.js rename to test/unit/data/meta/context_object_spec.js index 424701c533..fe5e8d2153 100644 --- a/core/test/unit/data/meta/context_object_spec.js +++ b/test/unit/data/meta/context_object_spec.js @@ -1,7 +1,7 @@ var should = require('should'), sinon = require('sinon'), - getContextObject = require('../../../../frontend/meta/context_object.js'), - settingsCache = require('../../../../server/services/settings/cache'); + getContextObject = require('../../../../core/frontend/meta/context_object.js'), + settingsCache = require('../../../../core/server/services/settings/cache'); describe('getContextObject', function () { var data, context, contextObject; diff --git a/core/test/unit/data/meta/cover_image_spec.js b/test/unit/data/meta/cover_image_spec.js similarity index 97% rename from core/test/unit/data/meta/cover_image_spec.js rename to test/unit/data/meta/cover_image_spec.js index 461c28b54d..ed583b399e 100644 --- a/core/test/unit/data/meta/cover_image_spec.js +++ b/test/unit/data/meta/cover_image_spec.js @@ -1,5 +1,5 @@ var should = require('should'), - getCoverImage = require('../../../../frontend/meta/cover_image'); + getCoverImage = require('../../../../core/frontend/meta/cover_image'); describe('getCoverImage', function () { it('should return absolute cover image url for home', function () { diff --git a/core/test/unit/data/meta/creator_url_spec.js b/test/unit/data/meta/creator_url_spec.js similarity index 97% rename from core/test/unit/data/meta/creator_url_spec.js rename to test/unit/data/meta/creator_url_spec.js index a6e63f3710..7313bf18da 100644 --- a/core/test/unit/data/meta/creator_url_spec.js +++ b/test/unit/data/meta/creator_url_spec.js @@ -1,5 +1,5 @@ var should = require('should'), - getCreatorTwitterUrl = require('../../../../frontend/meta/creator_url'); + getCreatorTwitterUrl = require('../../../../core/frontend/meta/creator_url'); describe('getCreatorTwitterUrl', function () { it('should return author twitter url if post and has url', diff --git a/core/test/unit/data/meta/description_spec.js b/test/unit/data/meta/description_spec.js similarity index 99% rename from core/test/unit/data/meta/description_spec.js rename to test/unit/data/meta/description_spec.js index 86ebaf8d82..d45593d8ba 100644 --- a/core/test/unit/data/meta/description_spec.js +++ b/test/unit/data/meta/description_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const sinon = require('sinon'); -const getMetaDescription = require('../../../../frontend/meta/description'); -const settingsCache = require('../../../../server/services/settings/cache'); +const getMetaDescription = require('../../../../core/frontend/meta/description'); +const settingsCache = require('../../../../core/server/services/settings/cache'); describe('getMetaDescription', function () { let localSettingsCache = {}; diff --git a/core/test/unit/data/meta/excerpt_spec.js b/test/unit/data/meta/excerpt_spec.js similarity index 98% rename from core/test/unit/data/meta/excerpt_spec.js rename to test/unit/data/meta/excerpt_spec.js index cafe4e2d08..98f673f73a 100644 --- a/core/test/unit/data/meta/excerpt_spec.js +++ b/test/unit/data/meta/excerpt_spec.js @@ -1,5 +1,5 @@ var should = require('should'), - getExcerpt = require('../../../../frontend/meta/excerpt'); + getExcerpt = require('../../../../core/frontend/meta/excerpt'); describe('getExcerpt', function () { it('should return html excerpt with no html', function () { diff --git a/core/test/unit/data/meta/image-dimensions_spec.js b/test/unit/data/meta/image-dimensions_spec.js similarity index 99% rename from core/test/unit/data/meta/image-dimensions_spec.js rename to test/unit/data/meta/image-dimensions_spec.js index 7a53e98260..b7f3c667f3 100644 --- a/core/test/unit/data/meta/image-dimensions_spec.js +++ b/test/unit/data/meta/image-dimensions_spec.js @@ -1,7 +1,7 @@ var should = require('should'), sinon = require('sinon'), rewire = require('rewire'), - getImageDimensions = rewire('../../../../frontend/meta/image-dimensions'); + getImageDimensions = rewire('../../../../core/frontend/meta/image-dimensions'); describe('getImageDimensions', function () { var sizeOfStub; diff --git a/core/test/unit/data/meta/keywords_spec.js b/test/unit/data/meta/keywords_spec.js similarity index 92% rename from core/test/unit/data/meta/keywords_spec.js rename to test/unit/data/meta/keywords_spec.js index 766434225b..03fbeb4493 100644 --- a/core/test/unit/data/meta/keywords_spec.js +++ b/test/unit/data/meta/keywords_spec.js @@ -1,7 +1,7 @@ var should = require('should'), sinon = require('sinon'), - models = require('../../../../server/models'), - getKeywords = require('../../../../frontend/meta/keywords'); + models = require('../../../../core/server/models'), + getKeywords = require('../../../../core/frontend/meta/keywords'); describe('getKeywords', function () { before(function () { diff --git a/core/test/unit/data/meta/modified_date_spec.js b/test/unit/data/meta/modified_date_spec.js similarity index 94% rename from core/test/unit/data/meta/modified_date_spec.js rename to test/unit/data/meta/modified_date_spec.js index 6a2e171e51..4e172075b8 100644 --- a/core/test/unit/data/meta/modified_date_spec.js +++ b/test/unit/data/meta/modified_date_spec.js @@ -1,5 +1,5 @@ var should = require('should'), - getModifiedDate = require('../../../../frontend/meta/modified_date'); + getModifiedDate = require('../../../../core/frontend/meta/modified_date'); describe('getModifiedDate', function () { it('should return updated at date as ISO 8601 from context if exists', function () { diff --git a/core/test/unit/data/meta/og_image_spec.js b/test/unit/data/meta/og_image_spec.js similarity index 97% rename from core/test/unit/data/meta/og_image_spec.js rename to test/unit/data/meta/og_image_spec.js index 86e17bb3c8..e1a2af62bd 100644 --- a/core/test/unit/data/meta/og_image_spec.js +++ b/test/unit/data/meta/og_image_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const sinon = require('sinon'); -const getOgImage = require('../../../../frontend/meta/og_image'); -const settingsCache = require('../../../../server/services/settings/cache'); +const getOgImage = require('../../../../core/frontend/meta/og_image'); +const settingsCache = require('../../../../core/server/services/settings/cache'); describe('getOgImage', function () { let localSettingsCache = {}; diff --git a/core/test/unit/data/meta/og_type_spec.js b/test/unit/data/meta/og_type_spec.js similarity index 93% rename from core/test/unit/data/meta/og_type_spec.js rename to test/unit/data/meta/og_type_spec.js index 818545d81d..70a066534e 100644 --- a/core/test/unit/data/meta/og_type_spec.js +++ b/test/unit/data/meta/og_type_spec.js @@ -1,5 +1,5 @@ var should = require('should'), - getOgType = require('../../../../frontend/meta/og_type'); + getOgType = require('../../../../core/frontend/meta/og_type'); describe('getOgType', function () { it('should return og type profile if context is type author', function () { diff --git a/core/test/unit/data/meta/paginated_url_spec.js b/test/unit/data/meta/paginated_url_spec.js similarity index 98% rename from core/test/unit/data/meta/paginated_url_spec.js rename to test/unit/data/meta/paginated_url_spec.js index c009f75c7a..2e8995476b 100644 --- a/core/test/unit/data/meta/paginated_url_spec.js +++ b/test/unit/data/meta/paginated_url_spec.js @@ -1,6 +1,6 @@ var should = require('should'), sinon = require('sinon'), - getPaginatedUrl = require('../../../../frontend/meta/paginated_url'), + getPaginatedUrl = require('../../../../core/frontend/meta/paginated_url'), urlUtils = require('../../../utils/urlUtils'); describe('getPaginatedUrl', function () { diff --git a/core/test/unit/data/meta/published_date_spec.js b/test/unit/data/meta/published_date_spec.js similarity index 95% rename from core/test/unit/data/meta/published_date_spec.js rename to test/unit/data/meta/published_date_spec.js index 296c48e691..2de9b20f96 100644 --- a/core/test/unit/data/meta/published_date_spec.js +++ b/test/unit/data/meta/published_date_spec.js @@ -1,5 +1,5 @@ var should = require('should'), - getPublishedDate = require('../../../../frontend/meta/published_date'); + getPublishedDate = require('../../../../core/frontend/meta/published_date'); describe('getPublishedDate', function () { it('should return published at date as ISO 8601 from context if exists', function () { diff --git a/core/test/unit/data/meta/rss_url_spec.js b/test/unit/data/meta/rss_url_spec.js similarity index 83% rename from core/test/unit/data/meta/rss_url_spec.js rename to test/unit/data/meta/rss_url_spec.js index 2f1d13e5e5..ed4a5248be 100644 --- a/core/test/unit/data/meta/rss_url_spec.js +++ b/test/unit/data/meta/rss_url_spec.js @@ -1,7 +1,7 @@ const should = require('should'), sinon = require('sinon'), - routing = require('../../../../frontend/services/routing'), - getRssUrl = require('../../../../frontend/meta/rss_url'); + routing = require('../../../../core/frontend/services/routing'), + getRssUrl = require('../../../../core/frontend/meta/rss_url'); describe('getRssUrl', function () { beforeEach(function () { diff --git a/core/test/unit/data/meta/schema_spec.js b/test/unit/data/meta/schema_spec.js similarity index 99% rename from core/test/unit/data/meta/schema_spec.js rename to test/unit/data/meta/schema_spec.js index e34eec6df1..8db88604ac 100644 --- a/core/test/unit/data/meta/schema_spec.js +++ b/test/unit/data/meta/schema_spec.js @@ -1,5 +1,5 @@ var should = require('should'), - getSchema = require('../../../../frontend/meta/schema'), + getSchema = require('../../../../core/frontend/meta/schema'), markdownToMobiledoc = require('../../../utils/fixtures/data-generator').markdownToMobiledoc; describe('getSchema', function () { diff --git a/core/test/unit/data/meta/structured_data_spec.js b/test/unit/data/meta/structured_data_spec.js similarity index 98% rename from core/test/unit/data/meta/structured_data_spec.js rename to test/unit/data/meta/structured_data_spec.js index 639a2bd322..0b7142ea59 100644 --- a/core/test/unit/data/meta/structured_data_spec.js +++ b/test/unit/data/meta/structured_data_spec.js @@ -1,5 +1,5 @@ var should = require('should'), - getStructuredData = require('../../../../frontend/meta/structured_data'); + getStructuredData = require('../../../../core/frontend/meta/structured_data'); describe('getStructuredData', function () { it('should return structured data from metadata per post', function (done) { diff --git a/core/test/unit/data/meta/title_spec.js b/test/unit/data/meta/title_spec.js similarity index 99% rename from core/test/unit/data/meta/title_spec.js rename to test/unit/data/meta/title_spec.js index 94bdb82656..8be8a50f83 100644 --- a/core/test/unit/data/meta/title_spec.js +++ b/test/unit/data/meta/title_spec.js @@ -1,7 +1,7 @@ var should = require('should'), sinon = require('sinon'), - getTitle = require('../../../../frontend/meta/title'), - settingsCache = require('../../../../server/services/settings/cache'); + getTitle = require('../../../../core/frontend/meta/title'), + settingsCache = require('../../../../core/server/services/settings/cache'); describe('getTitle', function () { var localSettingsCache = {}; diff --git a/core/test/unit/data/meta/twitter_image_spec.js b/test/unit/data/meta/twitter_image_spec.js similarity index 97% rename from core/test/unit/data/meta/twitter_image_spec.js rename to test/unit/data/meta/twitter_image_spec.js index fcee3c76b3..f7d9fba907 100644 --- a/core/test/unit/data/meta/twitter_image_spec.js +++ b/test/unit/data/meta/twitter_image_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const sinon = require('sinon'); -const getTwitterImage = require('../../../../frontend/meta/twitter_image'); -const settingsCache = require('../../../../server/services/settings/cache'); +const getTwitterImage = require('../../../../core/frontend/meta/twitter_image'); +const settingsCache = require('../../../../core/server/services/settings/cache'); describe('getTwitterImage', function () { let localSettingsCache = {}; diff --git a/core/test/unit/data/meta/url_spec.js b/test/unit/data/meta/url_spec.js similarity index 96% rename from core/test/unit/data/meta/url_spec.js rename to test/unit/data/meta/url_spec.js index b8eadbaf8e..5003204b66 100644 --- a/core/test/unit/data/meta/url_spec.js +++ b/test/unit/data/meta/url_spec.js @@ -1,9 +1,9 @@ const should = require('should'), sinon = require('sinon'), - urlUtils = require('../../../../server/lib/url-utils'), - urlService = require('../../../../frontend/services/url'), - getUrl = require('../../../../frontend/meta/url'), - testUtils = require('../../../utils/'); + urlUtils = require('../../../../core/server/lib/url-utils'), + urlService = require('../../../../core/frontend/services/url'), + getUrl = require('../../../../core/frontend/meta/url'), + testUtils = require('../../../utils'); describe('getUrl', function () { beforeEach(function () { diff --git a/core/test/unit/data/schema/fixtures/utils_spec.js b/test/unit/data/schema/fixtures/utils_spec.js similarity index 97% rename from core/test/unit/data/schema/fixtures/utils_spec.js rename to test/unit/data/schema/fixtures/utils_spec.js index 408c092863..88dcf167b7 100644 --- a/core/test/unit/data/schema/fixtures/utils_spec.js +++ b/test/unit/data/schema/fixtures/utils_spec.js @@ -3,10 +3,10 @@ var should = require('should'), Promise = require('bluebird'), rewire = require('rewire'), - models = require('../../../../../server/models'), - baseUtils = require('../../../../../server/models/base/utils'), - fixtureUtils = rewire('../../../../../server/data/schema/fixtures/utils'), - fixtures = require('../../../../../server/data/schema/fixtures/fixtures'); + models = require('../../../../../core/server/models'), + baseUtils = require('../../../../../core/server/models/base/utils'), + fixtureUtils = rewire('../../../../../core/server/data/schema/fixtures/utils'), + fixtures = require('../../../../../core/server/data/schema/fixtures/fixtures'); describe('Migration Fixture Utils', function () { var loggerStub; diff --git a/core/test/unit/data/schema/integrity_spec.js b/test/unit/data/schema/integrity_spec.js similarity index 92% rename from core/test/unit/data/schema/integrity_spec.js rename to test/unit/data/schema/integrity_spec.js index 119fbf2850..f63440d0ba 100644 --- a/core/test/unit/data/schema/integrity_spec.js +++ b/test/unit/data/schema/integrity_spec.js @@ -1,8 +1,8 @@ var should = require('should'), _ = require('lodash'), crypto = require('crypto'), - schema = require('../../../../server/data/schema'), - fixtures = require('../../../../server/data/schema/fixtures'); + schema = require('../../../../core/server/data/schema'), + fixtures = require('../../../../core/server/data/schema/fixtures'); /** * @NOTE diff --git a/core/test/unit/data/validation/index_spec.js b/test/unit/data/validation/index_spec.js similarity index 98% rename from core/test/unit/data/validation/index_spec.js rename to test/unit/data/validation/index_spec.js index acb5724f9c..43629cd61a 100644 --- a/core/test/unit/data/validation/index_spec.js +++ b/test/unit/data/validation/index_spec.js @@ -2,8 +2,8 @@ var should = require('should'), _ = require('lodash'), ObjectId = require('bson-objectid'), testUtils = require('../../../utils'), - models = require('../../../../server/models'), - validation = require('../../../../server/data/validation'); + models = require('../../../../core/server/models'), + validation = require('../../../../core/server/data/validation'); // Validate our customisations describe('Validation', function () { diff --git a/core/test/unit/data/xml/sitemap/generator_spec.js b/test/unit/data/xml/sitemap/generator_spec.js similarity index 94% rename from core/test/unit/data/xml/sitemap/generator_spec.js rename to test/unit/data/xml/sitemap/generator_spec.js index 7a56e6af64..604abe9d34 100644 --- a/core/test/unit/data/xml/sitemap/generator_spec.js +++ b/test/unit/data/xml/sitemap/generator_spec.js @@ -3,12 +3,12 @@ const should = require('should'), ObjectId = require('bson-objectid'), _ = require('lodash'), testUtils = require('../../../../utils'), - urlUtils = require('../../../../../server/lib/url-utils'), - IndexGenerator = require('../../../../../frontend/services/sitemap/index-generator'), - PostGenerator = require('../../../../../frontend/services/sitemap/post-generator'), - PageGenerator = require('../../../../../frontend/services/sitemap/page-generator'), - TagGenerator = require('../../../../../frontend/services/sitemap/tag-generator'), - UserGenerator = require('../../../../../frontend/services/sitemap/user-generator'); + urlUtils = require('../../../../../core/server/lib/url-utils'), + IndexGenerator = require('../../../../../core/frontend/services/sitemap/index-generator'), + PostGenerator = require('../../../../../core/frontend/services/sitemap/post-generator'), + PageGenerator = require('../../../../../core/frontend/services/sitemap/page-generator'), + TagGenerator = require('../../../../../core/frontend/services/sitemap/tag-generator'), + UserGenerator = require('../../../../../core/frontend/services/sitemap/user-generator'); should.Assertion.add('ValidUrlNode', function (options) { // Check urlNode looks correct diff --git a/core/test/unit/data/xml/sitemap/manager_spec.js b/test/unit/data/xml/sitemap/manager_spec.js similarity index 85% rename from core/test/unit/data/xml/sitemap/manager_spec.js rename to test/unit/data/xml/sitemap/manager_spec.js index b3b04e5d17..452df88a7f 100644 --- a/core/test/unit/data/xml/sitemap/manager_spec.js +++ b/test/unit/data/xml/sitemap/manager_spec.js @@ -2,13 +2,13 @@ const should = require('should'), sinon = require('sinon'), // Stuff we are testing - common = require('../../../../../server/lib/common'), - SiteMapManager = require('../../../../../frontend/services/sitemap/manager'), - PostGenerator = require('../../../../../frontend/services/sitemap/post-generator'), - PageGenerator = require('../../../../../frontend/services/sitemap/page-generator'), - TagGenerator = require('../../../../../frontend/services/sitemap/tag-generator'), - UserGenerator = require('../../../../../frontend/services/sitemap/user-generator'), - IndexGenerator = require('../../../../../frontend/services/sitemap/index-generator'); + common = require('../../../../../core/server/lib/common'), + SiteMapManager = require('../../../../../core/frontend/services/sitemap/manager'), + PostGenerator = require('../../../../../core/frontend/services/sitemap/post-generator'), + PageGenerator = require('../../../../../core/frontend/services/sitemap/page-generator'), + TagGenerator = require('../../../../../core/frontend/services/sitemap/tag-generator'), + UserGenerator = require('../../../../../core/frontend/services/sitemap/user-generator'), + IndexGenerator = require('../../../../../core/frontend/services/sitemap/index-generator'); describe('Unit: sitemap/manager', function () { let eventsToRemember; diff --git a/core/test/unit/helpers/asset_spec.js b/test/unit/helpers/asset_spec.js similarity index 95% rename from core/test/unit/helpers/asset_spec.js rename to test/unit/helpers/asset_spec.js index 351beec733..b8d73293c3 100644 --- a/core/test/unit/helpers/asset_spec.js +++ b/test/unit/helpers/asset_spec.js @@ -4,8 +4,8 @@ var should = require('should'), sinon = require('sinon'), configUtils = require('../../utils/configUtils'), - helpers = require('../../../frontend/helpers'), - settingsCache = require('../../../server/services/settings/cache'); + helpers = require('../../../core/frontend/helpers'), + settingsCache = require('../../../core/server/services/settings/cache'); describe('{{asset}} helper', function () { var rendered, localSettingsCache = {}; diff --git a/core/test/unit/helpers/author_spec.js b/test/unit/helpers/author_spec.js similarity index 93% rename from core/test/unit/helpers/author_spec.js rename to test/unit/helpers/author_spec.js index 7e901359b9..d086f1e62a 100644 --- a/core/test/unit/helpers/author_spec.js +++ b/test/unit/helpers/author_spec.js @@ -1,8 +1,8 @@ const should = require('should'), sinon = require('sinon'), testUtils = require('../../utils'), - urlService = require('../../../frontend/services/url'), - helpers = require('../../../frontend/helpers'); + urlService = require('../../../core/frontend/services/url'), + helpers = require('../../../core/frontend/helpers'); describe('{{author}} helper', function () { beforeEach(function () { diff --git a/core/test/unit/helpers/authors_spec.js b/test/unit/helpers/authors_spec.js similarity index 97% rename from core/test/unit/helpers/authors_spec.js rename to test/unit/helpers/authors_spec.js index 6ac7dae3eb..075c3b5608 100644 --- a/core/test/unit/helpers/authors_spec.js +++ b/test/unit/helpers/authors_spec.js @@ -1,8 +1,8 @@ const should = require('should'), sinon = require('sinon'), - urlService = require('../../../frontend/services/url'), - helpers = require('../../../frontend/helpers'), - models = require('../../../server/models'), + urlService = require('../../../core/frontend/services/url'), + helpers = require('../../../core/frontend/helpers'), + models = require('../../../core/server/models'), testUtils = require('../../utils'); describe('{{authors}} helper', function () { diff --git a/core/test/unit/helpers/body_class_spec.js b/test/unit/helpers/body_class_spec.js similarity index 97% rename from core/test/unit/helpers/body_class_spec.js rename to test/unit/helpers/body_class_spec.js index b3c0b0abed..d205369e40 100644 --- a/core/test/unit/helpers/body_class_spec.js +++ b/test/unit/helpers/body_class_spec.js @@ -1,8 +1,8 @@ var should = require('should'), - themeList = require('../../../frontend/services/themes/list'), + themeList = require('../../../core/frontend/services/themes/list'), // Stuff we are testing - helpers = require('../../../frontend/helpers'); + helpers = require('../../../core/frontend/helpers'); describe('{{body_class}} helper', function () { var options = {}; diff --git a/core/test/unit/helpers/cancel_link_spec.js b/test/unit/helpers/cancel_link_spec.js similarity index 96% rename from core/test/unit/helpers/cancel_link_spec.js rename to test/unit/helpers/cancel_link_spec.js index dec799de1c..557fdb721d 100644 --- a/core/test/unit/helpers/cancel_link_spec.js +++ b/test/unit/helpers/cancel_link_spec.js @@ -1,6 +1,6 @@ const should = require('should'); -const hbs = require('../../../frontend/services/themes/engine'); -const helpers = require('../../../frontend/helpers'); +const hbs = require('../../../core/frontend/services/themes/engine'); +const helpers = require('../../../core/frontend/helpers'); const configUtils = require('../../utils/configUtils'); describe('{{cancel_link}} helper', function () { diff --git a/core/test/unit/helpers/concat_spec.js b/test/unit/helpers/concat_spec.js similarity index 95% rename from core/test/unit/helpers/concat_spec.js rename to test/unit/helpers/concat_spec.js index 7a8e4a7765..8075b21c18 100644 --- a/core/test/unit/helpers/concat_spec.js +++ b/test/unit/helpers/concat_spec.js @@ -1,6 +1,6 @@ const should = require('should'); -const helpers = require('../../../../core/frontend/helpers'); -const handlebars = require('../../../../core/frontend/services/themes/engine').handlebars; +const helpers = require('../../../core/frontend/helpers'); +const handlebars = require('../../../core/frontend/services/themes/engine').handlebars; const configUtils = require('../../utils/configUtils'); diff --git a/core/test/unit/helpers/content_spec.js b/test/unit/helpers/content_spec.js similarity index 97% rename from core/test/unit/helpers/content_spec.js rename to test/unit/helpers/content_spec.js index 297534a0c2..05a9f98cb5 100644 --- a/core/test/unit/helpers/content_spec.js +++ b/test/unit/helpers/content_spec.js @@ -1,7 +1,7 @@ var should = require('should'), // Stuff we are testing - helpers = require('../../../frontend/helpers'); + helpers = require('../../../core/frontend/helpers'); describe('{{content}} helper', function () { it('renders empty string when null', function () { diff --git a/core/test/unit/helpers/date_spec.js b/test/unit/helpers/date_spec.js similarity index 97% rename from core/test/unit/helpers/date_spec.js rename to test/unit/helpers/date_spec.js index 051cac6729..0b72518b39 100644 --- a/core/test/unit/helpers/date_spec.js +++ b/test/unit/helpers/date_spec.js @@ -1,7 +1,7 @@ var should = require('should'), // Stuff we are testing - helpers = require('../../../frontend/helpers'), + helpers = require('../../../core/frontend/helpers'), moment = require('moment-timezone'); describe('{{date}} helper', function () { diff --git a/core/test/unit/helpers/encode_spec.js b/test/unit/helpers/encode_spec.js similarity index 87% rename from core/test/unit/helpers/encode_spec.js rename to test/unit/helpers/encode_spec.js index f8f3acc5a8..c8b17b1c4c 100644 --- a/core/test/unit/helpers/encode_spec.js +++ b/test/unit/helpers/encode_spec.js @@ -1,7 +1,7 @@ var should = require('should'), // Stuff we are testing - helpers = require('../../../frontend/helpers'); + helpers = require('../../../core/frontend/helpers'); describe('{{encode}} helper', function () { it('can escape URI', function () { diff --git a/core/test/unit/helpers/excerpt_spec.js b/test/unit/helpers/excerpt_spec.js similarity index 99% rename from core/test/unit/helpers/excerpt_spec.js rename to test/unit/helpers/excerpt_spec.js index 9a71832110..747b7cde92 100644 --- a/core/test/unit/helpers/excerpt_spec.js +++ b/test/unit/helpers/excerpt_spec.js @@ -1,7 +1,7 @@ const should = require('should'), // Stuff we are testing - helpers = require('../../../frontend/helpers'); + helpers = require('../../../core/frontend/helpers'); describe('{{excerpt}} Helper', function () { it('renders empty string when html, excerpt, and custom_excerpt are null', function () { diff --git a/core/test/unit/helpers/facebook_url_spec.js b/test/unit/helpers/facebook_url_spec.js similarity index 95% rename from core/test/unit/helpers/facebook_url_spec.js rename to test/unit/helpers/facebook_url_spec.js index 5961a4a927..d50243234f 100644 --- a/core/test/unit/helpers/facebook_url_spec.js +++ b/test/unit/helpers/facebook_url_spec.js @@ -1,7 +1,7 @@ var should = require('should'), // Stuff we are testing - helpers = require('../../../frontend/helpers'); + helpers = require('../../../core/frontend/helpers'); describe('{{facebook_url}} helper', function () { var options = {data: {site: {}}}; diff --git a/core/test/unit/helpers/foreach_spec.js b/test/unit/helpers/foreach_spec.js similarity index 99% rename from core/test/unit/helpers/foreach_spec.js rename to test/unit/helpers/foreach_spec.js index 41e6b7d3bd..2eeecdec64 100644 --- a/core/test/unit/helpers/foreach_spec.js +++ b/test/unit/helpers/foreach_spec.js @@ -1,8 +1,8 @@ var should = require('should'), sinon = require('sinon'), _ = require('lodash'), - helpers = require('../../../../core/frontend/helpers'), - handlebars = require('../../../../core/frontend/services/themes/engine').handlebars; + helpers = require('../../../core/frontend/helpers'), + handlebars = require('../../../core/frontend/services/themes/engine').handlebars; describe('{{#foreach}} helper', function () { var options, context, _this, resultData; diff --git a/core/test/unit/helpers/get_spec.js b/test/unit/helpers/get_spec.js similarity index 98% rename from core/test/unit/helpers/get_spec.js rename to test/unit/helpers/get_spec.js index fa20db11c5..38da8b51ef 100644 --- a/core/test/unit/helpers/get_spec.js +++ b/test/unit/helpers/get_spec.js @@ -3,9 +3,9 @@ var should = require('should'), Promise = require('bluebird'), // Stuff we are testing - helpers = require('../../../frontend/helpers'), - models = require('../../../server/models'), - api = require('../../../server/api'); + helpers = require('../../../core/frontend/helpers'), + models = require('../../../core/server/models'), + api = require('../../../core/server/api'); describe('{{#get}} helper', function () { var fn, inverse; diff --git a/core/test/unit/helpers/ghost_foot_spec.js b/test/unit/helpers/ghost_foot_spec.js similarity index 96% rename from core/test/unit/helpers/ghost_foot_spec.js rename to test/unit/helpers/ghost_foot_spec.js index b6ba2ceaf8..9025faa0e3 100644 --- a/core/test/unit/helpers/ghost_foot_spec.js +++ b/test/unit/helpers/ghost_foot_spec.js @@ -1,7 +1,7 @@ var should = require('should'), sinon = require('sinon'), - helpers = require('../../../frontend/helpers'), - proxy = require('../../../frontend/helpers/proxy'), + helpers = require('../../../core/frontend/helpers'), + proxy = require('../../../core/frontend/helpers/proxy'), settingsCache = proxy.settingsCache; describe('{{ghost_foot}} helper', function () { diff --git a/core/test/unit/helpers/ghost_head_spec.js b/test/unit/helpers/ghost_head_spec.js similarity index 99% rename from core/test/unit/helpers/ghost_head_spec.js rename to test/unit/helpers/ghost_head_spec.js index 9f8c816a7d..3eed18094a 100644 --- a/core/test/unit/helpers/ghost_head_spec.js +++ b/test/unit/helpers/ghost_head_spec.js @@ -6,13 +6,13 @@ const should = require('should'), testUtils = require('../../utils'), testUrlUtils = require('../../utils/urlUtils'), configUtils = require('../../utils/configUtils'), - themes = require('../../../frontend/services/themes'), - models = require('../../../server/models'), - imageLib = require('../../../server/lib/image'), - routing = require('../../../frontend/services/routing'), - urlService = require('../../../frontend/services/url'), - helpers = require('../../../frontend/helpers'), - proxy = require('../../../frontend/helpers/proxy'), + themes = require('../../../core/frontend/services/themes'), + models = require('../../../core/server/models'), + imageLib = require('../../../core/server/lib/image'), + routing = require('../../../core/frontend/services/routing'), + urlService = require('../../../core/frontend/services/url'), + helpers = require('../../../core/frontend/helpers'), + proxy = require('../../../core/frontend/helpers/proxy'), settingsCache = proxy.settingsCache; describe('{{ghost_head}} helper', function () { diff --git a/core/test/unit/helpers/has_spec.js b/test/unit/helpers/has_spec.js similarity index 99% rename from core/test/unit/helpers/has_spec.js rename to test/unit/helpers/has_spec.js index 6760d9f1a6..8ad1baee89 100644 --- a/core/test/unit/helpers/has_spec.js +++ b/test/unit/helpers/has_spec.js @@ -2,7 +2,7 @@ var should = require('should'), sinon = require('sinon'), // Stuff we are testing - helpers = require('../../../frontend/helpers'); + helpers = require('../../../core/frontend/helpers'); describe('{{#has}} helper', function () { var fn, inverse, thisCtx, handlebarsOptions; diff --git a/core/test/unit/helpers/img_url_spec.js b/test/unit/helpers/img_url_spec.js similarity index 98% rename from core/test/unit/helpers/img_url_spec.js rename to test/unit/helpers/img_url_spec.js index 24f4034680..2debec457e 100644 --- a/core/test/unit/helpers/img_url_spec.js +++ b/test/unit/helpers/img_url_spec.js @@ -3,8 +3,8 @@ var should = require('should'), urlUtils = require('../../utils/urlUtils'), // Stuff we are testing - helpers = require('../../../frontend/helpers'), - common = require('../../../server/lib/common'); + helpers = require('../../../core/frontend/helpers'), + common = require('../../../core/server/lib/common'); describe('{{image}} helper', function () { var logWarnStub; diff --git a/core/test/unit/helpers/index_spec.js b/test/unit/helpers/index_spec.js similarity index 92% rename from core/test/unit/helpers/index_spec.js rename to test/unit/helpers/index_spec.js index 4000d7e6f4..5c3616c388 100644 --- a/core/test/unit/helpers/index_spec.js +++ b/test/unit/helpers/index_spec.js @@ -1,9 +1,9 @@ var should = require('should'), _ = require('lodash'), - hbs = require('../../../../core/frontend/services/themes/engine'), + hbs = require('../../../core/frontend/services/themes/engine'), // Stuff we are testing - helpers = require('../../../../core/frontend/helpers'); + helpers = require('../../../core/frontend/helpers'); describe('Helpers', function () { var hbsHelpers = ['each', 'if', 'unless', 'with', 'helperMissing', 'blockHelperMissing', 'log', 'lookup', 'block', 'contentFor'], diff --git a/core/test/unit/helpers/is_spec.js b/test/unit/helpers/is_spec.js similarity index 93% rename from core/test/unit/helpers/is_spec.js rename to test/unit/helpers/is_spec.js index 55e587cb00..71e9ec33db 100644 --- a/core/test/unit/helpers/is_spec.js +++ b/test/unit/helpers/is_spec.js @@ -1,7 +1,7 @@ var should = require('should'), sinon = require('sinon'), - helpers = require('../../../frontend/helpers'), - common = require('../../../server/lib/common'); + helpers = require('../../../core/frontend/helpers'), + common = require('../../../core/server/lib/common'); describe('{{#is}} helper', function () { afterEach(function () { diff --git a/core/test/unit/helpers/lang_spec.js b/test/unit/helpers/lang_spec.js similarity index 70% rename from core/test/unit/helpers/lang_spec.js rename to test/unit/helpers/lang_spec.js index 53cb9fbaba..b6e41ba907 100644 --- a/core/test/unit/helpers/lang_spec.js +++ b/test/unit/helpers/lang_spec.js @@ -1,7 +1,7 @@ const should = require('should'); -const settingsCache = require('../../../server/services/settings/cache'); -const helpers = require('../../../frontend/helpers'); -const proxy = require('../../../frontend/helpers/proxy'); +const settingsCache = require('../../../core/server/services/settings/cache'); +const helpers = require('../../../core/frontend/helpers'); +const proxy = require('../../../core/frontend/helpers/proxy'); describe('{{lang}} helper', function () { beforeEach(function () { diff --git a/core/test/unit/helpers/link_class_spec.js b/test/unit/helpers/link_class_spec.js similarity index 98% rename from core/test/unit/helpers/link_class_spec.js rename to test/unit/helpers/link_class_spec.js index 7fa6b4a17d..e83fffff8a 100644 --- a/core/test/unit/helpers/link_class_spec.js +++ b/test/unit/helpers/link_class_spec.js @@ -1,6 +1,6 @@ const should = require('should'); -const helpers = require('../../../../core/frontend/helpers'); -const handlebars = require('../../../../core/frontend/services/themes/engine').handlebars; +const helpers = require('../../../core/frontend/helpers'); +const handlebars = require('../../../core/frontend/services/themes/engine').handlebars; const configUtils = require('../../utils/configUtils'); diff --git a/core/test/unit/helpers/link_spec.js b/test/unit/helpers/link_spec.js similarity index 99% rename from core/test/unit/helpers/link_spec.js rename to test/unit/helpers/link_spec.js index 198e4060a7..78f884b1e1 100644 --- a/core/test/unit/helpers/link_spec.js +++ b/test/unit/helpers/link_spec.js @@ -1,6 +1,6 @@ const should = require('should'); -const helpers = require('../../../../core/frontend/helpers'); -const handlebars = require('../../../../core/frontend/services/themes/engine').handlebars; +const helpers = require('../../../core/frontend/helpers'); +const handlebars = require('../../../core/frontend/services/themes/engine').handlebars; const configUtils = require('../../utils/configUtils'); diff --git a/core/test/unit/helpers/meta_description_spec.js b/test/unit/helpers/meta_description_spec.js similarity index 97% rename from core/test/unit/helpers/meta_description_spec.js rename to test/unit/helpers/meta_description_spec.js index 2460618c46..3b8bc475c7 100644 --- a/core/test/unit/helpers/meta_description_spec.js +++ b/test/unit/helpers/meta_description_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const sinon = require('sinon'); -const helpers = require('../../../frontend/helpers'); -const settingsCache = require('../../../server/services/settings/cache'); +const helpers = require('../../../core/frontend/helpers'); +const settingsCache = require('../../../core/server/services/settings/cache'); describe('{{meta_description}} helper', function () { const localSettingsCache = {}; diff --git a/core/test/unit/helpers/meta_title_spec.js b/test/unit/helpers/meta_title_spec.js similarity index 98% rename from core/test/unit/helpers/meta_title_spec.js rename to test/unit/helpers/meta_title_spec.js index b107dc4252..ac34606169 100644 --- a/core/test/unit/helpers/meta_title_spec.js +++ b/test/unit/helpers/meta_title_spec.js @@ -1,8 +1,8 @@ var should = require('should'), sinon = require('sinon'), configUtils = require('../../utils/configUtils'), - helpers = require('../../../frontend/helpers'), - settingsCache = require('../../../server/services/settings/cache'); + helpers = require('../../../core/frontend/helpers'), + settingsCache = require('../../../core/server/services/settings/cache'); describe('{{meta_title}} helper', function () { describe('no meta_title', function () { diff --git a/core/test/unit/helpers/navigation_spec.js b/test/unit/helpers/navigation_spec.js similarity index 97% rename from core/test/unit/helpers/navigation_spec.js rename to test/unit/helpers/navigation_spec.js index 7151f07e3b..e1dd61e008 100644 --- a/core/test/unit/helpers/navigation_spec.js +++ b/test/unit/helpers/navigation_spec.js @@ -1,8 +1,8 @@ const should = require('should'); -const hbs = require('../../../frontend/services/themes/engine'); +const hbs = require('../../../core/frontend/services/themes/engine'); const configUtils = require('../../utils/configUtils'); const path = require('path'); -const helpers = require('../../../frontend/helpers'); +const helpers = require('../../../core/frontend/helpers'); const runHelper = data => helpers.navigation.call({}, data); const runHelperThunk = data => () => runHelper(data); @@ -219,9 +219,7 @@ describe('{{navigation}} helper with custom template', function () { var optionsData; before(function (done) { - hbs.express4({ - partialsDir: [path.resolve(configUtils.config.get('paths').corePath, 'test/unit/helpers/test_tpl')] - }); + hbs.express4({partialsDir: [path.resolve(__dirname, './test_tpl')]}); hbs.cachePartials(function () { done(); diff --git a/core/test/unit/helpers/next_post_spec.js b/test/unit/helpers/next_post_spec.js similarity index 99% rename from core/test/unit/helpers/next_post_spec.js rename to test/unit/helpers/next_post_spec.js index 7631cc11e6..1e3775a631 100644 --- a/core/test/unit/helpers/next_post_spec.js +++ b/test/unit/helpers/next_post_spec.js @@ -3,9 +3,9 @@ var should = require('should'), Promise = require('bluebird'), markdownToMobiledoc = require('../../utils/fixtures/data-generator').markdownToMobiledoc, - helpers = require('../../../frontend/helpers'), - api = require('../../../server/api'), - common = require('../../../server/lib/common'); + helpers = require('../../../core/frontend/helpers'), + api = require('../../../core/server/api'), + common = require('../../../core/server/lib/common'); describe('{{next_post}} helper', function () { let locals; diff --git a/core/test/unit/helpers/page_url_spec.js b/test/unit/helpers/page_url_spec.js similarity index 96% rename from core/test/unit/helpers/page_url_spec.js rename to test/unit/helpers/page_url_spec.js index cac8bd7598..29f5749017 100644 --- a/core/test/unit/helpers/page_url_spec.js +++ b/test/unit/helpers/page_url_spec.js @@ -1,7 +1,7 @@ var should = require('should'), // Stuff we are testing - helpers = require('../../../frontend/helpers'); + helpers = require('../../../core/frontend/helpers'); describe('{{page_url}} helper', function () { var options = {data: {root: {pagination: {}}}}; diff --git a/core/test/unit/helpers/pagination_spec.js b/test/unit/helpers/pagination_spec.js similarity index 96% rename from core/test/unit/helpers/pagination_spec.js rename to test/unit/helpers/pagination_spec.js index 5b118c2969..08e01eee64 100644 --- a/core/test/unit/helpers/pagination_spec.js +++ b/test/unit/helpers/pagination_spec.js @@ -1,9 +1,9 @@ var should = require('should'), - hbs = require('../../../frontend/services/themes/engine'), + hbs = require('../../../core/frontend/services/themes/engine'), configUtils = require('../../utils/configUtils'), path = require('path'), - helpers = require('../../../frontend/helpers'); + helpers = require('../../../core/frontend/helpers'); describe('{{pagination}} helper', function () { before(function (done) { @@ -122,7 +122,7 @@ describe('{{pagination}} helper', function () { describe('{{pagination}} helper with custom template', function () { before(function (done) { - hbs.express4({partialsDir: [path.resolve(configUtils.config.get('paths').corePath, 'test/unit/helpers/test_tpl')]}); + hbs.express4({partialsDir: [path.resolve(__dirname, './test_tpl')]}); hbs.cachePartials(function () { done(); diff --git a/core/test/unit/helpers/plural_spec.js b/test/unit/helpers/plural_spec.js similarity index 96% rename from core/test/unit/helpers/plural_spec.js rename to test/unit/helpers/plural_spec.js index 082dc8658f..71b9d2aa13 100644 --- a/core/test/unit/helpers/plural_spec.js +++ b/test/unit/helpers/plural_spec.js @@ -1,7 +1,7 @@ var should = require('should'), // Stuff we are testing - helpers = require('../../../frontend/helpers'); + helpers = require('../../../core/frontend/helpers'); describe('{{plural}} helper', function () { it('will show no-value string', function () { diff --git a/core/test/unit/helpers/post_class_spec.js b/test/unit/helpers/post_class_spec.js similarity index 96% rename from core/test/unit/helpers/post_class_spec.js rename to test/unit/helpers/post_class_spec.js index 7197357add..d67de430b9 100644 --- a/core/test/unit/helpers/post_class_spec.js +++ b/test/unit/helpers/post_class_spec.js @@ -1,7 +1,7 @@ var should = require('should'), // Stuff we are testing - helpers = require('../../../frontend/helpers'); + helpers = require('../../../core/frontend/helpers'); describe('{{post_class}} helper', function () { it('can render class string', function () { diff --git a/core/test/unit/helpers/prev_post_spec.js b/test/unit/helpers/prev_post_spec.js similarity index 99% rename from core/test/unit/helpers/prev_post_spec.js rename to test/unit/helpers/prev_post_spec.js index 52daa2a10c..57b32ed1a4 100644 --- a/core/test/unit/helpers/prev_post_spec.js +++ b/test/unit/helpers/prev_post_spec.js @@ -3,9 +3,9 @@ var should = require('should'), Promise = require('bluebird'), markdownToMobiledoc = require('../../utils/fixtures/data-generator').markdownToMobiledoc, - helpers = require('../../../frontend/helpers'), - api = require('../../../server/api'), - common = require('../../../server/lib/common'); + helpers = require('../../../core/frontend/helpers'), + api = require('../../../core/server/api'), + common = require('../../../core/server/lib/common'); describe('{{prev_post}} helper', function () { var browsePostsStub; diff --git a/core/test/unit/helpers/price_spec.js b/test/unit/helpers/price_spec.js similarity index 88% rename from core/test/unit/helpers/price_spec.js rename to test/unit/helpers/price_spec.js index 0b2fc502e3..2029b34b3e 100644 --- a/core/test/unit/helpers/price_spec.js +++ b/test/unit/helpers/price_spec.js @@ -1,6 +1,6 @@ const should = require('should'); -const helpers = require('../../../../core/frontend/helpers'); -const handlebars = require('../../../../core/frontend/services/themes/engine').handlebars; +const helpers = require('../../../core/frontend/helpers'); +const handlebars = require('../../../core/frontend/services/themes/engine').handlebars; function compile(templateString) { const template = handlebars.compile(templateString); @@ -43,4 +43,3 @@ describe('{{price}} helper', function () { .should.equal('20'); }); }); - diff --git a/core/test/unit/helpers/reading_time_spec.js b/test/unit/helpers/reading_time_spec.js similarity index 99% rename from core/test/unit/helpers/reading_time_spec.js rename to test/unit/helpers/reading_time_spec.js index 71e9e5fa9f..f36e62f51e 100644 --- a/core/test/unit/helpers/reading_time_spec.js +++ b/test/unit/helpers/reading_time_spec.js @@ -1,7 +1,7 @@ var should = require('should'), // Stuff we are testing - helpers = require('../../../frontend/helpers'); + helpers = require('../../../core/frontend/helpers'); var almostOneMinute = '

Ghost has a number of different user roles for your team

' + diff --git a/core/test/unit/helpers/t_spec.js b/test/unit/helpers/t_spec.js similarity index 89% rename from core/test/unit/helpers/t_spec.js rename to test/unit/helpers/t_spec.js index 13c2bfbd66..9521a0bb1a 100644 --- a/core/test/unit/helpers/t_spec.js +++ b/test/unit/helpers/t_spec.js @@ -1,8 +1,8 @@ const should = require('should'); const path = require('path'); -const settingsCache = require('../../../server/services/settings/cache'); -const helpers = require('../../../frontend/helpers'); -const themeI18n = require('../../../frontend/services/themes/i18n'); +const settingsCache = require('../../../core/server/services/settings/cache'); +const helpers = require('../../../core/frontend/helpers'); +const themeI18n = require('../../../core/frontend/services/themes/i18n'); const configUtils = require('../../utils/configUtils'); describe('{{t}} helper', function () { diff --git a/core/test/unit/helpers/tags_spec.js b/test/unit/helpers/tags_spec.js similarity index 98% rename from core/test/unit/helpers/tags_spec.js rename to test/unit/helpers/tags_spec.js index 98b62943f7..8e94c17e21 100644 --- a/core/test/unit/helpers/tags_spec.js +++ b/test/unit/helpers/tags_spec.js @@ -1,9 +1,9 @@ const should = require('should'), sinon = require('sinon'), testUtils = require('../../utils'), - urlService = require('../../../frontend/services/url'), - models = require('../../../server/models'), - helpers = require('../../../frontend/helpers'); + urlService = require('../../../core/frontend/services/url'), + models = require('../../../core/server/models'), + helpers = require('../../../core/frontend/helpers'); describe('{{tags}} helper', function () { before(function () { diff --git a/core/test/unit/helpers/template_spec.js b/test/unit/helpers/template_spec.js similarity index 73% rename from core/test/unit/helpers/template_spec.js rename to test/unit/helpers/template_spec.js index 23df0ee0e4..dbd1fff477 100644 --- a/core/test/unit/helpers/template_spec.js +++ b/test/unit/helpers/template_spec.js @@ -1,6 +1,6 @@ var should = require('should'), - hbs = require('../../../../core/frontend/services/themes/engine'), - template = require('../../../../core/frontend/helpers/template'); + hbs = require('../../../core/frontend/services/themes/engine'), + template = require('../../../core/frontend/helpers/template'); describe('Helpers Template', function () { it('can execute a template', function () { diff --git a/core/test/unit/helpers/test_tpl/navigation.hbs b/test/unit/helpers/test_tpl/navigation.hbs similarity index 100% rename from core/test/unit/helpers/test_tpl/navigation.hbs rename to test/unit/helpers/test_tpl/navigation.hbs diff --git a/core/test/unit/helpers/test_tpl/pagination.hbs b/test/unit/helpers/test_tpl/pagination.hbs similarity index 100% rename from core/test/unit/helpers/test_tpl/pagination.hbs rename to test/unit/helpers/test_tpl/pagination.hbs diff --git a/core/test/unit/helpers/title_spec.js b/test/unit/helpers/title_spec.js similarity index 93% rename from core/test/unit/helpers/title_spec.js rename to test/unit/helpers/title_spec.js index 61f1a29894..1fe1e2652f 100644 --- a/core/test/unit/helpers/title_spec.js +++ b/test/unit/helpers/title_spec.js @@ -1,7 +1,7 @@ var should = require('should'), // Stuff we are testing - helpers = require('../../../frontend/helpers'); + helpers = require('../../../core/frontend/helpers'); describe('{{title}} Helper', function () { it('can render title', function () { diff --git a/core/test/unit/helpers/twitter_url_spec.js b/test/unit/helpers/twitter_url_spec.js similarity index 95% rename from core/test/unit/helpers/twitter_url_spec.js rename to test/unit/helpers/twitter_url_spec.js index 8928b08565..abc9fb1cf9 100644 --- a/core/test/unit/helpers/twitter_url_spec.js +++ b/test/unit/helpers/twitter_url_spec.js @@ -1,7 +1,7 @@ var should = require('should'), // Stuff we are testing - helpers = require('../../../frontend/helpers'); + helpers = require('../../../core/frontend/helpers'); describe('{{twitter_url}} helper', function () { var options = {data: {site: {}}}; diff --git a/core/test/unit/helpers/url_spec.js b/test/unit/helpers/url_spec.js similarity index 98% rename from core/test/unit/helpers/url_spec.js rename to test/unit/helpers/url_spec.js index 58fd103c8d..6f9c3b2219 100644 --- a/core/test/unit/helpers/url_spec.js +++ b/test/unit/helpers/url_spec.js @@ -4,9 +4,9 @@ var should = require('should'), testUtils = require('../../utils'), urlUtils = require('../../utils/urlUtils'), markdownToMobiledoc = require('../../utils/fixtures/data-generator').markdownToMobiledoc, - helpers = require('../../../frontend/helpers'), - urlService = require('../../../frontend/services/url'), - api = require('../../../server/api'); + helpers = require('../../../core/frontend/helpers'), + urlService = require('../../../core/frontend/services/url'), + api = require('../../../core/server/api'); describe('{{url}} helper', function () { let rendered; diff --git a/core/test/unit/helpers/utils_spec.js b/test/unit/helpers/utils_spec.js similarity index 100% rename from core/test/unit/helpers/utils_spec.js rename to test/unit/helpers/utils_spec.js diff --git a/core/test/unit/lib/common/errors_spec.js b/test/unit/lib/common/errors_spec.js similarity index 97% rename from core/test/unit/lib/common/errors_spec.js rename to test/unit/lib/common/errors_spec.js index d5d165a251..4e4c1c2155 100644 --- a/core/test/unit/lib/common/errors_spec.js +++ b/test/unit/lib/common/errors_spec.js @@ -1,5 +1,5 @@ var should = require('should'), - common = require('../../../../server/lib/common'); + common = require('../../../../core/server/lib/common'); describe('Errors', function () { it('Ensure we inherit from Error', function () { diff --git a/core/test/unit/lib/fs/package-json/filter_spec.js b/test/unit/lib/fs/package-json/filter_spec.js similarity index 98% rename from core/test/unit/lib/fs/package-json/filter_spec.js rename to test/unit/lib/fs/package-json/filter_spec.js index 6502c104de..3c7f3358d2 100644 --- a/core/test/unit/lib/fs/package-json/filter_spec.js +++ b/test/unit/lib/fs/package-json/filter_spec.js @@ -1,5 +1,5 @@ var should = require('should'), - packageJSON = require('../../../../../server/lib/fs/package-json'); + packageJSON = require('../../../../../core/server/lib/fs/package-json'); describe('lib/fs/package-json', function () { // @TODO: introduce some non-theme package examples diff --git a/core/test/unit/lib/fs/package-json/parse_spec.js b/test/unit/lib/fs/package-json/parse_spec.js similarity index 98% rename from core/test/unit/lib/fs/package-json/parse_spec.js rename to test/unit/lib/fs/package-json/parse_spec.js index 90a5689690..40212eef03 100644 --- a/core/test/unit/lib/fs/package-json/parse_spec.js +++ b/test/unit/lib/fs/package-json/parse_spec.js @@ -1,7 +1,7 @@ var should = require('should'), tmp = require('tmp'), fs = require('fs-extra'), - packageJSON = require('../../../../../server/lib/fs/package-json'); + packageJSON = require('../../../../../core/server/lib/fs/package-json'); describe('lib/fs/package-json: parse', function () { it('should parse valid package.json', function (done) { diff --git a/core/test/unit/lib/fs/package-json/read_spec.js b/test/unit/lib/fs/package-json/read_spec.js similarity index 99% rename from core/test/unit/lib/fs/package-json/read_spec.js rename to test/unit/lib/fs/package-json/read_spec.js index 88c65b00d4..8dd25296d1 100644 --- a/core/test/unit/lib/fs/package-json/read_spec.js +++ b/test/unit/lib/fs/package-json/read_spec.js @@ -2,7 +2,7 @@ var should = require('should'), tmp = require('tmp'), join = require('path').join, fs = require('fs-extra'), - packageJSON = require('../../../../../server/lib/fs/package-json'); + packageJSON = require('../../../../../core/server/lib/fs/package-json'); describe('lib/fs/package-json: read', function () { describe('all', function () { diff --git a/core/test/unit/lib/fs/read-csv_spec.js b/test/unit/lib/fs/read-csv_spec.js similarity index 97% rename from core/test/unit/lib/fs/read-csv_spec.js rename to test/unit/lib/fs/read-csv_spec.js index 97d2aa8043..a692c73ce5 100644 --- a/core/test/unit/lib/fs/read-csv_spec.js +++ b/test/unit/lib/fs/read-csv_spec.js @@ -1,6 +1,6 @@ var should = require('should'), path = require('path'), - fsLib = require('../../../../server/lib/fs'), + fsLib = require('../../../../core/server/lib/fs'), csvPath = path.join(__dirname, '../../../utils/fixtures/csv/'); describe('lib/fs: read csv', function () { diff --git a/core/test/unit/lib/ghost-version_spec.js b/test/unit/lib/ghost-version_spec.js similarity index 96% rename from core/test/unit/lib/ghost-version_spec.js rename to test/unit/lib/ghost-version_spec.js index 1ec00f3f19..5441f6020b 100644 --- a/core/test/unit/lib/ghost-version_spec.js +++ b/test/unit/lib/ghost-version_spec.js @@ -8,7 +8,7 @@ describe('Utils: Ghost Version', function () { const beforeEachIt = function be() { mockUtils.modules.mockNonExistentModule(/package\.json/, {version: version}); - ghostVersionUtils = rewire('../../../server/lib/ghost-version'); + ghostVersionUtils = rewire('../../../core/server/lib/ghost-version'); }; afterEach(function () { diff --git a/core/test/unit/lib/image/blog-icon_spec.js b/test/unit/lib/image/blog-icon_spec.js similarity index 95% rename from core/test/unit/lib/image/blog-icon_spec.js rename to test/unit/lib/image/blog-icon_spec.js index 6eee1cf082..470b6ca4b1 100644 --- a/core/test/unit/lib/image/blog-icon_spec.js +++ b/test/unit/lib/image/blog-icon_spec.js @@ -3,17 +3,17 @@ var should = require('should'), _ = require('lodash'), path = require('path'), rewire = require('rewire'), - settingsCache = require('../../../../server/services/settings/cache'), - storageUtils = require('../../../../server/adapters/storage/utils'), + settingsCache = require('../../../../core/server/services/settings/cache'), + storageUtils = require('../../../../core/server/adapters/storage/utils'), urlUtils = require('../../../utils/urlUtils'), // stuff we are testing - blogIcon = rewire('../../../../server/lib/image/blog-icon'); + blogIcon = rewire('../../../../core/server/lib/image/blog-icon'); describe('lib/image: blog icon', function () { afterEach(function () { sinon.restore(); - rewire('../../../../server/lib/image/blog-icon'); + rewire('../../../../core/server/lib/image/blog-icon'); }); describe('getIconUrl', function () { @@ -90,7 +90,7 @@ describe('lib/image: blog icon', function () { }); it('default ico blog icon', function () { - blogIcon.getIconPath().should.eql(path.join(__dirname, '../../../../server/public/favicon.ico')); + blogIcon.getIconPath().should.eql(path.join(__dirname, '../../../../core/server/public/favicon.ico')); }); }); diff --git a/core/test/unit/lib/image/cached-image-size-from-url_spec.js b/test/unit/lib/image/cached-image-size-from-url_spec.js similarity index 97% rename from core/test/unit/lib/image/cached-image-size-from-url_spec.js rename to test/unit/lib/image/cached-image-size-from-url_spec.js index f2a78765fd..6fe8635c0d 100644 --- a/core/test/unit/lib/image/cached-image-size-from-url_spec.js +++ b/test/unit/lib/image/cached-image-size-from-url_spec.js @@ -4,7 +4,7 @@ var should = require('should'), rewire = require('rewire'), // Stuff we are testing - getCachedImageSizeFromUrl = rewire('../../../../server/lib/image/cached-image-size-from-url'); + getCachedImageSizeFromUrl = rewire('../../../../core/server/lib/image/cached-image-size-from-url'); describe('lib/image: image size cache', function () { var sizeOfStub, diff --git a/core/test/unit/lib/image/gravatar_spec.js b/test/unit/lib/image/gravatar_spec.js similarity index 95% rename from core/test/unit/lib/image/gravatar_spec.js rename to test/unit/lib/image/gravatar_spec.js index 2636f01260..755df638f9 100644 --- a/core/test/unit/lib/image/gravatar_spec.js +++ b/test/unit/lib/image/gravatar_spec.js @@ -1,7 +1,7 @@ var should = require('should'), nock = require('nock'), configUtils = require('../../../utils/configUtils'), - gravatar = require('../../../../server/lib/image/gravatar'); + gravatar = require('../../../../core/server/lib/image/gravatar'); describe('lib/image: gravatar', function () { beforeEach(function () { diff --git a/core/test/unit/lib/image/image-size_spec.js b/test/unit/lib/image/image-size_spec.js similarity index 99% rename from core/test/unit/lib/image/image-size_spec.js rename to test/unit/lib/image/image-size_spec.js index a01324dabf..9e57c7ef1c 100644 --- a/core/test/unit/lib/image/image-size_spec.js +++ b/test/unit/lib/image/image-size_spec.js @@ -4,9 +4,9 @@ const should = require('should'), nock = require('nock'), path = require('path'), configUtils = require('../../../utils/configUtils'), - urlUtils = require('../../../../server/lib/url-utils'), + urlUtils = require('../../../../core/server/lib/url-utils'), errors = require('@tryghost/errors'), - storage = require('../../../../server/adapters/storage'); + storage = require('../../../../core/server/adapters/storage'); describe('lib/image: image size', function () { let imageSize; @@ -20,7 +20,7 @@ describe('lib/image: image size', function () { const GIF1x1 = Buffer.from('R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==', 'base64'); beforeEach(function () { - imageSize = rewire('../../../../server/lib/image/image-size'); + imageSize = rewire('../../../../core/server/lib/image/image-size'); sizeOf = imageSize.__get__('sizeOf'); sizeOfSpy = sinon.spy(sizeOf); diff --git a/core/test/unit/lib/mobiledoc/atoms/soft-return_spec.js b/test/unit/lib/mobiledoc/atoms/soft-return_spec.js similarity index 83% rename from core/test/unit/lib/mobiledoc/atoms/soft-return_spec.js rename to test/unit/lib/mobiledoc/atoms/soft-return_spec.js index af7a5e4846..177ea74427 100644 --- a/core/test/unit/lib/mobiledoc/atoms/soft-return_spec.js +++ b/test/unit/lib/mobiledoc/atoms/soft-return_spec.js @@ -1,5 +1,5 @@ const should = require('should'); -const atom = require('../../../../../server/lib/mobiledoc/atoms/soft-return'); +const atom = require('../../../../../core/server/lib/mobiledoc/atoms/soft-return'); const SimpleDom = require('simple-dom'); const serializer = new SimpleDom.HTMLSerializer(SimpleDom.voidMap); diff --git a/core/test/unit/lib/mobiledoc/renderers/mobiledoc-html-renderer_spec.js b/test/unit/lib/mobiledoc/renderers/mobiledoc-html-renderer_spec.js similarity index 98% rename from core/test/unit/lib/mobiledoc/renderers/mobiledoc-html-renderer_spec.js rename to test/unit/lib/mobiledoc/renderers/mobiledoc-html-renderer_spec.js index a48a7afac9..b4f7547b9d 100644 --- a/core/test/unit/lib/mobiledoc/renderers/mobiledoc-html-renderer_spec.js +++ b/test/unit/lib/mobiledoc/renderers/mobiledoc-html-renderer_spec.js @@ -1,5 +1,5 @@ const should = require('should'); -const converter = require('../../../../../server/lib/mobiledoc/renderers/mobiledoc-html-renderer'); +const converter = require('../../../../../core/server/lib/mobiledoc/renderers/mobiledoc-html-renderer'); describe('Mobiledoc HTML renderer', function () { describe('default', function () { diff --git a/core/test/unit/lib/promise/pipeline_spec.js b/test/unit/lib/promise/pipeline_spec.js similarity index 97% rename from core/test/unit/lib/promise/pipeline_spec.js rename to test/unit/lib/promise/pipeline_spec.js index d2ad3d5df1..ada7531fea 100644 --- a/core/test/unit/lib/promise/pipeline_spec.js +++ b/test/unit/lib/promise/pipeline_spec.js @@ -3,7 +3,7 @@ var should = require('should'), Promise = require('bluebird'), // Stuff we are testing - pipeline = require('../../../../server/lib/promise/pipeline'); + pipeline = require('../../../../core/server/lib/promise/pipeline'); // These tests are based on the tests in https://github.com/cujojs/when/blob/3.7.4/test/pipeline-test.js function createTask(y) { diff --git a/core/test/unit/lib/promise/sequence_spec.js b/test/unit/lib/promise/sequence_spec.js similarity index 90% rename from core/test/unit/lib/promise/sequence_spec.js rename to test/unit/lib/promise/sequence_spec.js index 1bfe6d19a2..30d8b5bf63 100644 --- a/core/test/unit/lib/promise/sequence_spec.js +++ b/test/unit/lib/promise/sequence_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const sinon = require('sinon'); const Promise = require('bluebird'); -const sequence = require('../../../../server/lib/promise/sequence'); +const sequence = require('../../../../core/server/lib/promise/sequence'); describe('Unit: lib/promise/sequence', function () { afterEach(function () { diff --git a/core/test/unit/lib/request_spec.js b/test/unit/lib/request_spec.js similarity index 98% rename from core/test/unit/lib/request_spec.js rename to test/unit/lib/request_spec.js index 7ae47d8c6d..55ca8f150a 100644 --- a/core/test/unit/lib/request_spec.js +++ b/test/unit/lib/request_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const rewire = require('rewire'); const nock = require('nock'); -const request = rewire('../../../server/lib/request'); +const request = rewire('../../../core/server/lib/request'); describe('Request', function () { it('[success] should return response for http request', function () { diff --git a/core/test/unit/lib/security/password_spec.js b/test/unit/lib/security/password_spec.js similarity index 89% rename from core/test/unit/lib/security/password_spec.js rename to test/unit/lib/security/password_spec.js index fbf32d2878..e728034bcf 100644 --- a/core/test/unit/lib/security/password_spec.js +++ b/test/unit/lib/security/password_spec.js @@ -1,5 +1,5 @@ const should = require('should'), - security = require('../../../../server/lib/security'); + security = require('../../../../core/server/lib/security'); describe('Lib: Security - Password', function () { it('hash plain password', function () { diff --git a/core/test/unit/lib/security/string_spec.js b/test/unit/lib/security/string_spec.js similarity index 98% rename from core/test/unit/lib/security/string_spec.js rename to test/unit/lib/security/string_spec.js index 77b3ad6fbf..c95ef90cd5 100644 --- a/core/test/unit/lib/security/string_spec.js +++ b/test/unit/lib/security/string_spec.js @@ -1,5 +1,5 @@ var should = require('should'), - security = require('../../../../server/lib/security'); + security = require('../../../../core/server/lib/security'); describe('Lib: Security - String', function () { describe('Safe String', function () { diff --git a/core/test/unit/lib/security/tokens_spec.js b/test/unit/lib/security/tokens_spec.js similarity index 98% rename from core/test/unit/lib/security/tokens_spec.js rename to test/unit/lib/security/tokens_spec.js index 7fc48ea243..319f4aa7e2 100644 --- a/core/test/unit/lib/security/tokens_spec.js +++ b/test/unit/lib/security/tokens_spec.js @@ -1,6 +1,6 @@ var should = require('should'), uuid = require('uuid'), - security = require('../../../../server/lib/security'); + security = require('../../../../core/server/lib/security'); describe('Utils: tokens', function () { it('generate', function () { diff --git a/core/test/unit/models/api-key_spec.js b/test/unit/models/api-key_spec.js similarity index 96% rename from core/test/unit/models/api-key_spec.js rename to test/unit/models/api-key_spec.js index 65642f2e13..b58a19aea5 100644 --- a/core/test/unit/models/api-key_spec.js +++ b/test/unit/models/api-key_spec.js @@ -1,4 +1,4 @@ -const models = require('../../../server/models'); +const models = require('../../../core/server/models'); const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../utils'); diff --git a/core/test/unit/models/base/index_spec.js b/test/unit/models/base/index_spec.js similarity index 98% rename from core/test/unit/models/base/index_spec.js rename to test/unit/models/base/index_spec.js index 8846565458..fa5e814782 100644 --- a/core/test/unit/models/base/index_spec.js +++ b/test/unit/models/base/index_spec.js @@ -2,10 +2,10 @@ var should = require('should'), sinon = require('sinon'), _ = require('lodash'), Promise = require('bluebird'), - security = require('../../../../server/lib/security'), - models = require('../../../../server/models'), - common = require('../../../../server/lib/common'), - urlUtils = require('../../../../server/lib/url-utils'), + security = require('../../../../core/server/lib/security'), + models = require('../../../../core/server/models'), + common = require('../../../../core/server/lib/common'), + urlUtils = require('../../../../core/server/lib/url-utils'), testUtils = require('../../../utils'); describe('Models: base', function () { diff --git a/core/test/unit/models/integration_spec.js b/test/unit/models/integration_spec.js similarity index 95% rename from core/test/unit/models/integration_spec.js rename to test/unit/models/integration_spec.js index e7c74057a8..8c3bb67c97 100644 --- a/core/test/unit/models/integration_spec.js +++ b/test/unit/models/integration_spec.js @@ -1,9 +1,9 @@ const should = require('should'); const url = require('url'); const sinon = require('sinon'); -const models = require('../../../server/models'); +const models = require('../../../core/server/models'); const testUtils = require('../../utils'); -const {knex} = require('../../../server/data/db'); +const {knex} = require('../../../core/server/data/db'); describe('Unit: models/integration', function () { before(function () { diff --git a/core/test/unit/models/invite_spec.js b/test/unit/models/invite_spec.js similarity index 98% rename from core/test/unit/models/invite_spec.js rename to test/unit/models/invite_spec.js index 0cd8a103a0..c18ca785a0 100644 --- a/core/test/unit/models/invite_spec.js +++ b/test/unit/models/invite_spec.js @@ -1,9 +1,9 @@ const should = require('should'), sinon = require('sinon'), Promise = require('bluebird'), - common = require('../../../server/lib/common'), - models = require('../../../server/models'), - settingsCache = require('../../../server/services/settings/cache'), + common = require('../../../core/server/lib/common'), + models = require('../../../core/server/models'), + settingsCache = require('../../../core/server/services/settings/cache'), testUtils = require('../../utils'); describe('Unit: models/invite', function () { diff --git a/core/test/unit/models/member_spec.js b/test/unit/models/member_spec.js similarity index 96% rename from core/test/unit/models/member_spec.js rename to test/unit/models/member_spec.js index 4a24c4430e..6904330fa3 100644 --- a/core/test/unit/models/member_spec.js +++ b/test/unit/models/member_spec.js @@ -1,5 +1,5 @@ const sinon = require('sinon'); -const models = require('../../../server/models'); +const models = require('../../../core/server/models'); const configUtils = require('../../utils/configUtils'); const config = configUtils.config; diff --git a/core/test/unit/models/permission_spec.js b/test/unit/models/permission_spec.js similarity index 93% rename from core/test/unit/models/permission_spec.js rename to test/unit/models/permission_spec.js index 47d5b9d297..34dd305d48 100644 --- a/core/test/unit/models/permission_spec.js +++ b/test/unit/models/permission_spec.js @@ -1,6 +1,6 @@ const should = require('should'), sinon = require('sinon'), - models = require('../../../server/models'), + models = require('../../../core/server/models'), testUtils = require('../../utils'), configUtils = require('../../utils/configUtils'); diff --git a/core/test/unit/models/plugins/pagination_spec.js b/test/unit/models/plugins/pagination_spec.js similarity index 99% rename from core/test/unit/models/plugins/pagination_spec.js rename to test/unit/models/plugins/pagination_spec.js index 7e4b501dcc..d25847b326 100644 --- a/core/test/unit/models/plugins/pagination_spec.js +++ b/test/unit/models/plugins/pagination_spec.js @@ -2,7 +2,7 @@ var should = require('should'), sinon = require('sinon'), Promise = require('bluebird'), rewire = require('rewire'), - pagination = rewire('../../../../server/models/plugins/pagination'); + pagination = rewire('../../../../core/server/models/plugins/pagination'); describe('pagination', function () { var paginationUtils; diff --git a/core/test/unit/models/post_spec.js b/test/unit/models/post_spec.js similarity index 99% rename from core/test/unit/models/post_spec.js rename to test/unit/models/post_spec.js index 3d2ade8ae9..3abdf36ff2 100644 --- a/core/test/unit/models/post_spec.js +++ b/test/unit/models/post_spec.js @@ -4,12 +4,12 @@ const should = require('should'); const sinon = require('sinon'); const Promise = require('bluebird'); const testUtils = require('../../utils'); -const knex = require('../../../server/data/db').knex; -const urlService = require('../../../frontend/services/url'); -const schema = require('../../../server/data/schema'); -const models = require('../../../server/models'); -const common = require('../../../server/lib/common'); -const security = require('../../../server/lib/security'); +const knex = require('../../../core/server/data/db').knex; +const urlService = require('../../../core/frontend/services/url'); +const schema = require('../../../core/server/data/schema'); +const models = require('../../../core/server/models'); +const common = require('../../../core/server/lib/common'); +const security = require('../../../core/server/lib/security'); describe('Unit: models/post', function () { const mockDb = require('mock-knex'); diff --git a/core/test/unit/models/session_spec.js b/test/unit/models/session_spec.js similarity index 99% rename from core/test/unit/models/session_spec.js rename to test/unit/models/session_spec.js index 54bd390ffc..866777375b 100644 --- a/core/test/unit/models/session_spec.js +++ b/test/unit/models/session_spec.js @@ -1,6 +1,6 @@ const should = require('should'); const sinon = require('sinon'); -const models = require('../../../server/models'); +const models = require('../../../core/server/models'); describe('Unit: models/session', function () { before(function () { diff --git a/core/test/unit/models/settings_spec.js b/test/unit/models/settings_spec.js similarity index 97% rename from core/test/unit/models/settings_spec.js rename to test/unit/models/settings_spec.js index d672ab730d..a5be8cb31c 100644 --- a/core/test/unit/models/settings_spec.js +++ b/test/unit/models/settings_spec.js @@ -1,9 +1,9 @@ const should = require('should'); const sinon = require('sinon'); const mockDb = require('mock-knex'); -const models = require('../../../server/models'); -const {knex} = require('../../../server/data/db'); -const common = require('../../../server/lib/common'); +const models = require('../../../core/server/models'); +const {knex} = require('../../../core/server/data/db'); +const common = require('../../../core/server/lib/common'); describe('Unit: models/settings', function () { before(function () { diff --git a/core/test/unit/models/tag_spec.js b/test/unit/models/tag_spec.js similarity index 94% rename from core/test/unit/models/tag_spec.js rename to test/unit/models/tag_spec.js index bc0ac4338f..587167d8f2 100644 --- a/core/test/unit/models/tag_spec.js +++ b/test/unit/models/tag_spec.js @@ -1,9 +1,9 @@ const should = require('should'); const url = require('url'); const sinon = require('sinon'); -const models = require('../../../server/models'); +const models = require('../../../core/server/models'); const testUtils = require('../../utils'); -const {knex} = require('../../../server/data/db'); +const {knex} = require('../../../core/server/data/db'); describe('Unit: models/tag', function () { before(function () { diff --git a/core/test/unit/models/user_spec.js b/test/unit/models/user_spec.js similarity index 98% rename from core/test/unit/models/user_spec.js rename to test/unit/models/user_spec.js index c6d70a56d1..445231d9d8 100644 --- a/core/test/unit/models/user_spec.js +++ b/test/unit/models/user_spec.js @@ -3,12 +3,12 @@ const should = require('should'), sinon = require('sinon'), Promise = require('bluebird'), _ = require('lodash'), - schema = require('../../../server/data/schema'), - models = require('../../../server/models'), - permissions = require('../../../server/services/permissions'), - validation = require('../../../server/data/validation'), - common = require('../../../server/lib/common'), - security = require('../../../server/lib/security'), + schema = require('../../../core/server/data/schema'), + models = require('../../../core/server/models'), + permissions = require('../../../core/server/services/permissions'), + validation = require('../../../core/server/data/validation'), + common = require('../../../core/server/lib/common'), + security = require('../../../core/server/lib/security'), testUtils = require('../../utils'); describe('Unit: models/user', function () { diff --git a/core/test/unit/services/apps/proxy_spec.js b/test/unit/services/apps/proxy_spec.js similarity index 82% rename from core/test/unit/services/apps/proxy_spec.js rename to test/unit/services/apps/proxy_spec.js index 4b27c7e122..cea8e495ee 100644 --- a/core/test/unit/services/apps/proxy_spec.js +++ b/test/unit/services/apps/proxy_spec.js @@ -1,8 +1,8 @@ const should = require('should'), sinon = require('sinon'), - helpers = require('../../../../frontend/helpers/register'), - AppProxy = require('../../../../frontend/services/apps/proxy'), - routing = require('../../../../frontend/services/routing'); + helpers = require('../../../../core/frontend/helpers/register'), + AppProxy = require('../../../../core/frontend/services/apps/proxy'), + routing = require('../../../../core/frontend/services/routing'); describe('Apps', function () { beforeEach(function () { diff --git a/core/test/unit/services/auth/api-key/admin_spec.js b/test/unit/services/auth/api-key/admin_spec.js similarity index 97% rename from core/test/unit/services/auth/api-key/admin_spec.js rename to test/unit/services/auth/api-key/admin_spec.js index f19e7b2755..14b67c610e 100644 --- a/core/test/unit/services/auth/api-key/admin_spec.js +++ b/test/unit/services/auth/api-key/admin_spec.js @@ -2,9 +2,9 @@ const jwt = require('jsonwebtoken'); const should = require('should'); const sinon = require('sinon'); const Promise = require('bluebird'); -const apiKeyAuth = require('../../../../../server/services/auth/api-key'); -const common = require('../../../../../server/lib/common'); -const models = require('../../../../../server/models'); +const apiKeyAuth = require('../../../../../core/server/services/auth/api-key'); +const common = require('../../../../../core/server/lib/common'); +const models = require('../../../../../core/server/models'); const testUtils = require('../../../../utils'); describe('Admin API Key Auth', function () { diff --git a/core/test/unit/services/auth/api-key/content_spec.js b/test/unit/services/auth/api-key/content_spec.js similarity index 92% rename from core/test/unit/services/auth/api-key/content_spec.js rename to test/unit/services/auth/api-key/content_spec.js index 4aa126857e..c841694d34 100644 --- a/core/test/unit/services/auth/api-key/content_spec.js +++ b/test/unit/services/auth/api-key/content_spec.js @@ -1,6 +1,6 @@ -const common = require('../../../../../server/lib/common'); -const {authenticateContentApiKey} = require('../../../../../server/services/auth/api-key/content'); -const models = require('../../../../../server/models'); +const common = require('../../../../../core/server/lib/common'); +const {authenticateContentApiKey} = require('../../../../../core/server/services/auth/api-key/content'); +const models = require('../../../../../core/server/models'); const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../../../utils'); diff --git a/core/test/unit/services/auth/members/index_spec.js b/test/unit/services/auth/members/index_spec.js similarity index 94% rename from core/test/unit/services/auth/members/index_spec.js rename to test/unit/services/auth/members/index_spec.js index 72566bd776..661c116bfa 100644 --- a/core/test/unit/services/auth/members/index_spec.js +++ b/test/unit/services/auth/members/index_spec.js @@ -1,7 +1,7 @@ const jwt = require('jsonwebtoken'); const should = require('should'); -const {UnauthorizedError} = require('../../../../../server/lib/common/errors'); -const members = require('../../../../../server/services/auth/members'); +const {UnauthorizedError} = require('../../../../../core/server/lib/common/errors'); +const members = require('../../../../../core/server/services/auth/members'); describe.skip('Auth Service - Members', function () { it('exports an authenticateMembersToken method', function () { diff --git a/core/test/unit/services/auth/session/middleware_spec.js b/test/unit/services/auth/session/middleware_spec.js similarity index 96% rename from core/test/unit/services/auth/session/middleware_spec.js rename to test/unit/services/auth/session/middleware_spec.js index 1bee3c3197..edf5edcf46 100644 --- a/core/test/unit/services/auth/session/middleware_spec.js +++ b/test/unit/services/auth/session/middleware_spec.js @@ -1,12 +1,12 @@ -const sessionMiddleware = require('../../../../../server/services/auth/session/middleware'); -const models = require('../../../../../server/models'); +const sessionMiddleware = require('../../../../../core/server/services/auth/session/middleware'); +const models = require('../../../../../core/server/models'); const sinon = require('sinon'); const should = require('should'); const { BadRequestError, UnauthorizedError, InternalServerError -} = require('../../../../../server/lib/common/errors'); +} = require('../../../../../core/server/lib/common/errors'); describe('Session Service', function () { before(function () { diff --git a/core/test/unit/services/auth/session/store_spec.js b/test/unit/services/auth/session/store_spec.js similarity index 97% rename from core/test/unit/services/auth/session/store_spec.js rename to test/unit/services/auth/session/store_spec.js index 6337e17e10..f6c141f6c2 100644 --- a/core/test/unit/services/auth/session/store_spec.js +++ b/test/unit/services/auth/session/store_spec.js @@ -1,5 +1,5 @@ -const SessionStore = require('../../../../../server/services/auth/session/store'); -const models = require('../../../../../server/models'); +const SessionStore = require('../../../../../core/server/services/auth/session/store'); +const models = require('../../../../../core/server/models'); const EventEmitter = require('events'); const {Store} = require('express-session'); const sinon = require('sinon'); diff --git a/core/test/unit/services/labs_spec.js b/test/unit/services/labs_spec.js similarity index 90% rename from core/test/unit/services/labs_spec.js rename to test/unit/services/labs_spec.js index 5b91e593d1..e8dbf616dc 100644 --- a/core/test/unit/services/labs_spec.js +++ b/test/unit/services/labs_spec.js @@ -1,8 +1,8 @@ const should = require('should'); const sinon = require('sinon'); -const settingsCache = require('../../../server/services/settings/cache'); +const settingsCache = require('../../../core/server/services/settings/cache'); -const labs = require('../../../server/services/labs'); +const labs = require('../../../core/server/services/labs'); describe('Labs Service', function () { let labsCacheStub; diff --git a/core/test/unit/services/mail/GhostMailer_spec.js b/test/unit/services/mail/GhostMailer_spec.js similarity index 97% rename from core/test/unit/services/mail/GhostMailer_spec.js rename to test/unit/services/mail/GhostMailer_spec.js index c796738e53..721a42328c 100644 --- a/core/test/unit/services/mail/GhostMailer_spec.js +++ b/test/unit/services/mail/GhostMailer_spec.js @@ -1,11 +1,11 @@ var should = require('should'), sinon = require('sinon'), Promise = require('bluebird'), - mail = require('../../../../server/services/mail'), - settingsCache = require('../../../../server/services/settings/cache'), + mail = require('../../../../core/server/services/mail'), + settingsCache = require('../../../../core/server/services/settings/cache'), configUtils = require('../../../utils/configUtils'), - urlUtils = require('../../../../server/lib/url-utils'), - common = require('../../../../server/lib/common'), + urlUtils = require('../../../../core/server/lib/url-utils'), + common = require('../../../../core/server/lib/common'), mailer, // Mock SMTP config diff --git a/core/test/unit/services/mail/utils_spec.js b/test/unit/services/mail/utils_spec.js similarity index 98% rename from core/test/unit/services/mail/utils_spec.js rename to test/unit/services/mail/utils_spec.js index a4b111ccbc..3a35ee13e8 100644 --- a/core/test/unit/services/mail/utils_spec.js +++ b/test/unit/services/mail/utils_spec.js @@ -1,6 +1,6 @@ var should = require('should'), sinon = require('sinon'), - mail = require('../../../../server/services/mail'); + mail = require('../../../../core/server/services/mail'); describe('Mail: Utils', function () { var scope = {ghostMailer: null}; diff --git a/core/test/unit/services/permissions/can-this_spec.js b/test/unit/services/permissions/can-this_spec.js similarity index 99% rename from core/test/unit/services/permissions/can-this_spec.js rename to test/unit/services/permissions/can-this_spec.js index a676c769d4..77dddc84ce 100644 --- a/core/test/unit/services/permissions/can-this_spec.js +++ b/test/unit/services/permissions/can-this_spec.js @@ -3,9 +3,9 @@ const should = require('should'), testUtils = require('../../../utils'), Promise = require('bluebird'), _ = require('lodash'), - models = require('../../../../server/models'), - permissions = require('../../../../server/services/permissions'), - providers = require('../../../../server/services/permissions/providers'); + models = require('../../../../core/server/models'), + permissions = require('../../../../core/server/services/permissions'), + providers = require('../../../../core/server/services/permissions/providers'); describe('Permissions', function () { var fakePermissions = [], diff --git a/core/test/unit/services/permissions/index_spec.js b/test/unit/services/permissions/index_spec.js similarity index 94% rename from core/test/unit/services/permissions/index_spec.js rename to test/unit/services/permissions/index_spec.js index f6d5f2c77d..d0595ce611 100644 --- a/core/test/unit/services/permissions/index_spec.js +++ b/test/unit/services/permissions/index_spec.js @@ -3,9 +3,9 @@ var should = require('should'), testUtils = require('../../../utils'), Promise = require('bluebird'), _ = require('lodash'), - models = require('../../../../server/models'), - actionsMap = require('../../../../server/services/permissions/actions-map-cache'), - permissions = require('../../../../server/services/permissions'); + models = require('../../../../core/server/models'), + actionsMap = require('../../../../core/server/services/permissions/actions-map-cache'), + permissions = require('../../../../core/server/services/permissions'); describe('Permissions', function () { var fakePermissions = [], diff --git a/core/test/unit/services/permissions/parse-context_spec.js b/test/unit/services/permissions/parse-context_spec.js similarity index 97% rename from core/test/unit/services/permissions/parse-context_spec.js rename to test/unit/services/permissions/parse-context_spec.js index 5f0320bb7a..d8f339f0ce 100644 --- a/core/test/unit/services/permissions/parse-context_spec.js +++ b/test/unit/services/permissions/parse-context_spec.js @@ -1,5 +1,5 @@ var should = require('should'), - parseContext = require('../../../../server/services/permissions/parse-context'); + parseContext = require('../../../../core/server/services/permissions/parse-context'); describe('Permissions', function () { describe('parseContext', function () { diff --git a/core/test/unit/services/permissions/providers_spec.js b/test/unit/services/permissions/providers_spec.js similarity index 98% rename from core/test/unit/services/permissions/providers_spec.js rename to test/unit/services/permissions/providers_spec.js index 1ebd68bfe1..840db53704 100644 --- a/core/test/unit/services/permissions/providers_spec.js +++ b/test/unit/services/permissions/providers_spec.js @@ -2,8 +2,8 @@ var should = require('should'), sinon = require('sinon'), testUtils = require('../../../utils'), Promise = require('bluebird'), - models = require('../../../../server/models'), - providers = require('../../../../server/services/permissions/providers'); + models = require('../../../../core/server/models'), + providers = require('../../../../core/server/services/permissions/providers'); describe('Permission Providers', function () { before(function () { diff --git a/core/test/unit/services/permissions/public_spec.js b/test/unit/services/permissions/public_spec.js similarity index 97% rename from core/test/unit/services/permissions/public_spec.js rename to test/unit/services/permissions/public_spec.js index 2e79408f29..c2ed6cac54 100644 --- a/core/test/unit/services/permissions/public_spec.js +++ b/test/unit/services/permissions/public_spec.js @@ -1,7 +1,7 @@ var should = require('should'), _ = require('lodash'), - common = require('../../../../server/lib/common'), - applyPublicRules = require('../../../../server/services/permissions/public'); + common = require('../../../../core/server/lib/common'), + applyPublicRules = require('../../../../core/server/services/permissions/public'); describe('Permissions', function () { describe('applyPublicRules', function () { diff --git a/core/test/unit/services/routing/CollectionRouter_spec.js b/test/unit/services/routing/CollectionRouter_spec.js similarity index 96% rename from core/test/unit/services/routing/CollectionRouter_spec.js rename to test/unit/services/routing/CollectionRouter_spec.js index 8eab02861d..a87e1cf06e 100644 --- a/core/test/unit/services/routing/CollectionRouter_spec.js +++ b/test/unit/services/routing/CollectionRouter_spec.js @@ -1,10 +1,10 @@ const should = require('should'), sinon = require('sinon'), express = require('express'), - settingsCache = require('../../../../server/services/settings/cache'), - common = require('../../../../server/lib/common'), - controllers = require('../../../../frontend/services/routing/controllers'), - CollectionRouter = require('../../../../frontend/services/routing/CollectionRouter'), + settingsCache = require('../../../../core/server/services/settings/cache'), + common = require('../../../../core/server/lib/common'), + controllers = require('../../../../core/frontend/services/routing/controllers'), + CollectionRouter = require('../../../../core/frontend/services/routing/CollectionRouter'), RESOURCE_CONFIG = {QUERY: {post: {controller: 'posts', resource: 'posts'}}}; describe('UNIT - services/routing/CollectionRouter', function () { diff --git a/core/test/unit/services/routing/ParentRouter_spec.js b/test/unit/services/routing/ParentRouter_spec.js similarity index 98% rename from core/test/unit/services/routing/ParentRouter_spec.js rename to test/unit/services/routing/ParentRouter_spec.js index 35df025586..b0a2274605 100644 --- a/core/test/unit/services/routing/ParentRouter_spec.js +++ b/test/unit/services/routing/ParentRouter_spec.js @@ -1,9 +1,9 @@ const should = require('should'), sinon = require('sinon'), configUtils = require('../../../utils/configUtils'), - common = require('../../../../server/lib/common'), - urlUtils = require('../../../../server/lib/url-utils'), - ParentRouter = require('../../../../frontend/services/routing/ParentRouter'); + common = require('../../../../core/server/lib/common'), + urlUtils = require('../../../../core/server/lib/url-utils'), + ParentRouter = require('../../../../core/frontend/services/routing/ParentRouter'); describe('UNIT - services/routing/ParentRouter', function () { let req, res, next; diff --git a/core/test/unit/services/routing/RSSRouter_spec.js b/test/unit/services/routing/RSSRouter_spec.js similarity index 86% rename from core/test/unit/services/routing/RSSRouter_spec.js rename to test/unit/services/routing/RSSRouter_spec.js index efab590069..c588940f40 100644 --- a/core/test/unit/services/routing/RSSRouter_spec.js +++ b/test/unit/services/routing/RSSRouter_spec.js @@ -1,10 +1,10 @@ const should = require('should'), sinon = require('sinon'), configUtils = require('../../../utils/configUtils'), - common = require('../../../../server/lib/common'), - controllers = require('../../../../frontend/services/routing/controllers'), - RSSRouter = require('../../../../frontend/services/routing/RSSRouter'), - urlUtils = require('../../../../server/lib/url-utils'); + common = require('../../../../core/server/lib/common'), + controllers = require('../../../../core/frontend/services/routing/controllers'), + RSSRouter = require('../../../../core/frontend/services/routing/RSSRouter'), + urlUtils = require('../../../../core/server/lib/url-utils'); describe('UNIT - services/routing/RSSRouter', function () { describe('instantiate', function () { diff --git a/core/test/unit/services/routing/StaticRoutesRouter_spec.js b/test/unit/services/routing/StaticRoutesRouter_spec.js similarity index 97% rename from core/test/unit/services/routing/StaticRoutesRouter_spec.js rename to test/unit/services/routing/StaticRoutesRouter_spec.js index dbfd037a0e..3ec03f068e 100644 --- a/core/test/unit/services/routing/StaticRoutesRouter_spec.js +++ b/test/unit/services/routing/StaticRoutesRouter_spec.js @@ -1,8 +1,8 @@ const should = require('should'), sinon = require('sinon'), - common = require('../../../../server/lib/common'), - controllers = require('../../../../frontend/services/routing/controllers'), - StaticRoutesRouter = require('../../../../frontend/services/routing/StaticRoutesRouter'), + common = require('../../../../core/server/lib/common'), + controllers = require('../../../../core/frontend/services/routing/controllers'), + StaticRoutesRouter = require('../../../../core/frontend/services/routing/StaticRoutesRouter'), configUtils = require('../../../utils/configUtils'); describe('UNIT - services/routing/StaticRoutesRouter', function () { diff --git a/core/test/unit/services/routing/TaxonomyRouter_spec.js b/test/unit/services/routing/TaxonomyRouter_spec.js similarity index 87% rename from core/test/unit/services/routing/TaxonomyRouter_spec.js rename to test/unit/services/routing/TaxonomyRouter_spec.js index 3c13cc5d69..5c0a8267fe 100644 --- a/core/test/unit/services/routing/TaxonomyRouter_spec.js +++ b/test/unit/services/routing/TaxonomyRouter_spec.js @@ -1,13 +1,13 @@ const should = require('should'), sinon = require('sinon'), _ = require('lodash'), - settingsCache = require('../../../../server/services/settings/cache'), - common = require('../../../../server/lib/common'), - controllers = require('../../../../frontend/services/routing/controllers'), - TaxonomyRouter = require('../../../../frontend/services/routing/TaxonomyRouter'), - RESOURCE_CONFIG_V2 = require('../../../../frontend/services/routing/config/v2'), - RESOURCE_CONFIG_CANARY = require('../../../../frontend/services/routing/config/canary'), - RESOURCE_CONFIG_V3 = require('../../../../frontend/services/routing/config/v3'); + settingsCache = require('../../../../core/server/services/settings/cache'), + common = require('../../../../core/server/lib/common'), + controllers = require('../../../../core/frontend/services/routing/controllers'), + TaxonomyRouter = require('../../../../core/frontend/services/routing/TaxonomyRouter'), + RESOURCE_CONFIG_V2 = require('../../../../core/frontend/services/routing/config/v2'), + RESOURCE_CONFIG_CANARY = require('../../../../core/frontend/services/routing/config/canary'), + RESOURCE_CONFIG_V3 = require('../../../../core/frontend/services/routing/config/v3'); describe('UNIT - services/routing/TaxonomyRouter', function () { let req, res, next; diff --git a/core/test/unit/services/routing/controllers/channel_spec.js b/test/unit/services/routing/controllers/channel_spec.js similarity index 94% rename from core/test/unit/services/routing/controllers/channel_spec.js rename to test/unit/services/routing/controllers/channel_spec.js index e0c93e50ba..fcf17e17ad 100644 --- a/core/test/unit/services/routing/controllers/channel_spec.js +++ b/test/unit/services/routing/controllers/channel_spec.js @@ -1,11 +1,11 @@ const should = require('should'), sinon = require('sinon'), testUtils = require('../../../../utils'), - common = require('../../../../../server/lib/common'), - security = require('../../../../../server/lib/security'), - themeService = require('../../../../../frontend/services/themes'), - controllers = require('../../../../../frontend/services/routing/controllers'), - helpers = require('../../../../../frontend/services/routing/helpers'); + common = require('../../../../../core/server/lib/common'), + security = require('../../../../../core/server/lib/security'), + themeService = require('../../../../../core/frontend/services/themes'), + controllers = require('../../../../../core/frontend/services/routing/controllers'), + helpers = require('../../../../../core/frontend/services/routing/helpers'); function failTest(done) { return function (err) { diff --git a/core/test/unit/services/routing/controllers/collection_spec.js b/test/unit/services/routing/controllers/collection_spec.js similarity index 95% rename from core/test/unit/services/routing/controllers/collection_spec.js rename to test/unit/services/routing/controllers/collection_spec.js index 5e87776914..56be84cd40 100644 --- a/core/test/unit/services/routing/controllers/collection_spec.js +++ b/test/unit/services/routing/controllers/collection_spec.js @@ -1,12 +1,12 @@ const should = require('should'), sinon = require('sinon'), testUtils = require('../../../../utils'), - common = require('../../../../../server/lib/common'), - security = require('../../../../../server/lib/security'), - themeService = require('../../../../../frontend/services/themes'), - urlService = require('../../../../../frontend/services/url'), - controllers = require('../../../../../frontend/services/routing/controllers'), - helpers = require('../../../../../frontend/services/routing/helpers'); + common = require('../../../../../core/server/lib/common'), + security = require('../../../../../core/server/lib/security'), + themeService = require('../../../../../core/frontend/services/themes'), + urlService = require('../../../../../core/frontend/services/url'), + controllers = require('../../../../../core/frontend/services/routing/controllers'), + helpers = require('../../../../../core/frontend/services/routing/helpers'); function failTest(done) { return function (err) { diff --git a/core/test/unit/services/routing/controllers/entry_spec.js b/test/unit/services/routing/controllers/entry_spec.js similarity index 95% rename from core/test/unit/services/routing/controllers/entry_spec.js rename to test/unit/services/routing/controllers/entry_spec.js index 2aa4bb2e24..841ee6e88a 100644 --- a/core/test/unit/services/routing/controllers/entry_spec.js +++ b/test/unit/services/routing/controllers/entry_spec.js @@ -2,10 +2,10 @@ const should = require('should'); const sinon = require('sinon'); const testUtils = require('../../../../utils'); const configUtils = require('../../../../utils/configUtils'); -const urlService = require('../../../../../frontend/services/url'); -const urlUtils = require('../../../../../server/lib/url-utils'); -const controllers = require('../../../../../frontend/services/routing/controllers'); -const helpers = require('../../../../../frontend/services/routing/helpers'); +const urlService = require('../../../../../core/frontend/services/url'); +const urlUtils = require('../../../../../core/server/lib/url-utils'); +const controllers = require('../../../../../core/frontend/services/routing/controllers'); +const helpers = require('../../../../../core/frontend/services/routing/helpers'); const EDITOR_URL = `/editor/post/`; describe('Unit - services/routing/controllers/entry', function () { diff --git a/core/test/unit/services/routing/controllers/preview_spec.js b/test/unit/services/routing/controllers/preview_spec.js similarity index 94% rename from core/test/unit/services/routing/controllers/preview_spec.js rename to test/unit/services/routing/controllers/preview_spec.js index 5403cd8e6a..ab0f15c7d5 100644 --- a/core/test/unit/services/routing/controllers/preview_spec.js +++ b/test/unit/services/routing/controllers/preview_spec.js @@ -3,11 +3,11 @@ const should = require('should'), Promise = require('bluebird'), testUtils = require('../../../../utils'), configUtils = require('../../../../utils/configUtils'), - api = require('../../../../../server/api'), - controllers = require('../../../../../frontend/services/routing/controllers'), - helpers = require('../../../../../frontend/services/routing/helpers'), - urlService = require('../../../../../frontend/services/url'), - urlUtils = require('../../../../../server/lib/url-utils'), + api = require('../../../../../core/server/api'), + controllers = require('../../../../../core/frontend/services/routing/controllers'), + helpers = require('../../../../../core/frontend/services/routing/helpers'), + urlService = require('../../../../../core/frontend/services/url'), + urlUtils = require('../../../../../core/server/lib/url-utils'), EDITOR_URL = '/editor/post/'; diff --git a/core/test/unit/services/routing/controllers/rss_spec.js b/test/unit/services/routing/controllers/rss_spec.js similarity index 80% rename from core/test/unit/services/routing/controllers/rss_spec.js rename to test/unit/services/routing/controllers/rss_spec.js index 622b7857c2..b26fec1f0f 100644 --- a/core/test/unit/services/routing/controllers/rss_spec.js +++ b/test/unit/services/routing/controllers/rss_spec.js @@ -2,12 +2,12 @@ const should = require('should'), sinon = require('sinon'), _ = require('lodash'), testUtils = require('../../../../utils'), - common = require('../../../../../server/lib/common'), - security = require('../../../../../server/lib/security'), - settingsCache = require('../../../../../server/services/settings/cache'), - controllers = require('../../../../../frontend/services/routing/controllers'), - helpers = require('../../../../../frontend/services/routing/helpers'), - rssService = require('../../../../../frontend/services/rss'); + common = require('../../../../../core/server/lib/common'), + security = require('../../../../../core/server/lib/security'), + settingsCache = require('../../../../../core/server/services/settings/cache'), + controllers = require('../../../../../core/frontend/services/routing/controllers'), + helpers = require('../../../../../core/frontend/services/routing/helpers'), + rssService = require('../../../../../core/frontend/services/rss'); // Helper function to prevent unit tests // from failing via timeout when they diff --git a/core/test/unit/services/routing/controllers/static_spec.js b/test/unit/services/routing/controllers/static_spec.js similarity index 91% rename from core/test/unit/services/routing/controllers/static_spec.js rename to test/unit/services/routing/controllers/static_spec.js index 096bfcc14f..c092785799 100644 --- a/core/test/unit/services/routing/controllers/static_spec.js +++ b/test/unit/services/routing/controllers/static_spec.js @@ -1,10 +1,10 @@ const should = require('should'), sinon = require('sinon'), testUtils = require('../../../../utils'), - api = require('../../../../../server/api'), - themeService = require('../../../../../frontend/services/themes'), - helpers = require('../../../../../frontend/services/routing/helpers'), - controllers = require('../../../../../frontend/services/routing/controllers'); + api = require('../../../../../core/server/api'), + themeService = require('../../../../../core/frontend/services/themes'), + helpers = require('../../../../../core/frontend/services/routing/helpers'), + controllers = require('../../../../../core/frontend/services/routing/controllers'); function failTest(done) { return function (err) { diff --git a/core/test/unit/services/routing/helpers/context_spec.js b/test/unit/services/routing/helpers/context_spec.js similarity index 98% rename from core/test/unit/services/routing/helpers/context_spec.js rename to test/unit/services/routing/helpers/context_spec.js index e2fbb11f31..cd41c36c80 100644 --- a/core/test/unit/services/routing/helpers/context_spec.js +++ b/test/unit/services/routing/helpers/context_spec.js @@ -2,8 +2,8 @@ const should = require('should'), sinon = require('sinon'), _ = require('lodash'), testUtils = require('../../../../utils'), - helpers = require('../../../../../frontend/services/routing/helpers'), - labs = require('../../../../../server/services/labs'); + helpers = require('../../../../../core/frontend/services/routing/helpers'), + labs = require('../../../../../core/server/services/labs'); describe('Contexts', function () { let req, res, data, setupContext; diff --git a/core/test/unit/services/routing/helpers/entry-lookup_spec.js b/test/unit/services/routing/helpers/entry-lookup_spec.js similarity index 98% rename from core/test/unit/services/routing/helpers/entry-lookup_spec.js rename to test/unit/services/routing/helpers/entry-lookup_spec.js index aca15fe95d..0f7b67a0ad 100644 --- a/core/test/unit/services/routing/helpers/entry-lookup_spec.js +++ b/test/unit/services/routing/helpers/entry-lookup_spec.js @@ -2,8 +2,8 @@ const should = require('should'), sinon = require('sinon'), Promise = require('bluebird'), testUtils = require('../../../../utils'), - api = require('../../../../../server/api'), - helpers = require('../../../../../frontend/services/routing/helpers'); + api = require('../../../../../core/server/api'), + helpers = require('../../../../../core/frontend/services/routing/helpers'); describe('Unit - services/routing/helpers/entry-lookup', function () { let posts, locals; diff --git a/core/test/unit/services/routing/helpers/error_spec.js b/test/unit/services/routing/helpers/error_spec.js similarity index 87% rename from core/test/unit/services/routing/helpers/error_spec.js rename to test/unit/services/routing/helpers/error_spec.js index 1b28356597..10169c6c0a 100644 --- a/core/test/unit/services/routing/helpers/error_spec.js +++ b/test/unit/services/routing/helpers/error_spec.js @@ -1,7 +1,7 @@ const should = require('should'), sinon = require('sinon'), - common = require('../../../../../server/lib/common'), - helpers = require('../../../../../frontend/services/routing/helpers'); + common = require('../../../../../core/server/lib/common'), + helpers = require('../../../../../core/frontend/services/routing/helpers'); describe('handleError', function () { let next; diff --git a/core/test/unit/services/routing/helpers/fetch-data_spec.js b/test/unit/services/routing/helpers/fetch-data_spec.js similarity index 98% rename from core/test/unit/services/routing/helpers/fetch-data_spec.js rename to test/unit/services/routing/helpers/fetch-data_spec.js index 6b1c4f8aac..1262ea2437 100644 --- a/core/test/unit/services/routing/helpers/fetch-data_spec.js +++ b/test/unit/services/routing/helpers/fetch-data_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const sinon = require('sinon'); -const api = require('../../../../../server/api').v2; -const helpers = require('../../../../../frontend/services/routing/helpers'); +const api = require('../../../../../core/server/api').v2; +const helpers = require('../../../../../core/frontend/services/routing/helpers'); const testUtils = require('../../../../utils'); describe('Unit - services/routing/helpers/fetch-data', function () { diff --git a/core/test/unit/services/routing/helpers/format-response_spec.js b/test/unit/services/routing/helpers/format-response_spec.js similarity index 97% rename from core/test/unit/services/routing/helpers/format-response_spec.js rename to test/unit/services/routing/helpers/format-response_spec.js index 38151194a3..7ce7cd7005 100644 --- a/core/test/unit/services/routing/helpers/format-response_spec.js +++ b/test/unit/services/routing/helpers/format-response_spec.js @@ -1,6 +1,6 @@ const should = require('should'), testUtils = require('../../../../utils'), - helpers = require('../../../../../frontend/services/routing/helpers'); + helpers = require('../../../../../core/frontend/services/routing/helpers'); describe('Unit - services/routing/helpers/format-response', function () { let posts, tags; diff --git a/core/test/unit/services/routing/helpers/templates_spec.js b/test/unit/services/routing/helpers/templates_spec.js similarity index 99% rename from core/test/unit/services/routing/helpers/templates_spec.js rename to test/unit/services/routing/helpers/templates_spec.js index 0627675c69..3311a426de 100644 --- a/core/test/unit/services/routing/helpers/templates_spec.js +++ b/test/unit/services/routing/helpers/templates_spec.js @@ -1,8 +1,8 @@ const should = require('should'), sinon = require('sinon'), rewire = require('rewire'), - templates = rewire('../../../../../frontend/services/routing/helpers/templates'), - themes = require('../../../../../frontend/services/themes'); + templates = rewire('../../../../../core/frontend/services/routing/helpers/templates'), + themes = require('../../../../../core/frontend/services/themes'); describe('templates', function () { let getActiveThemeStub, hasTemplateStub, diff --git a/core/test/unit/services/routing/middlewares/page-param_spec.js b/test/unit/services/routing/middlewares/page-param_spec.js similarity index 90% rename from core/test/unit/services/routing/middlewares/page-param_spec.js rename to test/unit/services/routing/middlewares/page-param_spec.js index be0fe85307..53c4dbb683 100644 --- a/core/test/unit/services/routing/middlewares/page-param_spec.js +++ b/test/unit/services/routing/middlewares/page-param_spec.js @@ -1,8 +1,8 @@ const should = require('should'), sinon = require('sinon'), - common = require('../../../../../server/lib/common'), - urlUtils = require('../../../../../server/lib/url-utils'), - middlewares = require('../../../../../frontend/services/routing/middlewares'); + common = require('../../../../../core/server/lib/common'), + urlUtils = require('../../../../../core/server/lib/url-utils'), + middlewares = require('../../../../../core/frontend/services/routing/middlewares'); describe('UNIT: services/routing/middlewares/page-param', function () { let req, res, next; diff --git a/core/test/unit/services/routing/registry_spec.js b/test/unit/services/routing/registry_spec.js similarity index 95% rename from core/test/unit/services/routing/registry_spec.js rename to test/unit/services/routing/registry_spec.js index 783f74861e..702daf62a0 100644 --- a/core/test/unit/services/routing/registry_spec.js +++ b/test/unit/services/routing/registry_spec.js @@ -1,7 +1,7 @@ const should = require('should'), sinon = require('sinon'), rewire = require('rewire'), - registry = rewire('../../../../frontend/services/routing/registry'); + registry = rewire('../../../../core/frontend/services/routing/registry'); describe('UNIT: services/routing/registry', function () { let getRssUrlStub; diff --git a/core/test/unit/services/rss/cache_spec.js b/test/unit/services/rss/cache_spec.js similarity index 95% rename from core/test/unit/services/rss/cache_spec.js rename to test/unit/services/rss/cache_spec.js index ebc65d4257..6f0278a996 100644 --- a/core/test/unit/services/rss/cache_spec.js +++ b/test/unit/services/rss/cache_spec.js @@ -2,7 +2,7 @@ var should = require('should'), sinon = require('sinon'), rewire = require('rewire'), configUtils = require('../../../utils/configUtils'), - rssCache = rewire('../../../../frontend/services/rss/cache'); + rssCache = rewire('../../../../core/frontend/services/rss/cache'); describe('RSS: Cache', function () { var generateSpy, generateFeedReset; diff --git a/core/test/unit/services/rss/generate-feed_spec.js b/test/unit/services/rss/generate-feed_spec.js similarity index 98% rename from core/test/unit/services/rss/generate-feed_spec.js rename to test/unit/services/rss/generate-feed_spec.js index c1c687671a..18b576defc 100644 --- a/core/test/unit/services/rss/generate-feed_spec.js +++ b/test/unit/services/rss/generate-feed_spec.js @@ -3,8 +3,8 @@ var should = require('should'), _ = require('lodash'), testUtils = require('../../../utils'), urlUtils = require('../../../utils/urlUtils'), - urlService = require('../../../../frontend/services/url'), - generateFeed = require('../../../../frontend/services/rss/generate-feed'); + urlService = require('../../../../core/frontend/services/url'), + generateFeed = require('../../../../core/frontend/services/rss/generate-feed'); describe('RSS: Generate Feed', function () { var data = {}, diff --git a/core/test/unit/services/rss/renderer_spec.js b/test/unit/services/rss/renderer_spec.js similarity index 95% rename from core/test/unit/services/rss/renderer_spec.js rename to test/unit/services/rss/renderer_spec.js index 52f17c668f..0169847918 100644 --- a/core/test/unit/services/rss/renderer_spec.js +++ b/test/unit/services/rss/renderer_spec.js @@ -2,8 +2,8 @@ var should = require('should'), sinon = require('sinon'), Promise = require('bluebird'), - rssCache = require('../../../../frontend/services/rss/cache'), - renderer = require('../../../../frontend/services/rss/renderer'); + rssCache = require('../../../../core/frontend/services/rss/cache'), + renderer = require('../../../../core/frontend/services/rss/renderer'); describe('RSS: Renderer', function () { var rssCacheStub, res, baseUrl; diff --git a/core/test/unit/services/settings/cache_spec.js b/test/unit/services/settings/cache_spec.js similarity index 88% rename from core/test/unit/services/settings/cache_spec.js rename to test/unit/services/settings/cache_spec.js index 10d38df7d0..141f5b149a 100644 --- a/core/test/unit/services/settings/cache_spec.js +++ b/test/unit/services/settings/cache_spec.js @@ -1,14 +1,14 @@ const rewire = require('rewire'); const should = require('should'); const _ = require('lodash'); -const publicSettings = require('../../../../server/services/settings/public'); -let cache = rewire('../../../../server/services/settings/cache'); +const publicSettings = require('../../../../core/server/services/settings/public'); +let cache = rewire('../../../../core/server/services/settings/cache'); should.equal(true, true); describe('UNIT: settings cache', function () { beforeEach(function () { - cache = rewire('../../../../server/services/settings/cache'); + cache = rewire('../../../../core/server/services/settings/cache'); }); it('does not auto convert string into number', function () { diff --git a/core/test/unit/services/settings/ensure-settings_spec.js b/test/unit/services/settings/ensure-settings_spec.js similarity index 92% rename from core/test/unit/services/settings/ensure-settings_spec.js rename to test/unit/services/settings/ensure-settings_spec.js index a7c4fc0a4c..bfad0d2d75 100644 --- a/core/test/unit/services/settings/ensure-settings_spec.js +++ b/test/unit/services/settings/ensure-settings_spec.js @@ -4,9 +4,9 @@ const sinon = require('sinon'), yaml = require('js-yaml'), path = require('path'), configUtils = require('../../../utils/configUtils'), - common = require('../../../../server/lib/common'), + common = require('../../../../core/server/lib/common'), - ensureSettings = require('../../../../frontend/services/settings/ensure-settings'); + ensureSettings = require('../../../../core/frontend/services/settings/ensure-settings'); describe('UNIT > Settings Service ensure settings:', function () { beforeEach(function () { @@ -32,7 +32,7 @@ describe('UNIT > Settings Service ensure settings:', function () { }); it('copies default settings file if not found but does not overwrite existing files', function () { - const expectedDefaultSettingsPath = path.join(__dirname, '../../../../frontend/services/settings/default-globals.yaml'); + const expectedDefaultSettingsPath = path.join(__dirname, '../../../../core/frontend/services/settings/default-globals.yaml'); const expectedContentPath = path.join(__dirname, '../../../utils/fixtures/settings/globals.yaml'); const fsError = new Error('not found'); fsError.code = 'ENOENT'; @@ -49,7 +49,7 @@ describe('UNIT > Settings Service ensure settings:', function () { }); it('copies default settings file if no file found', function () { - const expectedDefaultSettingsPath = path.join(__dirname, '../../../../frontend/services/settings/default-routes.yaml'); + const expectedDefaultSettingsPath = path.join(__dirname, '../../../../core/frontend/services/settings/default-routes.yaml'); const expectedContentPath = path.join(__dirname, '../../../utils/fixtures/settings/routes.yaml'); const fsError = new Error('not found'); fsError.code = 'ENOENT'; diff --git a/core/test/unit/services/settings/loader_spec.js b/test/unit/services/settings/loader_spec.js similarity index 96% rename from core/test/unit/services/settings/loader_spec.js rename to test/unit/services/settings/loader_spec.js index 8319838878..7215f616f8 100644 --- a/core/test/unit/services/settings/loader_spec.js +++ b/test/unit/services/settings/loader_spec.js @@ -4,8 +4,8 @@ const sinon = require('sinon'), fs = require('fs-extra'), path = require('path'), configUtils = require('../../../utils/configUtils'), - common = require('../../../../server/lib/common'), - loadSettings = rewire('../../../../frontend/services/settings/loader'); + common = require('../../../../core/server/lib/common'), + loadSettings = rewire('../../../../core/frontend/services/settings/loader'); describe('UNIT > Settings Service loader:', function () { beforeEach(function () { diff --git a/core/test/unit/services/settings/settings_spec.js b/test/unit/services/settings/settings_spec.js similarity index 97% rename from core/test/unit/services/settings/settings_spec.js rename to test/unit/services/settings/settings_spec.js index 32e850b717..4f9eb6b270 100644 --- a/core/test/unit/services/settings/settings_spec.js +++ b/test/unit/services/settings/settings_spec.js @@ -1,8 +1,8 @@ const sinon = require('sinon'), should = require('should'), rewire = require('rewire'), - common = require('../../../../server/lib/common'), - settings = rewire('../../../../frontend/services/settings'); + common = require('../../../../core/server/lib/common'), + settings = rewire('../../../../core/frontend/services/settings'); describe('UNIT > Settings Service:', function () { afterEach(function () { diff --git a/core/test/unit/services/settings/validate_spec.js b/test/unit/services/settings/validate_spec.js similarity index 99% rename from core/test/unit/services/settings/validate_spec.js rename to test/unit/services/settings/validate_spec.js index b73402374b..6c85a38b52 100644 --- a/core/test/unit/services/settings/validate_spec.js +++ b/test/unit/services/settings/validate_spec.js @@ -1,8 +1,8 @@ const should = require('should'); const sinon = require('sinon'); -const common = require('../../../../server/lib/common'); -const themesService = require('../../../../frontend/services/themes'); -const validate = require('../../../../frontend/services/settings/validate'); +const common = require('../../../../core/server/lib/common'); +const themesService = require('../../../../core/frontend/services/themes'); +const validate = require('../../../../core/frontend/services/settings/validate'); should.equal(true, true); diff --git a/core/test/unit/services/settings/yaml-parser_spec.js b/test/unit/services/settings/yaml-parser_spec.js similarity index 95% rename from core/test/unit/services/settings/yaml-parser_spec.js rename to test/unit/services/settings/yaml-parser_spec.js index fbfea628dd..4eb65ce2b9 100644 --- a/core/test/unit/services/settings/yaml-parser_spec.js +++ b/test/unit/services/settings/yaml-parser_spec.js @@ -4,7 +4,7 @@ const sinon = require('sinon'), yaml = require('js-yaml'), path = require('path'), - yamlParser = require('../../../../frontend/services/settings/yaml-parser'); + yamlParser = require('../../../../core/frontend/services/settings/yaml-parser'); describe('UNIT > Settings Service yaml parser:', function () { let yamlSpy; diff --git a/core/test/unit/services/slack_spec.js b/test/unit/services/slack_spec.js similarity index 95% rename from core/test/unit/services/slack_spec.js rename to test/unit/services/slack_spec.js index 5db5dd859a..e04afb4d80 100644 --- a/core/test/unit/services/slack_spec.js +++ b/test/unit/services/slack_spec.js @@ -6,12 +6,12 @@ var should = require('should'), configUtils = require('../../utils/configUtils'), // Stuff we test - slack = rewire('../../../server/services/slack'), - common = require('../../../server/lib/common'), - imageLib = require('../../../server/lib/image'), - urlService = require('../../../frontend/services/url'), - schema = require('../../../server/data/schema').checks, - settingsCache = require('../../../server/services/settings/cache'), + slack = rewire('../../../core/server/services/slack'), + common = require('../../../core/server/lib/common'), + imageLib = require('../../../core/server/lib/image'), + urlService = require('../../../core/frontend/services/url'), + schema = require('../../../core/server/data/schema').checks, + settingsCache = require('../../../core/server/services/settings/cache'), // Test data slackObjNoUrl = [{url: ''}], diff --git a/core/test/unit/services/themes/active_spec.js b/test/unit/services/themes/active_spec.js similarity index 94% rename from core/test/unit/services/themes/active_spec.js rename to test/unit/services/themes/active_spec.js index d5361c0058..8226aa1a85 100644 --- a/core/test/unit/services/themes/active_spec.js +++ b/test/unit/services/themes/active_spec.js @@ -1,10 +1,10 @@ var should = require('should'), sinon = require('sinon'), - config = require('../../../../server/config'), + config = require('../../../../core/server/config'), // is only exposed via themes.getActive() - activeTheme = require('../../../../frontend/services/themes/active'), - engine = require('../../../../frontend/services/themes/engine'); + activeTheme = require('../../../../core/frontend/services/themes/active'), + engine = require('../../../../core/frontend/services/themes/engine'); describe('Themes', function () { afterEach(function () { diff --git a/core/test/unit/services/themes/config_spec.js b/test/unit/services/themes/config_spec.js similarity index 92% rename from core/test/unit/services/themes/config_spec.js rename to test/unit/services/themes/config_spec.js index 67c8c21aa7..6b09e73012 100644 --- a/core/test/unit/services/themes/config_spec.js +++ b/test/unit/services/themes/config_spec.js @@ -1,7 +1,7 @@ var should = require('should'), sinon = require('sinon'), - themeConfig = require('../../../../frontend/services/themes/config'); + themeConfig = require('../../../../core/frontend/services/themes/config'); describe('Themes', function () { afterEach(function () { diff --git a/core/test/unit/services/themes/engines/create_spec.js b/test/unit/services/themes/engines/create_spec.js similarity index 97% rename from core/test/unit/services/themes/engines/create_spec.js rename to test/unit/services/themes/engines/create_spec.js index f7de298d5a..9dfb01dfe8 100644 --- a/core/test/unit/services/themes/engines/create_spec.js +++ b/test/unit/services/themes/engines/create_spec.js @@ -1,6 +1,6 @@ const should = require('should'); const sinon = require('sinon'); -const themeEngines = require('../../../../../frontend/services/themes/engines'); +const themeEngines = require('../../../../../core/frontend/services/themes/engines'); describe('Themes: engines', function () { afterEach(function () { diff --git a/core/test/unit/services/themes/list_spec.js b/test/unit/services/themes/list_spec.js similarity index 97% rename from core/test/unit/services/themes/list_spec.js rename to test/unit/services/themes/list_spec.js index ef7283a0fc..5f99929dc8 100644 --- a/core/test/unit/services/themes/list_spec.js +++ b/test/unit/services/themes/list_spec.js @@ -1,7 +1,7 @@ var should = require('should'), sinon = require('sinon'), _ = require('lodash'), - themeList = require('../../../../frontend/services/themes/list'); + themeList = require('../../../../core/frontend/services/themes/list'); describe('Themes', function () { afterEach(function () { diff --git a/core/test/unit/services/themes/loader_spec.js b/test/unit/services/themes/loader_spec.js similarity index 96% rename from core/test/unit/services/themes/loader_spec.js rename to test/unit/services/themes/loader_spec.js index 19471e1f82..2e7e277c92 100644 --- a/core/test/unit/services/themes/loader_spec.js +++ b/test/unit/services/themes/loader_spec.js @@ -3,9 +3,9 @@ var should = require('should'), fs = require('fs-extra'), tmp = require('tmp'), join = require('path').join, - config = require('../../../../server/config'), - loader = require('../../../../frontend/services/themes/loader'), - themeList = require('../../../../frontend/services/themes/list'); + config = require('../../../../core/server/config'), + loader = require('../../../../core/frontend/services/themes/loader'), + themeList = require('../../../../core/frontend/services/themes/list'); describe('Themes', function () { afterEach(function () { diff --git a/core/test/unit/services/themes/middleware_spec.js b/test/unit/services/themes/middleware_spec.js similarity index 93% rename from core/test/unit/services/themes/middleware_spec.js rename to test/unit/services/themes/middleware_spec.js index 564ae92507..bc9c18af3b 100644 --- a/core/test/unit/services/themes/middleware_spec.js +++ b/test/unit/services/themes/middleware_spec.js @@ -1,10 +1,10 @@ const should = require('should'); const sinon = require('sinon'); -const hbs = require('../../../../frontend/services/themes/engine'); -const themes = require('../../../../frontend/services/themes'); +const hbs = require('../../../../core/frontend/services/themes/engine'); +const themes = require('../../../../core/frontend/services/themes'); // is only exposed via themes.getActive() -const activeTheme = require('../../../../frontend/services/themes/active'); -const settingsCache = require('../../../../server/services/settings/cache'); +const activeTheme = require('../../../../core/frontend/services/themes/active'); +const settingsCache = require('../../../../core/server/services/settings/cache'); const middleware = themes.middleware; const sandbox = sinon.createSandbox(); diff --git a/core/test/unit/services/themes/validate_spec.js b/test/unit/services/themes/validate_spec.js similarity index 98% rename from core/test/unit/services/themes/validate_spec.js rename to test/unit/services/themes/validate_spec.js index a6c3f80745..08a3326ebf 100644 --- a/core/test/unit/services/themes/validate_spec.js +++ b/test/unit/services/themes/validate_spec.js @@ -2,7 +2,7 @@ const should = require('should'); const sinon = require('sinon'); const _ = require('lodash'); -const validate = require('../../../../frontend/services/themes/validate'); +const validate = require('../../../../core/frontend/services/themes/validate'); const gscan = require('gscan'); diff --git a/core/test/unit/services/url/Queue_spec.js b/test/unit/services/url/Queue_spec.js similarity index 98% rename from core/test/unit/services/url/Queue_spec.js rename to test/unit/services/url/Queue_spec.js index 80d52d3700..cf61d0ef3c 100644 --- a/core/test/unit/services/url/Queue_spec.js +++ b/test/unit/services/url/Queue_spec.js @@ -2,8 +2,8 @@ const _ = require('lodash'); const Promise = require('bluebird'); const should = require('should'); const sinon = require('sinon'); -const common = require('../../../../server/lib/common'); -const Queue = require('../../../../frontend/services/url/Queue'); +const common = require('../../../../core/server/lib/common'); +const Queue = require('../../../../core/frontend/services/url/Queue'); describe('Unit: services/url/Queue', function () { let queue; diff --git a/core/test/unit/services/url/UrlGenerator_spec.js b/test/unit/services/url/UrlGenerator_spec.js similarity index 98% rename from core/test/unit/services/url/UrlGenerator_spec.js rename to test/unit/services/url/UrlGenerator_spec.js index 5e19e438a0..c3e910196b 100644 --- a/core/test/unit/services/url/UrlGenerator_spec.js +++ b/test/unit/services/url/UrlGenerator_spec.js @@ -3,8 +3,8 @@ const Promise = require('bluebird'); const should = require('should'); const nql = require('@nexes/nql'); const sinon = require('sinon'); -const urlUtils = require('../../../../server/lib/url-utils'); -const UrlGenerator = require('../../../../frontend/services/url/UrlGenerator'); +const urlUtils = require('../../../../core/server/lib/url-utils'); +const UrlGenerator = require('../../../../core/frontend/services/url/UrlGenerator'); describe('Unit: services/url/UrlGenerator', function () { let queue, router, urls, resources, resource, resource2; diff --git a/core/test/unit/services/url/UrlService_spec.js b/test/unit/services/url/UrlService_spec.js similarity index 96% rename from core/test/unit/services/url/UrlService_spec.js rename to test/unit/services/url/UrlService_spec.js index 4bf03ebb6e..b3c4e7de85 100644 --- a/core/test/unit/services/url/UrlService_spec.js +++ b/test/unit/services/url/UrlService_spec.js @@ -3,12 +3,12 @@ const Promise = require('bluebird'); const rewire = require('rewire'); const should = require('should'); const sinon = require('sinon'); -const common = require('../../../../server/lib/common'); -const Queue = require('../../../../frontend/services/url/Queue'); -const Resources = require('../../../../frontend/services/url/Resources'); -const UrlGenerator = require('../../../../frontend/services/url/UrlGenerator'); -const Urls = require('../../../../frontend/services/url/Urls'); -const UrlService = rewire('../../../../frontend/services/url/UrlService'); +const common = require('../../../../core/server/lib/common'); +const Queue = require('../../../../core/frontend/services/url/Queue'); +const Resources = require('../../../../core/frontend/services/url/Resources'); +const UrlGenerator = require('../../../../core/frontend/services/url/UrlGenerator'); +const Urls = require('../../../../core/frontend/services/url/Urls'); +const UrlService = rewire('../../../../core/frontend/services/url/UrlService'); describe('Unit: services/url/UrlService', function () { let QueueStub, ResourcesStub, UrlsStub, UrlGeneratorStub, urlService; diff --git a/core/test/unit/services/url/Urls_spec.js b/test/unit/services/url/Urls_spec.js similarity index 95% rename from core/test/unit/services/url/Urls_spec.js rename to test/unit/services/url/Urls_spec.js index b07b89b35a..b3b3409cdd 100644 --- a/core/test/unit/services/url/Urls_spec.js +++ b/test/unit/services/url/Urls_spec.js @@ -3,8 +3,8 @@ const Promise = require('bluebird'); const should = require('should'); const jsonpath = require('jsonpath'); const sinon = require('sinon'); -const common = require('../../../../server/lib/common'); -const Urls = require('../../../../frontend/services/url/Urls'); +const common = require('../../../../core/server/lib/common'); +const Urls = require('../../../../core/frontend/services/url/Urls'); describe('Unit: services/url/Urls', function () { let urls, eventsToRemember; diff --git a/core/test/unit/services/xmlrpc_spec.js b/test/unit/services/xmlrpc_spec.js similarity index 98% rename from core/test/unit/services/xmlrpc_spec.js rename to test/unit/services/xmlrpc_spec.js index 69ac03eb23..8cd0d45cf5 100644 --- a/core/test/unit/services/xmlrpc_spec.js +++ b/test/unit/services/xmlrpc_spec.js @@ -6,8 +6,8 @@ var should = require('should'), rewire = require('rewire'), testUtils = require('../../utils'), configUtils = require('../../utils/configUtils'), - xmlrpc = rewire('../../../server/services/xmlrpc'), - common = require('../../../server/lib/common'); + xmlrpc = rewire('../../../core/server/services/xmlrpc'), + common = require('../../../core/server/lib/common'); describe('XMLRPC', function () { var eventStub; diff --git a/core/test/unit/web/admin/controller_spec.js b/test/unit/web/admin/controller_spec.js similarity index 94% rename from core/test/unit/web/admin/controller_spec.js rename to test/unit/web/admin/controller_spec.js index 47381d0fa5..7988042cb2 100644 --- a/core/test/unit/web/admin/controller_spec.js +++ b/test/unit/web/admin/controller_spec.js @@ -1,7 +1,7 @@ require('should'); const sinon = require('sinon'); const configUtils = require('../../../utils/configUtils'); -const controller = require('../../../../server/web/admin/controller'); +const controller = require('../../../../core/server/web/admin/controller'); describe('Admin App', function () { describe('controller', function () { diff --git a/core/test/unit/web/admin/middleware_spec.js b/test/unit/web/admin/middleware_spec.js similarity index 95% rename from core/test/unit/web/admin/middleware_spec.js rename to test/unit/web/admin/middleware_spec.js index 6b7549c6b2..5b352b46e9 100644 --- a/core/test/unit/web/admin/middleware_spec.js +++ b/test/unit/web/admin/middleware_spec.js @@ -2,7 +2,7 @@ var should = require('should'), sinon = require('sinon'), // Thing we are testing - redirectAdminUrls = require('../../../../server/web/admin/middleware')[0]; + redirectAdminUrls = require('../../../../core/server/web/admin/middleware')[0]; describe('Admin App', function () { afterEach(function () { diff --git a/core/test/unit/web/api/canary/content/middleware_spec.js b/test/unit/web/api/canary/content/middleware_spec.js similarity index 73% rename from core/test/unit/web/api/canary/content/middleware_spec.js rename to test/unit/web/api/canary/content/middleware_spec.js index f474c07f3b..35b839f6f4 100644 --- a/core/test/unit/web/api/canary/content/middleware_spec.js +++ b/test/unit/web/api/canary/content/middleware_spec.js @@ -1,5 +1,5 @@ const should = require('should'); -const middleware = require('../../../../../../server/web/api/canary/content/middleware'); +const middleware = require('../../../../../../core/server/web/api/canary/content/middleware'); describe('Content Api canary middleware', function () { it('exports an authenticatePublic middleware', function () { @@ -9,7 +9,7 @@ describe('Content Api canary middleware', function () { describe('authenticatePublic', function () { it('uses brute content api middleware as the first middleware in the chain', function () { const firstMiddleware = middleware.authenticatePublic[0]; - const brute = require('../../../../../../server/web/shared/middlewares/brute'); + const brute = require('../../../../../../core/server/web/shared/middlewares/brute'); should.equal(firstMiddleware, brute.contentApiKey); }); diff --git a/core/test/unit/web/api/v2/content/middleware_spec.js b/test/unit/web/api/v2/content/middleware_spec.js similarity index 73% rename from core/test/unit/web/api/v2/content/middleware_spec.js rename to test/unit/web/api/v2/content/middleware_spec.js index a25001473d..ba58662011 100644 --- a/core/test/unit/web/api/v2/content/middleware_spec.js +++ b/test/unit/web/api/v2/content/middleware_spec.js @@ -1,5 +1,5 @@ const should = require('should'); -const middleware = require('../../../../../../server/web/api/v2/content/middleware'); +const middleware = require('../../../../../../core/server/web/api/v2/content/middleware'); describe('Content Api v2 middleware', function () { it('exports an authenticatePublic middleware', function () { @@ -9,7 +9,7 @@ describe('Content Api v2 middleware', function () { describe('authenticatePublic', function () { it('uses brute content api middleware as the first middleware in the chain', function () { const firstMiddleware = middleware.authenticatePublic[0]; - const brute = require('../../../../../../server/web/shared/middlewares/brute'); + const brute = require('../../../../../../core/server/web/shared/middlewares/brute'); should.equal(firstMiddleware, brute.contentApiKey); }); diff --git a/core/test/unit/web/api/v3/content/middleware_spec.js b/test/unit/web/api/v3/content/middleware_spec.js similarity index 73% rename from core/test/unit/web/api/v3/content/middleware_spec.js rename to test/unit/web/api/v3/content/middleware_spec.js index e92d48f2f9..f3c5893539 100644 --- a/core/test/unit/web/api/v3/content/middleware_spec.js +++ b/test/unit/web/api/v3/content/middleware_spec.js @@ -1,5 +1,5 @@ const should = require('should'); -const middleware = require('../../../../../../server/web/api/canary/content/middleware'); +const middleware = require('../../../../../../core/server/web/api/canary/content/middleware'); describe('Content Api v3 middleware', function () { it('exports an authenticatePublic middleware', function () { @@ -9,7 +9,7 @@ describe('Content Api v3 middleware', function () { describe('authenticatePublic', function () { it('uses brute content api middleware as the first middleware in the chain', function () { const firstMiddleware = middleware.authenticatePublic[0]; - const brute = require('../../../../../../server/web/shared/middlewares/brute'); + const brute = require('../../../../../../core/server/web/shared/middlewares/brute'); should.equal(firstMiddleware, brute.contentApiKey); }); diff --git a/core/test/unit/web/middleware/api/cors_spec.js b/test/unit/web/middleware/api/cors_spec.js similarity index 95% rename from core/test/unit/web/middleware/api/cors_spec.js rename to test/unit/web/middleware/api/cors_spec.js index e8144f777f..dcb54aeac4 100644 --- a/core/test/unit/web/middleware/api/cors_spec.js +++ b/test/unit/web/middleware/api/cors_spec.js @@ -2,7 +2,7 @@ var should = require('should'), sinon = require('sinon'), rewire = require('rewire'), urlUtils = require('../../../../utils/urlUtils'), - cors = rewire('../../../../../server/web/shared/middlewares/api/cors'); + cors = rewire('../../../../../core/server/web/shared/middlewares/api/cors'); describe('cors', function () { var res, req, next; @@ -29,7 +29,7 @@ describe('cors', function () { afterEach(function () { sinon.restore(); - cors = rewire('../../../../../server/web/shared/middlewares/api/cors'); + cors = rewire('../../../../../core/server/web/shared/middlewares/api/cors'); }); it('should not be enabled without a request origin header', function (done) { diff --git a/core/test/unit/web/middleware/api/version-match_spec.js b/test/unit/web/middleware/api/version-match_spec.js similarity index 97% rename from core/test/unit/web/middleware/api/version-match_spec.js rename to test/unit/web/middleware/api/version-match_spec.js index 9a9f5982ec..f7c51d0ea2 100644 --- a/core/test/unit/web/middleware/api/version-match_spec.js +++ b/test/unit/web/middleware/api/version-match_spec.js @@ -1,6 +1,6 @@ var should = require('should'), sinon = require('sinon'), - versionMatch = require('../../../../../server/web/shared/middlewares/api/version-match'); + versionMatch = require('../../../../../core/server/web/shared/middlewares/api/version-match'); describe('Version Mismatch', function () { var req, res, getStub, nextStub; diff --git a/core/test/unit/web/middleware/cache-control_spec.js b/test/unit/web/middleware/cache-control_spec.js similarity index 96% rename from core/test/unit/web/middleware/cache-control_spec.js rename to test/unit/web/middleware/cache-control_spec.js index 3e493f872e..479b17ae38 100644 --- a/core/test/unit/web/middleware/cache-control_spec.js +++ b/test/unit/web/middleware/cache-control_spec.js @@ -1,6 +1,6 @@ var should = require('should'), sinon = require('sinon'), - cacheControl = require('../../../../server/web/shared/middlewares/cache-control'); + cacheControl = require('../../../../core/server/web/shared/middlewares/cache-control'); describe('Middleware: cacheControl', function () { var res; diff --git a/core/test/unit/web/middleware/ghost-locals_spec.js b/test/unit/web/middleware/ghost-locals_spec.js similarity index 86% rename from core/test/unit/web/middleware/ghost-locals_spec.js rename to test/unit/web/middleware/ghost-locals_spec.js index 942a23e1cd..3ea33e8813 100644 --- a/core/test/unit/web/middleware/ghost-locals_spec.js +++ b/test/unit/web/middleware/ghost-locals_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const sinon = require('sinon'); -const ghostLocals = require('../../../../server/web/shared/middlewares/ghost-locals'); -const themeService = require('../../../../frontend/services/themes'); +const ghostLocals = require('../../../../core/server/web/shared/middlewares/ghost-locals'); +const themeService = require('../../../../core/frontend/services/themes'); describe('Theme Handler', function () { let req, res, next; diff --git a/core/test/unit/web/middleware/image/handle-image-sizes_spec.js b/test/unit/web/middleware/image/handle-image-sizes_spec.js similarity index 92% rename from core/test/unit/web/middleware/image/handle-image-sizes_spec.js rename to test/unit/web/middleware/image/handle-image-sizes_spec.js index 60c46f3bb2..0aa1cce41e 100644 --- a/core/test/unit/web/middleware/image/handle-image-sizes_spec.js +++ b/test/unit/web/middleware/image/handle-image-sizes_spec.js @@ -1,5 +1,5 @@ const should = require('should'); -const handleImageSizes = require('../../../../../server/web/shared/middlewares/image/handle-image-sizes.js'); +const handleImageSizes = require('../../../../../core/server/web/shared/middlewares/image/handle-image-sizes.js'); // @TODO make these tests lovely and non specific to implementation describe('handleImageSizes middleware', function () { diff --git a/core/test/unit/web/middleware/image/normalize_spec.js b/test/unit/web/middleware/image/normalize_spec.js similarity index 93% rename from core/test/unit/web/middleware/image/normalize_spec.js rename to test/unit/web/middleware/image/normalize_spec.js index d255cae939..949623f652 100644 --- a/core/test/unit/web/middleware/image/normalize_spec.js +++ b/test/unit/web/middleware/image/normalize_spec.js @@ -2,8 +2,8 @@ const should = require('should'); const sinon = require('sinon'); const configUtils = require('../../../../utils/configUtils'); const imageTransform = require('@tryghost/image-transform'); -const {logging} = require('../../../../../server/lib/common'); -const normalize = require('../../../../../server/web/shared/middlewares/image/normalize'); +const {logging} = require('../../../../../core/server/lib/common'); +const normalize = require('../../../../../core/server/web/shared/middlewares/image/normalize'); describe('normalize', function () { let res, req; diff --git a/core/test/unit/web/middleware/request-id_spec.js b/test/unit/web/middleware/request-id_spec.js similarity index 93% rename from core/test/unit/web/middleware/request-id_spec.js rename to test/unit/web/middleware/request-id_spec.js index 4e24becd46..878d966e5f 100644 --- a/core/test/unit/web/middleware/request-id_spec.js +++ b/test/unit/web/middleware/request-id_spec.js @@ -2,7 +2,7 @@ const should = require('should'); const sinon = require('sinon'); const validator = require('validator'); -const requestId = require('../../../../server/web/shared/middlewares/request-id'); +const requestId = require('../../../../core/server/web/shared/middlewares/request-id'); describe('Request ID middleware', function () { var res, req, next; diff --git a/core/test/unit/web/middleware/serve-favicon_spec.js b/test/unit/web/middleware/serve-favicon_spec.js similarity index 96% rename from core/test/unit/web/middleware/serve-favicon_spec.js rename to test/unit/web/middleware/serve-favicon_spec.js index 3bf1bed6f8..98e583a416 100644 --- a/core/test/unit/web/middleware/serve-favicon_spec.js +++ b/test/unit/web/middleware/serve-favicon_spec.js @@ -1,9 +1,9 @@ var should = require('should'), sinon = require('sinon'), express = require('express'), - serveFavicon = require('../../../../server/web/shared/middlewares/serve-favicon'), - settingsCache = require('../../../../server/services/settings/cache'), - storage = require('../../../../server/adapters/storage'), + serveFavicon = require('../../../../core/server/web/shared/middlewares/serve-favicon'), + settingsCache = require('../../../../core/server/services/settings/cache'), + storage = require('../../../../core/server/adapters/storage'), configUtils = require('../../../utils/configUtils'), path = require('path'); diff --git a/core/test/unit/web/middleware/serve-public-file_spec.js b/test/unit/web/middleware/serve-public-file_spec.js similarity index 97% rename from core/test/unit/web/middleware/serve-public-file_spec.js rename to test/unit/web/middleware/serve-public-file_spec.js index a8627af9f9..9b6962dec0 100644 --- a/core/test/unit/web/middleware/serve-public-file_spec.js +++ b/test/unit/web/middleware/serve-public-file_spec.js @@ -1,7 +1,7 @@ var should = require('should'), sinon = require('sinon'), fs = require('fs-extra'), - servePublicFile = require('../../../../server/web/shared/middlewares/serve-public-file'); + servePublicFile = require('../../../../core/server/web/shared/middlewares/serve-public-file'); describe('servePublicFile', function () { var res, req, next; diff --git a/core/test/unit/web/middleware/static-theme_spec.js b/test/unit/web/middleware/static-theme_spec.js similarity index 95% rename from core/test/unit/web/middleware/static-theme_spec.js rename to test/unit/web/middleware/static-theme_spec.js index b70cfb10d5..9d5588aa59 100644 --- a/core/test/unit/web/middleware/static-theme_spec.js +++ b/test/unit/web/middleware/static-theme_spec.js @@ -2,8 +2,8 @@ var should = require('should'), sinon = require('sinon'), express = require('express'), - themeUtils = require('../../../../frontend/services/themes'), - staticTheme = require('../../../../server/web/shared/middlewares/static-theme'); + themeUtils = require('../../../../core/frontend/services/themes'), + staticTheme = require('../../../../core/server/web/shared/middlewares/static-theme'); describe('staticTheme', function () { var expressStaticStub, activeThemeStub, req, res; diff --git a/core/test/unit/web/middleware/theme-handler_spec.js b/test/unit/web/middleware/theme-handler_spec.js similarity index 100% rename from core/test/unit/web/middleware/theme-handler_spec.js rename to test/unit/web/middleware/theme-handler_spec.js diff --git a/core/test/unit/web/middleware/uncapitalise_spec.js b/test/unit/web/middleware/uncapitalise_spec.js similarity index 98% rename from core/test/unit/web/middleware/uncapitalise_spec.js rename to test/unit/web/middleware/uncapitalise_spec.js index b2ec13dad2..c67f322973 100644 --- a/core/test/unit/web/middleware/uncapitalise_spec.js +++ b/test/unit/web/middleware/uncapitalise_spec.js @@ -1,6 +1,6 @@ var should = require('should'), sinon = require('sinon'), - uncapitalise = require('../../../../server/web/shared/middlewares/uncapitalise'); + uncapitalise = require('../../../../core/server/web/shared/middlewares/uncapitalise'); // NOTE: all urls will have had trailing slashes added before uncapitalise is called diff --git a/core/test/unit/web/middleware/update-user-last-seen_spec.js b/test/unit/web/middleware/update-user-last-seen_spec.js similarity index 92% rename from core/test/unit/web/middleware/update-user-last-seen_spec.js rename to test/unit/web/middleware/update-user-last-seen_spec.js index 9c55bd1974..24beee8bba 100644 --- a/core/test/unit/web/middleware/update-user-last-seen_spec.js +++ b/test/unit/web/middleware/update-user-last-seen_spec.js @@ -1,7 +1,7 @@ const should = require('should'); const sinon = require('sinon'); -const constants = require('../../../../server/lib/constants'); -const updateUserLastSeenMiddleware = require('../../../../server/web/shared/middlewares').updateUserLastSeen; +const constants = require('../../../../core/server/lib/constants'); +const updateUserLastSeenMiddleware = require('../../../../core/server/web/shared/middlewares').updateUserLastSeen; describe('updateUserLastSeenMiddleware', function () { afterEach(function () { diff --git a/core/test/unit/web/middleware/url-redirects_spec.js b/test/unit/web/middleware/url-redirects_spec.js similarity index 99% rename from core/test/unit/web/middleware/url-redirects_spec.js rename to test/unit/web/middleware/url-redirects_spec.js index 23f5cf728f..5f25bff059 100644 --- a/core/test/unit/web/middleware/url-redirects_spec.js +++ b/test/unit/web/middleware/url-redirects_spec.js @@ -2,7 +2,7 @@ var should = require('should'), sinon = require('sinon'), rewire = require('rewire'), urlUtils = require('../../../utils/urlUtils'), - urlRedirects = rewire('../../../../server/web/shared/middlewares/url-redirects'), + urlRedirects = rewire('../../../../core/server/web/shared/middlewares/url-redirects'), {adminRedirect} = urlRedirects, getAdminRedirectUrl = urlRedirects.__get__('_private.getAdminRedirectUrl'), getBlogRedirectUrl = urlRedirects.__get__('_private.getBlogRedirectUrl'), diff --git a/core/test/unit/web/parent-app_spec.js b/test/unit/web/parent-app_spec.js similarity index 98% rename from core/test/unit/web/parent-app_spec.js rename to test/unit/web/parent-app_spec.js index a7687dfb8a..2d37281258 100644 --- a/core/test/unit/web/parent-app_spec.js +++ b/test/unit/web/parent-app_spec.js @@ -30,7 +30,7 @@ describe('parent app', function () { gatewaySpy = sinon.spy(); authPagesSpy = sinon.spy(); - parentApp = proxyquire('../../../server/web/parent-app', { + parentApp = proxyquire('../../../core/server/web/parent-app', { express: expressStub, '@tryghost/vhost-middleware': vhostSpy, './api': apiSpy, diff --git a/core/test/unit/web/shared/middleware/api/spam-prevention_spec.js b/test/unit/web/shared/middleware/api/spam-prevention_spec.js similarity index 83% rename from core/test/unit/web/shared/middleware/api/spam-prevention_spec.js rename to test/unit/web/shared/middleware/api/spam-prevention_spec.js index 3e77e45005..f4626207f1 100644 --- a/core/test/unit/web/shared/middleware/api/spam-prevention_spec.js +++ b/test/unit/web/shared/middleware/api/spam-prevention_spec.js @@ -1,5 +1,5 @@ const should = require('should'); -const spamPrevention = require('../../../../../../server/web/shared/middlewares/api/spam-prevention'); +const spamPrevention = require('../../../../../../core/server/web/shared/middlewares/api/spam-prevention'); describe('Spam Prevention', function () { it('exports a contentApiKey method', function () { diff --git a/core/test/unit/web/shared/middleware/brute_spec.js b/test/unit/web/shared/middleware/brute_spec.js similarity index 81% rename from core/test/unit/web/shared/middleware/brute_spec.js rename to test/unit/web/shared/middleware/brute_spec.js index 78fb4cd80f..488da636bc 100644 --- a/core/test/unit/web/shared/middleware/brute_spec.js +++ b/test/unit/web/shared/middleware/brute_spec.js @@ -1,6 +1,6 @@ const should = require('should'); const sinon = require('sinon'); -const brute = require('../../../../../server/web/shared/middlewares/brute'); +const brute = require('../../../../../core/server/web/shared/middlewares/brute'); describe('brute middleware', function () { after(function () { @@ -13,7 +13,7 @@ describe('brute middleware', function () { describe('contentApiKey', function () { it('calls the contentApiKey method of spam prevention', function () { - const spamPrevention = require('../../../../../server/web/shared/middlewares/api/spam-prevention'); + const spamPrevention = require('../../../../../core/server/web/shared/middlewares/api/spam-prevention'); const contentApiKeyStub = sinon.stub(spamPrevention, 'contentApiKey'); // CASE: we don't care about what params it takes diff --git a/core/test/unit/web/utils_spec.js b/test/unit/web/utils_spec.js similarity index 96% rename from core/test/unit/web/utils_spec.js rename to test/unit/web/utils_spec.js index 3a85ab9160..b0f9026380 100644 --- a/core/test/unit/web/utils_spec.js +++ b/test/unit/web/utils_spec.js @@ -1,5 +1,5 @@ var should = require('should'), - webUtils = require('../../../server/web/shared/utils'); + webUtils = require('../../../core/server/web/shared/utils'); describe('web utils', function () { describe('checkFileExists', function () { diff --git a/core/test/utils/api.js b/test/utils/api.js similarity index 96% rename from core/test/utils/api.js rename to test/utils/api.js index 60093f15e5..eb7f8698d0 100644 --- a/core/test/utils/api.js +++ b/test/utils/api.js @@ -2,9 +2,9 @@ const _ = require('lodash'); const url = require('url'); const moment = require('moment'); const DataGenerator = require('./fixtures/data-generator'); -const config = require('../../server/config'); -const common = require('../../server/lib/common'); -const sequence = require('../../server/lib/promise/sequence'); +const config = require('../../core/server/config'); +const common = require('../../core/server/lib/common'); +const sequence = require('../../core/server/lib/promise/sequence'); const host = config.get('server').host; const port = config.get('server').port; const protocol = 'http://'; diff --git a/core/test/utils/assertions.js b/test/utils/assertions.js similarity index 100% rename from core/test/utils/assertions.js rename to test/utils/assertions.js diff --git a/core/test/utils/configUtils.js b/test/utils/configUtils.js similarity index 95% rename from core/test/utils/configUtils.js rename to test/utils/configUtils.js index e271707753..8206f7e956 100644 --- a/core/test/utils/configUtils.js +++ b/test/utils/configUtils.js @@ -1,5 +1,5 @@ var _ = require('lodash'), - config = require('../../server/config'), + config = require('../../core/server/config'), configUtils = {}; configUtils.config = config; diff --git a/core/test/utils/fixtures/config/config.testing-mysql.json b/test/utils/fixtures/config/config.testing-mysql.json similarity index 100% rename from core/test/utils/fixtures/config/config.testing-mysql.json rename to test/utils/fixtures/config/config.testing-mysql.json diff --git a/core/test/utils/fixtures/config/config.testing.json b/test/utils/fixtures/config/config.testing.json similarity index 100% rename from core/test/utils/fixtures/config/config.testing.json rename to test/utils/fixtures/config/config.testing.json diff --git a/core/test/utils/fixtures/config/defaults.json b/test/utils/fixtures/config/defaults.json similarity index 100% rename from core/test/utils/fixtures/config/defaults.json rename to test/utils/fixtures/config/defaults.json diff --git a/core/test/utils/fixtures/config/env/config.testing-mysql.json b/test/utils/fixtures/config/env/config.testing-mysql.json similarity index 100% rename from core/test/utils/fixtures/config/env/config.testing-mysql.json rename to test/utils/fixtures/config/env/config.testing-mysql.json diff --git a/core/test/utils/fixtures/config/env/config.testing.json b/test/utils/fixtures/config/env/config.testing.json similarity index 100% rename from core/test/utils/fixtures/config/env/config.testing.json rename to test/utils/fixtures/config/env/config.testing.json diff --git a/core/test/utils/fixtures/config/overrides.json b/test/utils/fixtures/config/overrides.json similarity index 100% rename from core/test/utils/fixtures/config/overrides.json rename to test/utils/fixtures/config/overrides.json diff --git a/core/test/utils/fixtures/csv/members-with-duplicate-stripe-ids.csv b/test/utils/fixtures/csv/members-with-duplicate-stripe-ids.csv similarity index 100% rename from core/test/utils/fixtures/csv/members-with-duplicate-stripe-ids.csv rename to test/utils/fixtures/csv/members-with-duplicate-stripe-ids.csv diff --git a/core/test/utils/fixtures/csv/single-column-with-header.csv b/test/utils/fixtures/csv/single-column-with-header.csv similarity index 100% rename from core/test/utils/fixtures/csv/single-column-with-header.csv rename to test/utils/fixtures/csv/single-column-with-header.csv diff --git a/core/test/utils/fixtures/csv/two-columns-obscure-header.csv b/test/utils/fixtures/csv/two-columns-obscure-header.csv similarity index 100% rename from core/test/utils/fixtures/csv/two-columns-obscure-header.csv rename to test/utils/fixtures/csv/two-columns-obscure-header.csv diff --git a/core/test/utils/fixtures/csv/two-columns-with-header.csv b/test/utils/fixtures/csv/two-columns-with-header.csv similarity index 100% rename from core/test/utils/fixtures/csv/two-columns-with-header.csv rename to test/utils/fixtures/csv/two-columns-with-header.csv diff --git a/core/test/utils/fixtures/csv/valid-members-defaults.csv b/test/utils/fixtures/csv/valid-members-defaults.csv similarity index 100% rename from core/test/utils/fixtures/csv/valid-members-defaults.csv rename to test/utils/fixtures/csv/valid-members-defaults.csv diff --git a/core/test/utils/fixtures/csv/valid-members-import.csv b/test/utils/fixtures/csv/valid-members-import.csv similarity index 100% rename from core/test/utils/fixtures/csv/valid-members-import.csv rename to test/utils/fixtures/csv/valid-members-import.csv diff --git a/core/test/utils/fixtures/data-generator.js b/test/utils/fixtures/data-generator.js similarity index 99% rename from core/test/utils/fixtures/data-generator.js rename to test/utils/fixtures/data-generator.js index 1c1676c97a..0fe2f72dc3 100644 --- a/core/test/utils/fixtures/data-generator.js +++ b/test/utils/fixtures/data-generator.js @@ -2,7 +2,7 @@ var _ = require('lodash'), uuid = require('uuid'), ObjectId = require('bson-objectid'), moment = require('moment'), - constants = require('../../../server/lib/constants'), + constants = require('../../../core/server/lib/constants'), DataGenerator = {}; DataGenerator.markdownToMobiledoc = function markdownToMobiledoc(content) { diff --git a/core/test/utils/fixtures/data/redirects.json b/test/utils/fixtures/data/redirects.json similarity index 100% rename from core/test/utils/fixtures/data/redirects.json rename to test/utils/fixtures/data/redirects.json diff --git a/core/test/utils/fixtures/export/broken.json b/test/utils/fixtures/export/broken.json similarity index 100% rename from core/test/utils/fixtures/export/broken.json rename to test/utils/fixtures/export/broken.json diff --git a/core/test/utils/fixtures/export/default_export.json b/test/utils/fixtures/export/default_export.json similarity index 100% rename from core/test/utils/fixtures/export/default_export.json rename to test/utils/fixtures/export/default_export.json diff --git a/core/test/utils/fixtures/export/valid.json b/test/utils/fixtures/export/valid.json similarity index 100% rename from core/test/utils/fixtures/export/valid.json rename to test/utils/fixtures/export/valid.json diff --git a/core/test/utils/fixtures/filter-param/index.js b/test/utils/fixtures/filter-param/index.js similarity index 98% rename from core/test/utils/fixtures/filter-param/index.js rename to test/utils/fixtures/filter-param/index.js index 3970752fa7..cd221ca9ad 100644 --- a/core/test/utils/fixtures/filter-param/index.js +++ b/test/utils/fixtures/filter-param/index.js @@ -3,8 +3,8 @@ */ var _ = require('lodash'), ObjectId = require('bson-objectid'), - db = require('../../../../server/data/db'), - markdownToMobiledoc = require('../../../utils/fixtures/data-generator').markdownToMobiledoc, + db = require('../../../../core/server/data/db'), + markdownToMobiledoc = require('../data-generator').markdownToMobiledoc, data = {}; // Password = Sl1m3rson diff --git a/core/test/utils/fixtures/images/favicon.ico b/test/utils/fixtures/images/favicon.ico similarity index 100% rename from core/test/utils/fixtures/images/favicon.ico rename to test/utils/fixtures/images/favicon.ico diff --git a/core/test/utils/fixtures/images/favicon.png b/test/utils/fixtures/images/favicon.png similarity index 100% rename from core/test/utils/fixtures/images/favicon.png rename to test/utils/fixtures/images/favicon.png diff --git a/core/test/utils/fixtures/images/favicon_16x_single.ico b/test/utils/fixtures/images/favicon_16x_single.ico similarity index 100% rename from core/test/utils/fixtures/images/favicon_16x_single.ico rename to test/utils/fixtures/images/favicon_16x_single.ico diff --git a/core/test/utils/fixtures/images/favicon_64x_single.ico b/test/utils/fixtures/images/favicon_64x_single.ico similarity index 100% rename from core/test/utils/fixtures/images/favicon_64x_single.ico rename to test/utils/fixtures/images/favicon_64x_single.ico diff --git a/core/test/utils/fixtures/images/favicon_multi_sizes.ico b/test/utils/fixtures/images/favicon_multi_sizes.ico similarity index 100% rename from core/test/utils/fixtures/images/favicon_multi_sizes.ico rename to test/utils/fixtures/images/favicon_multi_sizes.ico diff --git a/core/test/utils/fixtures/images/favicon_not_square.png b/test/utils/fixtures/images/favicon_not_square.png similarity index 100% rename from core/test/utils/fixtures/images/favicon_not_square.png rename to test/utils/fixtures/images/favicon_not_square.png diff --git a/core/test/utils/fixtures/images/favicon_size_too_large.png b/test/utils/fixtures/images/favicon_size_too_large.png similarity index 100% rename from core/test/utils/fixtures/images/favicon_size_too_large.png rename to test/utils/fixtures/images/favicon_size_too_large.png diff --git a/core/test/utils/fixtures/images/favicon_too_large.png b/test/utils/fixtures/images/favicon_too_large.png similarity index 100% rename from core/test/utils/fixtures/images/favicon_too_large.png rename to test/utils/fixtures/images/favicon_too_large.png diff --git a/core/test/utils/fixtures/images/favicon_too_small.png b/test/utils/fixtures/images/favicon_too_small.png similarity index 100% rename from core/test/utils/fixtures/images/favicon_too_small.png rename to test/utils/fixtures/images/favicon_too_small.png diff --git a/core/test/utils/fixtures/images/ghost-logo.png b/test/utils/fixtures/images/ghost-logo.png similarity index 100% rename from core/test/utils/fixtures/images/ghost-logo.png rename to test/utils/fixtures/images/ghost-logo.png diff --git a/core/test/utils/fixtures/images/ghost-logo.pngx b/test/utils/fixtures/images/ghost-logo.pngx similarity index 100% rename from core/test/utils/fixtures/images/ghost-logo.pngx rename to test/utils/fixtures/images/ghost-logo.pngx diff --git a/core/test/utils/fixtures/images/ghosticon.jpg b/test/utils/fixtures/images/ghosticon.jpg similarity index 100% rename from core/test/utils/fixtures/images/ghosticon.jpg rename to test/utils/fixtures/images/ghosticon.jpg diff --git a/core/test/utils/fixtures/images/loadingcat.gif b/test/utils/fixtures/images/loadingcat.gif similarity index 100% rename from core/test/utils/fixtures/images/loadingcat.gif rename to test/utils/fixtures/images/loadingcat.gif diff --git a/core/test/utils/fixtures/images/loadingcat_square.gif b/test/utils/fixtures/images/loadingcat_square.gif similarity index 100% rename from core/test/utils/fixtures/images/loadingcat_square.gif rename to test/utils/fixtures/images/loadingcat_square.gif diff --git a/core/test/utils/fixtures/images/myicon.ico b/test/utils/fixtures/images/myicon.ico similarity index 100% rename from core/test/utils/fixtures/images/myicon.ico rename to test/utils/fixtures/images/myicon.ico diff --git a/core/test/utils/fixtures/import/deleted-2014-12-19-test-1.md b/test/utils/fixtures/import/deleted-2014-12-19-test-1.md similarity index 100% rename from core/test/utils/fixtures/import/deleted-2014-12-19-test-1.md rename to test/utils/fixtures/import/deleted-2014-12-19-test-1.md diff --git a/core/test/utils/fixtures/import/draft-2014-12-19-test-1.md b/test/utils/fixtures/import/draft-2014-12-19-test-1.md similarity index 100% rename from core/test/utils/fixtures/import/draft-2014-12-19-test-1.md rename to test/utils/fixtures/import/draft-2014-12-19-test-1.md diff --git a/core/test/utils/fixtures/import/draft-2014-12-19-test-2.md b/test/utils/fixtures/import/draft-2014-12-19-test-2.md similarity index 100% rename from core/test/utils/fixtures/import/draft-2014-12-19-test-2.md rename to test/utils/fixtures/import/draft-2014-12-19-test-2.md diff --git a/core/test/utils/fixtures/import/draft-2014-12-19-test-3.md b/test/utils/fixtures/import/draft-2014-12-19-test-3.md similarity index 100% rename from core/test/utils/fixtures/import/draft-2014-12-19-test-3.md rename to test/utils/fixtures/import/draft-2014-12-19-test-3.md diff --git a/core/test/utils/fixtures/import/import-data-1.json b/test/utils/fixtures/import/import-data-1.json similarity index 100% rename from core/test/utils/fixtures/import/import-data-1.json rename to test/utils/fixtures/import/import-data-1.json diff --git a/core/test/utils/fixtures/import/import-data-lts.json b/test/utils/fixtures/import/import-data-lts.json similarity index 100% rename from core/test/utils/fixtures/import/import-data-lts.json rename to test/utils/fixtures/import/import-data-lts.json diff --git a/core/test/utils/fixtures/import/published-2014-12-19-test-1.md b/test/utils/fixtures/import/published-2014-12-19-test-1.md similarity index 100% rename from core/test/utils/fixtures/import/published-2014-12-19-test-1.md rename to test/utils/fixtures/import/published-2014-12-19-test-1.md diff --git a/core/test/utils/fixtures/import/zips/zip-image-dir/images/image.jpg b/test/utils/fixtures/import/zips/zip-image-dir/images/image.jpg similarity index 100% rename from core/test/utils/fixtures/import/zips/zip-image-dir/images/image.jpg rename to test/utils/fixtures/import/zips/zip-image-dir/images/image.jpg diff --git a/core/test/utils/fixtures/import/zips/zip-old-roon-export/Roon-Export/published/test.md b/test/utils/fixtures/import/zips/zip-old-roon-export/Roon-Export/published/test.md similarity index 100% rename from core/test/utils/fixtures/import/zips/zip-old-roon-export/Roon-Export/published/test.md rename to test/utils/fixtures/import/zips/zip-old-roon-export/Roon-Export/published/test.md diff --git a/core/test/utils/fixtures/import/zips/zip-with-base-dir/basedir/test.json b/test/utils/fixtures/import/zips/zip-with-base-dir/basedir/test.json similarity index 100% rename from core/test/utils/fixtures/import/zips/zip-with-base-dir/basedir/test.json rename to test/utils/fixtures/import/zips/zip-with-base-dir/basedir/test.json diff --git a/core/test/utils/fixtures/import/zips/zip-with-double-base-dir/basedir/basedir/test.json b/test/utils/fixtures/import/zips/zip-with-double-base-dir/basedir/basedir/test.json similarity index 100% rename from core/test/utils/fixtures/import/zips/zip-with-double-base-dir/basedir/basedir/test.json rename to test/utils/fixtures/import/zips/zip-with-double-base-dir/basedir/basedir/test.json diff --git a/core/test/utils/fixtures/import/zips/zip-without-base-dir/test.json b/test/utils/fixtures/import/zips/zip-without-base-dir/test.json similarity index 100% rename from core/test/utils/fixtures/import/zips/zip-without-base-dir/test.json rename to test/utils/fixtures/import/zips/zip-without-base-dir/test.json diff --git a/core/test/utils/fixtures/settings/badroutes.yaml b/test/utils/fixtures/settings/badroutes.yaml similarity index 100% rename from core/test/utils/fixtures/settings/badroutes.yaml rename to test/utils/fixtures/settings/badroutes.yaml diff --git a/core/test/utils/fixtures/settings/goodroutes.yaml b/test/utils/fixtures/settings/goodroutes.yaml similarity index 100% rename from core/test/utils/fixtures/settings/goodroutes.yaml rename to test/utils/fixtures/settings/goodroutes.yaml diff --git a/core/test/utils/fixtures/settings/newroutes.yaml b/test/utils/fixtures/settings/newroutes.yaml similarity index 100% rename from core/test/utils/fixtures/settings/newroutes.yaml rename to test/utils/fixtures/settings/newroutes.yaml diff --git a/core/test/utils/fixtures/settings/notyaml.md b/test/utils/fixtures/settings/notyaml.md similarity index 100% rename from core/test/utils/fixtures/settings/notyaml.md rename to test/utils/fixtures/settings/notyaml.md diff --git a/core/test/utils/fixtures/settings/routes.yaml b/test/utils/fixtures/settings/routes.yaml similarity index 100% rename from core/test/utils/fixtures/settings/routes.yaml rename to test/utils/fixtures/settings/routes.yaml diff --git a/core/test/utils/fixtures/settings/test.yml b/test/utils/fixtures/settings/test.yml similarity index 100% rename from core/test/utils/fixtures/settings/test.yml rename to test/utils/fixtures/settings/test.yml diff --git a/core/test/utils/fixtures/test.hbs b/test/utils/fixtures/test.hbs similarity index 100% rename from core/test/utils/fixtures/test.hbs rename to test/utils/fixtures/test.hbs diff --git a/core/test/utils/fixtures/themes/broken-theme/package.json b/test/utils/fixtures/themes/broken-theme/package.json similarity index 100% rename from core/test/utils/fixtures/themes/broken-theme/package.json rename to test/utils/fixtures/themes/broken-theme/package.json diff --git a/core/test/utils/fixtures/themes/casper-1.4/README.md b/test/utils/fixtures/themes/casper-1.4/README.md similarity index 100% rename from core/test/utils/fixtures/themes/casper-1.4/README.md rename to test/utils/fixtures/themes/casper-1.4/README.md diff --git a/core/test/utils/fixtures/themes/casper-1.4/assets/css/screen.css b/test/utils/fixtures/themes/casper-1.4/assets/css/screen.css similarity index 100% rename from core/test/utils/fixtures/themes/casper-1.4/assets/css/screen.css rename to test/utils/fixtures/themes/casper-1.4/assets/css/screen.css diff --git a/core/test/utils/fixtures/themes/casper-1.4/author.hbs b/test/utils/fixtures/themes/casper-1.4/author.hbs similarity index 100% rename from core/test/utils/fixtures/themes/casper-1.4/author.hbs rename to test/utils/fixtures/themes/casper-1.4/author.hbs diff --git a/core/test/utils/fixtures/themes/casper-1.4/default.hbs b/test/utils/fixtures/themes/casper-1.4/default.hbs similarity index 100% rename from core/test/utils/fixtures/themes/casper-1.4/default.hbs rename to test/utils/fixtures/themes/casper-1.4/default.hbs diff --git a/core/test/utils/fixtures/themes/casper-1.4/index.hbs b/test/utils/fixtures/themes/casper-1.4/index.hbs similarity index 100% rename from core/test/utils/fixtures/themes/casper-1.4/index.hbs rename to test/utils/fixtures/themes/casper-1.4/index.hbs diff --git a/core/test/utils/fixtures/themes/casper-1.4/package.json b/test/utils/fixtures/themes/casper-1.4/package.json similarity index 100% rename from core/test/utils/fixtures/themes/casper-1.4/package.json rename to test/utils/fixtures/themes/casper-1.4/package.json diff --git a/core/test/utils/fixtures/themes/casper-1.4/page.hbs b/test/utils/fixtures/themes/casper-1.4/page.hbs similarity index 100% rename from core/test/utils/fixtures/themes/casper-1.4/page.hbs rename to test/utils/fixtures/themes/casper-1.4/page.hbs diff --git a/core/test/utils/fixtures/themes/casper-1.4/partials/loop.hbs b/test/utils/fixtures/themes/casper-1.4/partials/loop.hbs similarity index 100% rename from core/test/utils/fixtures/themes/casper-1.4/partials/loop.hbs rename to test/utils/fixtures/themes/casper-1.4/partials/loop.hbs diff --git a/core/test/utils/fixtures/themes/casper-1.4/partials/navigation.hbs b/test/utils/fixtures/themes/casper-1.4/partials/navigation.hbs similarity index 100% rename from core/test/utils/fixtures/themes/casper-1.4/partials/navigation.hbs rename to test/utils/fixtures/themes/casper-1.4/partials/navigation.hbs diff --git a/core/test/utils/fixtures/themes/casper-1.4/post.hbs b/test/utils/fixtures/themes/casper-1.4/post.hbs similarity index 100% rename from core/test/utils/fixtures/themes/casper-1.4/post.hbs rename to test/utils/fixtures/themes/casper-1.4/post.hbs diff --git a/core/test/utils/fixtures/themes/casper-1.4/tag.hbs b/test/utils/fixtures/themes/casper-1.4/tag.hbs similarity index 100% rename from core/test/utils/fixtures/themes/casper-1.4/tag.hbs rename to test/utils/fixtures/themes/casper-1.4/tag.hbs diff --git a/core/test/utils/fixtures/themes/casper.zip b/test/utils/fixtures/themes/casper.zip similarity index 100% rename from core/test/utils/fixtures/themes/casper.zip rename to test/utils/fixtures/themes/casper.zip diff --git a/core/test/utils/fixtures/themes/casper/LICENSE b/test/utils/fixtures/themes/casper/LICENSE similarity index 100% rename from core/test/utils/fixtures/themes/casper/LICENSE rename to test/utils/fixtures/themes/casper/LICENSE diff --git a/core/test/utils/fixtures/themes/casper/README.md b/test/utils/fixtures/themes/casper/README.md similarity index 100% rename from core/test/utils/fixtures/themes/casper/README.md rename to test/utils/fixtures/themes/casper/README.md diff --git a/core/test/utils/fixtures/themes/casper/assets/built/global.css b/test/utils/fixtures/themes/casper/assets/built/global.css similarity index 100% rename from core/test/utils/fixtures/themes/casper/assets/built/global.css rename to test/utils/fixtures/themes/casper/assets/built/global.css diff --git a/core/test/utils/fixtures/themes/casper/assets/built/global.css.map b/test/utils/fixtures/themes/casper/assets/built/global.css.map similarity index 100% rename from core/test/utils/fixtures/themes/casper/assets/built/global.css.map rename to test/utils/fixtures/themes/casper/assets/built/global.css.map diff --git a/core/test/utils/fixtures/themes/casper/assets/built/screen.css b/test/utils/fixtures/themes/casper/assets/built/screen.css similarity index 100% rename from core/test/utils/fixtures/themes/casper/assets/built/screen.css rename to test/utils/fixtures/themes/casper/assets/built/screen.css diff --git a/core/test/utils/fixtures/themes/casper/assets/built/screen.css.map b/test/utils/fixtures/themes/casper/assets/built/screen.css.map similarity index 100% rename from core/test/utils/fixtures/themes/casper/assets/built/screen.css.map rename to test/utils/fixtures/themes/casper/assets/built/screen.css.map diff --git a/core/test/utils/fixtures/themes/casper/assets/css/.csscomb.json b/test/utils/fixtures/themes/casper/assets/css/.csscomb.json similarity index 100% rename from core/test/utils/fixtures/themes/casper/assets/css/.csscomb.json rename to test/utils/fixtures/themes/casper/assets/css/.csscomb.json diff --git a/core/test/utils/fixtures/themes/casper/assets/css/csscomb.json b/test/utils/fixtures/themes/casper/assets/css/csscomb.json similarity index 100% rename from core/test/utils/fixtures/themes/casper/assets/css/csscomb.json rename to test/utils/fixtures/themes/casper/assets/css/csscomb.json diff --git a/core/test/utils/fixtures/themes/casper/assets/css/global.css b/test/utils/fixtures/themes/casper/assets/css/global.css similarity index 100% rename from core/test/utils/fixtures/themes/casper/assets/css/global.css rename to test/utils/fixtures/themes/casper/assets/css/global.css diff --git a/core/test/utils/fixtures/themes/casper/assets/css/screen.css b/test/utils/fixtures/themes/casper/assets/css/screen.css similarity index 100% rename from core/test/utils/fixtures/themes/casper/assets/css/screen.css rename to test/utils/fixtures/themes/casper/assets/css/screen.css diff --git a/core/test/utils/fixtures/themes/casper/assets/screenshot-desktop.jpg b/test/utils/fixtures/themes/casper/assets/screenshot-desktop.jpg similarity index 100% rename from core/test/utils/fixtures/themes/casper/assets/screenshot-desktop.jpg rename to test/utils/fixtures/themes/casper/assets/screenshot-desktop.jpg diff --git a/core/test/utils/fixtures/themes/casper/assets/screenshot-mobile.jpg b/test/utils/fixtures/themes/casper/assets/screenshot-mobile.jpg similarity index 100% rename from core/test/utils/fixtures/themes/casper/assets/screenshot-mobile.jpg rename to test/utils/fixtures/themes/casper/assets/screenshot-mobile.jpg diff --git a/core/test/utils/fixtures/themes/casper/author.hbs b/test/utils/fixtures/themes/casper/author.hbs similarity index 100% rename from core/test/utils/fixtures/themes/casper/author.hbs rename to test/utils/fixtures/themes/casper/author.hbs diff --git a/core/test/utils/fixtures/themes/casper/default.hbs b/test/utils/fixtures/themes/casper/default.hbs similarity index 100% rename from core/test/utils/fixtures/themes/casper/default.hbs rename to test/utils/fixtures/themes/casper/default.hbs diff --git a/core/test/utils/fixtures/themes/casper/error-404.hbs b/test/utils/fixtures/themes/casper/error-404.hbs similarity index 100% rename from core/test/utils/fixtures/themes/casper/error-404.hbs rename to test/utils/fixtures/themes/casper/error-404.hbs diff --git a/core/test/utils/fixtures/themes/casper/error.hbs b/test/utils/fixtures/themes/casper/error.hbs similarity index 100% rename from core/test/utils/fixtures/themes/casper/error.hbs rename to test/utils/fixtures/themes/casper/error.hbs diff --git a/core/test/utils/fixtures/themes/casper/gulpfile.js b/test/utils/fixtures/themes/casper/gulpfile.js similarity index 100% rename from core/test/utils/fixtures/themes/casper/gulpfile.js rename to test/utils/fixtures/themes/casper/gulpfile.js diff --git a/core/test/utils/fixtures/themes/casper/index.hbs b/test/utils/fixtures/themes/casper/index.hbs similarity index 100% rename from core/test/utils/fixtures/themes/casper/index.hbs rename to test/utils/fixtures/themes/casper/index.hbs diff --git a/core/test/utils/fixtures/themes/casper/locales/de.json b/test/utils/fixtures/themes/casper/locales/de.json similarity index 100% rename from core/test/utils/fixtures/themes/casper/locales/de.json rename to test/utils/fixtures/themes/casper/locales/de.json diff --git a/core/test/utils/fixtures/themes/casper/locales/en.json b/test/utils/fixtures/themes/casper/locales/en.json similarity index 100% rename from core/test/utils/fixtures/themes/casper/locales/en.json rename to test/utils/fixtures/themes/casper/locales/en.json diff --git a/core/test/utils/fixtures/themes/casper/package.json b/test/utils/fixtures/themes/casper/package.json similarity index 100% rename from core/test/utils/fixtures/themes/casper/package.json rename to test/utils/fixtures/themes/casper/package.json diff --git a/core/test/utils/fixtures/themes/casper/page.hbs b/test/utils/fixtures/themes/casper/page.hbs similarity index 100% rename from core/test/utils/fixtures/themes/casper/page.hbs rename to test/utils/fixtures/themes/casper/page.hbs diff --git a/core/test/utils/fixtures/themes/casper/partials/byline-multiple.hbs b/test/utils/fixtures/themes/casper/partials/byline-multiple.hbs similarity index 100% rename from core/test/utils/fixtures/themes/casper/partials/byline-multiple.hbs rename to test/utils/fixtures/themes/casper/partials/byline-multiple.hbs diff --git a/core/test/utils/fixtures/themes/casper/partials/byline-single.hbs b/test/utils/fixtures/themes/casper/partials/byline-single.hbs similarity index 100% rename from core/test/utils/fixtures/themes/casper/partials/byline-single.hbs rename to test/utils/fixtures/themes/casper/partials/byline-single.hbs diff --git a/core/test/utils/fixtures/themes/casper/partials/floating-header.hbs b/test/utils/fixtures/themes/casper/partials/floating-header.hbs similarity index 100% rename from core/test/utils/fixtures/themes/casper/partials/floating-header.hbs rename to test/utils/fixtures/themes/casper/partials/floating-header.hbs diff --git a/core/test/utils/fixtures/themes/casper/partials/icons/avatar.hbs b/test/utils/fixtures/themes/casper/partials/icons/avatar.hbs similarity index 100% rename from core/test/utils/fixtures/themes/casper/partials/icons/avatar.hbs rename to test/utils/fixtures/themes/casper/partials/icons/avatar.hbs diff --git a/core/test/utils/fixtures/themes/casper/partials/icons/facebook.hbs b/test/utils/fixtures/themes/casper/partials/icons/facebook.hbs similarity index 100% rename from core/test/utils/fixtures/themes/casper/partials/icons/facebook.hbs rename to test/utils/fixtures/themes/casper/partials/icons/facebook.hbs diff --git a/core/test/utils/fixtures/themes/casper/partials/icons/ghost-logo.hbs b/test/utils/fixtures/themes/casper/partials/icons/ghost-logo.hbs similarity index 100% rename from core/test/utils/fixtures/themes/casper/partials/icons/ghost-logo.hbs rename to test/utils/fixtures/themes/casper/partials/icons/ghost-logo.hbs diff --git a/core/test/utils/fixtures/themes/casper/partials/icons/infinity.hbs b/test/utils/fixtures/themes/casper/partials/icons/infinity.hbs similarity index 100% rename from core/test/utils/fixtures/themes/casper/partials/icons/infinity.hbs rename to test/utils/fixtures/themes/casper/partials/icons/infinity.hbs diff --git a/core/test/utils/fixtures/themes/casper/partials/icons/location.hbs b/test/utils/fixtures/themes/casper/partials/icons/location.hbs similarity index 100% rename from core/test/utils/fixtures/themes/casper/partials/icons/location.hbs rename to test/utils/fixtures/themes/casper/partials/icons/location.hbs diff --git a/core/test/utils/fixtures/themes/casper/partials/icons/point.hbs b/test/utils/fixtures/themes/casper/partials/icons/point.hbs similarity index 100% rename from core/test/utils/fixtures/themes/casper/partials/icons/point.hbs rename to test/utils/fixtures/themes/casper/partials/icons/point.hbs diff --git a/core/test/utils/fixtures/themes/casper/partials/icons/rss.hbs b/test/utils/fixtures/themes/casper/partials/icons/rss.hbs similarity index 100% rename from core/test/utils/fixtures/themes/casper/partials/icons/rss.hbs rename to test/utils/fixtures/themes/casper/partials/icons/rss.hbs diff --git a/core/test/utils/fixtures/themes/casper/partials/icons/twitter.hbs b/test/utils/fixtures/themes/casper/partials/icons/twitter.hbs similarity index 100% rename from core/test/utils/fixtures/themes/casper/partials/icons/twitter.hbs rename to test/utils/fixtures/themes/casper/partials/icons/twitter.hbs diff --git a/core/test/utils/fixtures/themes/casper/partials/icons/website.hbs b/test/utils/fixtures/themes/casper/partials/icons/website.hbs similarity index 100% rename from core/test/utils/fixtures/themes/casper/partials/icons/website.hbs rename to test/utils/fixtures/themes/casper/partials/icons/website.hbs diff --git a/core/test/utils/fixtures/themes/casper/partials/post-card.hbs b/test/utils/fixtures/themes/casper/partials/post-card.hbs similarity index 100% rename from core/test/utils/fixtures/themes/casper/partials/post-card.hbs rename to test/utils/fixtures/themes/casper/partials/post-card.hbs diff --git a/core/test/utils/fixtures/themes/casper/partials/site-nav.hbs b/test/utils/fixtures/themes/casper/partials/site-nav.hbs similarity index 100% rename from core/test/utils/fixtures/themes/casper/partials/site-nav.hbs rename to test/utils/fixtures/themes/casper/partials/site-nav.hbs diff --git a/core/test/utils/fixtures/themes/casper/post.hbs b/test/utils/fixtures/themes/casper/post.hbs similarity index 100% rename from core/test/utils/fixtures/themes/casper/post.hbs rename to test/utils/fixtures/themes/casper/post.hbs diff --git a/core/test/utils/fixtures/themes/casper/tag.hbs b/test/utils/fixtures/themes/casper/tag.hbs similarity index 100% rename from core/test/utils/fixtures/themes/casper/tag.hbs rename to test/utils/fixtures/themes/casper/tag.hbs diff --git a/core/test/utils/fixtures/themes/casper/yarn.lock b/test/utils/fixtures/themes/casper/yarn.lock similarity index 100% rename from core/test/utils/fixtures/themes/casper/yarn.lock rename to test/utils/fixtures/themes/casper/yarn.lock diff --git a/core/test/utils/fixtures/themes/invalid.zip b/test/utils/fixtures/themes/invalid.zip similarity index 100% rename from core/test/utils/fixtures/themes/invalid.zip rename to test/utils/fixtures/themes/invalid.zip diff --git a/core/test/utils/fixtures/themes/test-theme-channels/channel2.hbs b/test/utils/fixtures/themes/test-theme-channels/channel2.hbs similarity index 100% rename from core/test/utils/fixtures/themes/test-theme-channels/channel2.hbs rename to test/utils/fixtures/themes/test-theme-channels/channel2.hbs diff --git a/core/test/utils/fixtures/themes/test-theme-channels/channel3.hbs b/test/utils/fixtures/themes/test-theme-channels/channel3.hbs similarity index 100% rename from core/test/utils/fixtures/themes/test-theme-channels/channel3.hbs rename to test/utils/fixtures/themes/test-theme-channels/channel3.hbs diff --git a/core/test/utils/fixtures/themes/test-theme-channels/default.hbs b/test/utils/fixtures/themes/test-theme-channels/default.hbs similarity index 100% rename from core/test/utils/fixtures/themes/test-theme-channels/default.hbs rename to test/utils/fixtures/themes/test-theme-channels/default.hbs diff --git a/core/test/utils/fixtures/themes/test-theme-channels/index.hbs b/test/utils/fixtures/themes/test-theme-channels/index.hbs similarity index 100% rename from core/test/utils/fixtures/themes/test-theme-channels/index.hbs rename to test/utils/fixtures/themes/test-theme-channels/index.hbs diff --git a/core/test/utils/fixtures/themes/test-theme/assets/built/global.css b/test/utils/fixtures/themes/test-theme/assets/built/global.css similarity index 100% rename from core/test/utils/fixtures/themes/test-theme/assets/built/global.css rename to test/utils/fixtures/themes/test-theme/assets/built/global.css diff --git a/core/test/utils/fixtures/themes/test-theme/assets/built/global.css.map b/test/utils/fixtures/themes/test-theme/assets/built/global.css.map similarity index 100% rename from core/test/utils/fixtures/themes/test-theme/assets/built/global.css.map rename to test/utils/fixtures/themes/test-theme/assets/built/global.css.map diff --git a/core/test/utils/fixtures/themes/test-theme/assets/built/screen.css b/test/utils/fixtures/themes/test-theme/assets/built/screen.css similarity index 100% rename from core/test/utils/fixtures/themes/test-theme/assets/built/screen.css rename to test/utils/fixtures/themes/test-theme/assets/built/screen.css diff --git a/core/test/utils/fixtures/themes/test-theme/assets/built/screen.css.map b/test/utils/fixtures/themes/test-theme/assets/built/screen.css.map similarity index 100% rename from core/test/utils/fixtures/themes/test-theme/assets/built/screen.css.map rename to test/utils/fixtures/themes/test-theme/assets/built/screen.css.map diff --git a/core/test/utils/fixtures/themes/test-theme/assets/css/.csscomb.json b/test/utils/fixtures/themes/test-theme/assets/css/.csscomb.json similarity index 100% rename from core/test/utils/fixtures/themes/test-theme/assets/css/.csscomb.json rename to test/utils/fixtures/themes/test-theme/assets/css/.csscomb.json diff --git a/core/test/utils/fixtures/themes/test-theme/assets/css/csscomb.json b/test/utils/fixtures/themes/test-theme/assets/css/csscomb.json similarity index 100% rename from core/test/utils/fixtures/themes/test-theme/assets/css/csscomb.json rename to test/utils/fixtures/themes/test-theme/assets/css/csscomb.json diff --git a/core/test/utils/fixtures/themes/test-theme/assets/css/global.css b/test/utils/fixtures/themes/test-theme/assets/css/global.css similarity index 100% rename from core/test/utils/fixtures/themes/test-theme/assets/css/global.css rename to test/utils/fixtures/themes/test-theme/assets/css/global.css diff --git a/core/test/utils/fixtures/themes/test-theme/assets/css/screen.css b/test/utils/fixtures/themes/test-theme/assets/css/screen.css similarity index 100% rename from core/test/utils/fixtures/themes/test-theme/assets/css/screen.css rename to test/utils/fixtures/themes/test-theme/assets/css/screen.css diff --git a/core/test/utils/fixtures/themes/test-theme/assets/screenshot-desktop.jpg b/test/utils/fixtures/themes/test-theme/assets/screenshot-desktop.jpg similarity index 100% rename from core/test/utils/fixtures/themes/test-theme/assets/screenshot-desktop.jpg rename to test/utils/fixtures/themes/test-theme/assets/screenshot-desktop.jpg diff --git a/core/test/utils/fixtures/themes/test-theme/assets/screenshot-mobile.jpg b/test/utils/fixtures/themes/test-theme/assets/screenshot-mobile.jpg similarity index 100% rename from core/test/utils/fixtures/themes/test-theme/assets/screenshot-mobile.jpg rename to test/utils/fixtures/themes/test-theme/assets/screenshot-mobile.jpg diff --git a/core/test/utils/fixtures/themes/test-theme/default.hbs b/test/utils/fixtures/themes/test-theme/default.hbs similarity index 100% rename from core/test/utils/fixtures/themes/test-theme/default.hbs rename to test/utils/fixtures/themes/test-theme/default.hbs diff --git a/core/test/utils/fixtures/themes/test-theme/home.hbs b/test/utils/fixtures/themes/test-theme/home.hbs similarity index 100% rename from core/test/utils/fixtures/themes/test-theme/home.hbs rename to test/utils/fixtures/themes/test-theme/home.hbs diff --git a/core/test/utils/fixtures/themes/test-theme/index.hbs b/test/utils/fixtures/themes/test-theme/index.hbs similarity index 100% rename from core/test/utils/fixtures/themes/test-theme/index.hbs rename to test/utils/fixtures/themes/test-theme/index.hbs diff --git a/core/test/utils/fixtures/themes/test-theme/package.json b/test/utils/fixtures/themes/test-theme/package.json similarity index 100% rename from core/test/utils/fixtures/themes/test-theme/package.json rename to test/utils/fixtures/themes/test-theme/package.json diff --git a/core/test/utils/fixtures/themes/test-theme/podcast/rss.hbs b/test/utils/fixtures/themes/test-theme/podcast/rss.hbs similarity index 100% rename from core/test/utils/fixtures/themes/test-theme/podcast/rss.hbs rename to test/utils/fixtures/themes/test-theme/podcast/rss.hbs diff --git a/core/test/utils/fixtures/themes/test-theme/post.hbs b/test/utils/fixtures/themes/test-theme/post.hbs similarity index 100% rename from core/test/utils/fixtures/themes/test-theme/post.hbs rename to test/utils/fixtures/themes/test-theme/post.hbs diff --git a/core/test/utils/fixtures/themes/test-theme/something.hbs b/test/utils/fixtures/themes/test-theme/something.hbs similarity index 100% rename from core/test/utils/fixtures/themes/test-theme/something.hbs rename to test/utils/fixtures/themes/test-theme/something.hbs diff --git a/core/test/utils/fixtures/themes/valid.zip b/test/utils/fixtures/themes/valid.zip similarity index 100% rename from core/test/utils/fixtures/themes/valid.zip rename to test/utils/fixtures/themes/valid.zip diff --git a/core/test/utils/fixtures/themes/warnings.zip b/test/utils/fixtures/themes/warnings.zip similarity index 100% rename from core/test/utils/fixtures/themes/warnings.zip rename to test/utils/fixtures/themes/warnings.zip diff --git a/core/test/utils/index.js b/test/utils/index.js similarity index 97% rename from core/test/utils/index.js rename to test/utils/index.js index 92182f69ef..90382f3817 100644 --- a/core/test/utils/index.js +++ b/test/utils/index.js @@ -8,30 +8,30 @@ var Promise = require('bluebird'), ObjectId = require('bson-objectid'), uuid = require('uuid'), KnexMigrator = require('knex-migrator'), - ghost = require('../../server'), - GhostServer = require('../../server/ghost-server'), - common = require('../../server/lib/common'), - fixtureUtils = require('../../server/data/schema/fixtures/utils'), - db = require('../../server/data/db'), - schema = require('../../server/data/schema').tables, + ghost = require('../../core/server'), + GhostServer = require('../../core/server/ghost-server'), + common = require('../../core/server/lib/common'), + fixtureUtils = require('../../core/server/data/schema/fixtures/utils'), + db = require('../../core/server/data/db'), + schema = require('../../core/server/data/schema').tables, schemaTables = Object.keys(schema), - models = require('../../server/models'), - urlUtils = require('../../server/lib/url-utils'), - urlService = require('../../frontend/services/url'), - routingService = require('../../frontend/services/routing'), - settingsService = require('../../server/services/settings'), - frontendSettingsService = require('../../frontend/services/settings'), - settingsCache = require('../../server/services/settings/cache'), - imageLib = require('../../server/lib/image'), - web = require('../../server/web'), - permissions = require('../../server/services/permissions'), - sequence = require('../../server/lib/promise/sequence'), - themes = require('../../frontend/services/themes'), + models = require('../../core/server/models'), + urlUtils = require('../../core/server/lib/url-utils'), + urlService = require('../../core/frontend/services/url'), + routingService = require('../../core/frontend/services/routing'), + settingsService = require('../../core/server/services/settings'), + frontendSettingsService = require('../../core/frontend/services/settings'), + settingsCache = require('../../core/server/services/settings/cache'), + imageLib = require('../../core/server/lib/image'), + web = require('../../core/server/web'), + permissions = require('../../core/server/services/permissions'), + sequence = require('../../core/server/lib/promise/sequence'), + themes = require('../../core/frontend/services/themes'), DataGenerator = require('./fixtures/data-generator'), configUtils = require('./configUtils'), filterData = require('./fixtures/filter-param'), APIUtils = require('./api'), - config = require('../../server/config'), + config = require('../../core/server/config'), knexMigrator = new KnexMigrator(), fixtures, getFixtureOps, diff --git a/core/test/utils/mocks/express.js b/test/utils/mocks/express.js similarity index 100% rename from core/test/utils/mocks/express.js rename to test/utils/mocks/express.js diff --git a/core/test/utils/mocks/index.js b/test/utils/mocks/index.js similarity index 100% rename from core/test/utils/mocks/index.js rename to test/utils/mocks/index.js diff --git a/core/test/utils/mocks/modules.js b/test/utils/mocks/modules.js similarity index 100% rename from core/test/utils/mocks/modules.js rename to test/utils/mocks/modules.js diff --git a/core/test/utils/urlUtils.js b/test/utils/urlUtils.js similarity index 94% rename from core/test/utils/urlUtils.js rename to test/utils/urlUtils.js index d22fa715c4..16880ab7dd 100644 --- a/core/test/utils/urlUtils.js +++ b/test/utils/urlUtils.js @@ -1,8 +1,8 @@ const _ = require('lodash'); const sinon = require('sinon'); const UrlUtils = require('@tryghost/url-utils'); -const config = require('../../server/config'); -const urlUtils = require('../../server/lib/url-utils'); +const config = require('../../core/server/config'); +const urlUtils = require('../../core/server/lib/url-utils'); const defaultSandbox = sinon.createSandbox();