Skip to content

Commit ceeb78b

Browse files
authored
Fixed integration test errors caused by URL service reset (#10376)
no issue - With df1ba8a landing in master, there was an error introduced in integration tests, which was caused by URL service being reset at the same time as it was populating its cache.
1 parent 9837df0 commit ceeb78b

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

core/test/integration/web/site_spec.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const should = require('should'),
1212
describe('Integration - Web - Site', function () {
1313
let app;
1414

15+
before(testUtils.integrationTesting.urlService.resetGenerators);
1516
before(testUtils.teardown);
1617
before(testUtils.setup('users:roles', 'posts'));
1718

@@ -20,7 +21,6 @@ describe('Integration - Web - Site', function () {
2021

2122
describe('default routes.yaml', function () {
2223
before(function () {
23-
testUtils.integrationTesting.urlService.resetGenerators();
2424
testUtils.integrationTesting.defaultMocks(sandbox);
2525
testUtils.integrationTesting.overrideGhostConfig(configUtils);
2626

@@ -1242,6 +1242,7 @@ describe('Integration - Web - Site', function () {
12421242

12431243
describe('extended routes.yaml: routes', function () {
12441244
describe('channels', function () {
1245+
before(testUtils.integrationTesting.urlService.resetGenerators);
12451246
before(testUtils.teardown);
12461247
before(testUtils.setup('users:roles', 'posts'));
12471248

@@ -1390,8 +1391,6 @@ describe('Integration - Web - Site', function () {
13901391
}
13911392
});
13921393

1393-
testUtils.integrationTesting.urlService.resetGenerators();
1394-
13951394
return testUtils.integrationTesting.initGhost()
13961395
.then(function () {
13971396
sandbox.stub(themeService.getActive(), 'engine').withArgs('ghost-api').returns('v0.1');
@@ -3016,6 +3015,7 @@ describe('Integration - Web - Site', function () {
30163015

30173016
describe('extended routes.yaml: routes', function () {
30183017
describe('channels', function () {
3018+
before(testUtils.integrationTesting.urlService.resetGenerators);
30193019
before(testUtils.teardown);
30203020
before(testUtils.setup('users:roles', 'posts'));
30213021

@@ -3144,8 +3144,6 @@ describe('Integration - Web - Site', function () {
31443144
}
31453145
});
31463146

3147-
testUtils.integrationTesting.urlService.resetGenerators();
3148-
31493147
return testUtils.integrationTesting.initGhost()
31503148
.then(function () {
31513149
sandbox.stub(themeService.getActive(), 'engine').withArgs('ghost-api').returns('v2');

0 commit comments

Comments
 (0)