mirror of
https://github.com/TryGhost/Ghost.git
synced 2025-01-20 22:42:53 -05:00
Fixed frontend regression test
no issue - Fixed require for a wrong module as this part of settings has been moved
This commit is contained in:
parent
0bf1542bc6
commit
9d69951c81
1 changed files with 23 additions and 23 deletions
|
@ -6,7 +6,7 @@ const should = require('should'),
|
||||||
configUtils = require('../../utils/configUtils'),
|
configUtils = require('../../utils/configUtils'),
|
||||||
urlUtils = require('../../utils/urlUtils'),
|
urlUtils = require('../../utils/urlUtils'),
|
||||||
appsService = require('../../../server/services/apps'),
|
appsService = require('../../../server/services/apps'),
|
||||||
settingsService = require('../../../server/services/settings'),
|
frontendSettingsService = require('../../../frontend/services/settings'),
|
||||||
themeService = require('../../../frontend/services/themes'),
|
themeService = require('../../../frontend/services/themes'),
|
||||||
siteApp = require('../../../server/web/parent-app');
|
siteApp = require('../../../server/web/parent-app');
|
||||||
|
|
||||||
|
@ -409,7 +409,7 @@ describe('Integration - Web - Site', function () {
|
||||||
describe('extended routes.yaml: collections', function () {
|
describe('extended routes.yaml: collections', function () {
|
||||||
describe('2 collections', function () {
|
describe('2 collections', function () {
|
||||||
before(function () {
|
before(function () {
|
||||||
sinon.stub(settingsService, 'get').returns({
|
sinon.stub(frontendSettingsService, 'get').returns({
|
||||||
routes: {
|
routes: {
|
||||||
'/': 'home'
|
'/': 'home'
|
||||||
},
|
},
|
||||||
|
@ -543,7 +543,7 @@ describe('Integration - Web - Site', function () {
|
||||||
|
|
||||||
describe('no collections', function () {
|
describe('no collections', function () {
|
||||||
before(function () {
|
before(function () {
|
||||||
sinon.stub(settingsService, 'get').returns({
|
sinon.stub(frontendSettingsService, 'get').returns({
|
||||||
routes: {
|
routes: {
|
||||||
'/test/': 'test'
|
'/test/': 'test'
|
||||||
},
|
},
|
||||||
|
@ -595,7 +595,7 @@ describe('Integration - Web - Site', function () {
|
||||||
|
|
||||||
describe('static permalink route', function () {
|
describe('static permalink route', function () {
|
||||||
before(function () {
|
before(function () {
|
||||||
sinon.stub(settingsService, 'get').returns({
|
sinon.stub(frontendSettingsService, 'get').returns({
|
||||||
routes: {},
|
routes: {},
|
||||||
|
|
||||||
collections: {
|
collections: {
|
||||||
|
@ -702,7 +702,7 @@ describe('Integration - Web - Site', function () {
|
||||||
|
|
||||||
describe('primary author permalink', function () {
|
describe('primary author permalink', function () {
|
||||||
before(function () {
|
before(function () {
|
||||||
sinon.stub(settingsService, 'get').returns({
|
sinon.stub(frontendSettingsService, 'get').returns({
|
||||||
routes: {},
|
routes: {},
|
||||||
|
|
||||||
collections: {
|
collections: {
|
||||||
|
@ -788,7 +788,7 @@ describe('Integration - Web - Site', function () {
|
||||||
|
|
||||||
describe('primary tag permalink', function () {
|
describe('primary tag permalink', function () {
|
||||||
before(function () {
|
before(function () {
|
||||||
sinon.stub(settingsService, 'get').returns({
|
sinon.stub(frontendSettingsService, 'get').returns({
|
||||||
routes: {},
|
routes: {},
|
||||||
|
|
||||||
collections: {
|
collections: {
|
||||||
|
@ -889,7 +889,7 @@ describe('Integration - Web - Site', function () {
|
||||||
|
|
||||||
describe('collection with data key', function () {
|
describe('collection with data key', function () {
|
||||||
before(function () {
|
before(function () {
|
||||||
sinon.stub(settingsService, 'get').returns({
|
sinon.stub(frontendSettingsService, 'get').returns({
|
||||||
routes: {},
|
routes: {},
|
||||||
|
|
||||||
collections: {
|
collections: {
|
||||||
|
@ -1028,7 +1028,7 @@ describe('Integration - Web - Site', function () {
|
||||||
describe('extended routes.yaml: templates', function () {
|
describe('extended routes.yaml: templates', function () {
|
||||||
describe('default template, no template', function () {
|
describe('default template, no template', function () {
|
||||||
before(function () {
|
before(function () {
|
||||||
sinon.stub(settingsService, 'get').returns({
|
sinon.stub(frontendSettingsService, 'get').returns({
|
||||||
routes: {},
|
routes: {},
|
||||||
|
|
||||||
collections: {
|
collections: {
|
||||||
|
@ -1101,7 +1101,7 @@ describe('Integration - Web - Site', function () {
|
||||||
|
|
||||||
describe('two templates', function () {
|
describe('two templates', function () {
|
||||||
before(function () {
|
before(function () {
|
||||||
sinon.stub(settingsService, 'get').returns({
|
sinon.stub(frontendSettingsService, 'get').returns({
|
||||||
routes: {},
|
routes: {},
|
||||||
|
|
||||||
collections: {
|
collections: {
|
||||||
|
@ -1156,7 +1156,7 @@ describe('Integration - Web - Site', function () {
|
||||||
|
|
||||||
describe('home.hbs priority', function () {
|
describe('home.hbs priority', function () {
|
||||||
before(function () {
|
before(function () {
|
||||||
sinon.stub(settingsService, 'get').returns({
|
sinon.stub(frontendSettingsService, 'get').returns({
|
||||||
routes: {},
|
routes: {},
|
||||||
|
|
||||||
collections: {
|
collections: {
|
||||||
|
@ -1238,7 +1238,7 @@ describe('Integration - Web - Site', function () {
|
||||||
before(function () {
|
before(function () {
|
||||||
testUtils.integrationTesting.defaultMocks(sinon, {theme: 'test-theme-channels'});
|
testUtils.integrationTesting.defaultMocks(sinon, {theme: 'test-theme-channels'});
|
||||||
|
|
||||||
sinon.stub(settingsService, 'get').returns({
|
sinon.stub(frontendSettingsService, 'get').returns({
|
||||||
routes: {
|
routes: {
|
||||||
'/channel1/': {
|
'/channel1/': {
|
||||||
controller: 'channel',
|
controller: 'channel',
|
||||||
|
@ -1627,7 +1627,7 @@ describe('Integration - Web - Site', function () {
|
||||||
|
|
||||||
describe('extended routes.yaml (5): rss override', function () {
|
describe('extended routes.yaml (5): rss override', function () {
|
||||||
before(function () {
|
before(function () {
|
||||||
sinon.stub(settingsService, 'get').returns({
|
sinon.stub(frontendSettingsService, 'get').returns({
|
||||||
routes: {
|
routes: {
|
||||||
'/about/': 'about',
|
'/about/': 'about',
|
||||||
'/podcast/rss/': {
|
'/podcast/rss/': {
|
||||||
|
@ -2175,7 +2175,7 @@ describe('Integration - Web - Site', function () {
|
||||||
describe('extended routes.yaml: collections', function () {
|
describe('extended routes.yaml: collections', function () {
|
||||||
describe('2 collections', function () {
|
describe('2 collections', function () {
|
||||||
before(function () {
|
before(function () {
|
||||||
sinon.stub(settingsService, 'get').returns({
|
sinon.stub(frontendSettingsService, 'get').returns({
|
||||||
routes: {
|
routes: {
|
||||||
'/': 'home'
|
'/': 'home'
|
||||||
},
|
},
|
||||||
|
@ -2309,7 +2309,7 @@ describe('Integration - Web - Site', function () {
|
||||||
|
|
||||||
describe('no collections', function () {
|
describe('no collections', function () {
|
||||||
before(function () {
|
before(function () {
|
||||||
sinon.stub(settingsService, 'get').returns({
|
sinon.stub(frontendSettingsService, 'get').returns({
|
||||||
routes: {
|
routes: {
|
||||||
'/test/': 'test'
|
'/test/': 'test'
|
||||||
},
|
},
|
||||||
|
@ -2361,7 +2361,7 @@ describe('Integration - Web - Site', function () {
|
||||||
|
|
||||||
describe('static permalink route', function () {
|
describe('static permalink route', function () {
|
||||||
before(function () {
|
before(function () {
|
||||||
sinon.stub(settingsService, 'get').returns({
|
sinon.stub(frontendSettingsService, 'get').returns({
|
||||||
routes: {},
|
routes: {},
|
||||||
|
|
||||||
collections: {
|
collections: {
|
||||||
|
@ -2468,7 +2468,7 @@ describe('Integration - Web - Site', function () {
|
||||||
|
|
||||||
describe('primary author permalink', function () {
|
describe('primary author permalink', function () {
|
||||||
before(function () {
|
before(function () {
|
||||||
sinon.stub(settingsService, 'get').returns({
|
sinon.stub(frontendSettingsService, 'get').returns({
|
||||||
routes: {},
|
routes: {},
|
||||||
|
|
||||||
collections: {
|
collections: {
|
||||||
|
@ -2554,7 +2554,7 @@ describe('Integration - Web - Site', function () {
|
||||||
|
|
||||||
describe('primary tag permalink', function () {
|
describe('primary tag permalink', function () {
|
||||||
before(function () {
|
before(function () {
|
||||||
sinon.stub(settingsService, 'get').returns({
|
sinon.stub(frontendSettingsService, 'get').returns({
|
||||||
routes: {},
|
routes: {},
|
||||||
|
|
||||||
collections: {
|
collections: {
|
||||||
|
@ -2655,7 +2655,7 @@ describe('Integration - Web - Site', function () {
|
||||||
|
|
||||||
describe('collection/routes with data key', function () {
|
describe('collection/routes with data key', function () {
|
||||||
before(function () {
|
before(function () {
|
||||||
sinon.stub(settingsService, 'get').returns({
|
sinon.stub(frontendSettingsService, 'get').returns({
|
||||||
routes: {
|
routes: {
|
||||||
'/my-page/': {
|
'/my-page/': {
|
||||||
data: {
|
data: {
|
||||||
|
@ -2826,7 +2826,7 @@ describe('Integration - Web - Site', function () {
|
||||||
describe('extended routes.yaml: templates', function () {
|
describe('extended routes.yaml: templates', function () {
|
||||||
describe('default template, no template', function () {
|
describe('default template, no template', function () {
|
||||||
before(function () {
|
before(function () {
|
||||||
sinon.stub(settingsService, 'get').returns({
|
sinon.stub(frontendSettingsService, 'get').returns({
|
||||||
routes: {},
|
routes: {},
|
||||||
|
|
||||||
collections: {
|
collections: {
|
||||||
|
@ -2899,7 +2899,7 @@ describe('Integration - Web - Site', function () {
|
||||||
|
|
||||||
describe('two templates', function () {
|
describe('two templates', function () {
|
||||||
before(function () {
|
before(function () {
|
||||||
sinon.stub(settingsService, 'get').returns({
|
sinon.stub(frontendSettingsService, 'get').returns({
|
||||||
routes: {},
|
routes: {},
|
||||||
|
|
||||||
collections: {
|
collections: {
|
||||||
|
@ -2954,7 +2954,7 @@ describe('Integration - Web - Site', function () {
|
||||||
|
|
||||||
describe('home.hbs priority', function () {
|
describe('home.hbs priority', function () {
|
||||||
before(function () {
|
before(function () {
|
||||||
sinon.stub(settingsService, 'get').returns({
|
sinon.stub(frontendSettingsService, 'get').returns({
|
||||||
routes: {},
|
routes: {},
|
||||||
|
|
||||||
collections: {
|
collections: {
|
||||||
|
@ -3036,7 +3036,7 @@ describe('Integration - Web - Site', function () {
|
||||||
before(function () {
|
before(function () {
|
||||||
testUtils.integrationTesting.defaultMocks(sinon, {theme: 'test-theme-channels'});
|
testUtils.integrationTesting.defaultMocks(sinon, {theme: 'test-theme-channels'});
|
||||||
|
|
||||||
sinon.stub(settingsService, 'get').returns({
|
sinon.stub(frontendSettingsService, 'get').returns({
|
||||||
routes: {
|
routes: {
|
||||||
'/channel1/': {
|
'/channel1/': {
|
||||||
controller: 'channel',
|
controller: 'channel',
|
||||||
|
@ -3371,7 +3371,7 @@ describe('Integration - Web - Site', function () {
|
||||||
|
|
||||||
describe('extended routes.yaml (5): rss override', function () {
|
describe('extended routes.yaml (5): rss override', function () {
|
||||||
before(function () {
|
before(function () {
|
||||||
sinon.stub(settingsService, 'get').returns({
|
sinon.stub(frontendSettingsService, 'get').returns({
|
||||||
routes: {
|
routes: {
|
||||||
'/about/': 'about',
|
'/about/': 'about',
|
||||||
'/podcast/rss/': {
|
'/podcast/rss/': {
|
||||||
|
|
Loading…
Add table
Reference in a new issue