Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-03 23:00:14 -05:00
Code Issues Activity

Fixed test for overriding active theme

Browse source 
refs: f9a3f7d955

- The test for overriding a theme (uploading a theme with the same name as the currently active theme) doesn't test the right codepath
- It incorrectly assumes uploading the same theme twice results in an override, but this is only true for the active theme
- This change splits the override test out into it's own test, and only tests overriding by changing the active theme first
- Also fixed a minor comment type whilst here
This commit is contained in:
Hannah Wolfe 2021-07-11 12:38:37 +01:00
parent cd86724731
commit 6726246697
No known key found for this signature in database
GPG key ID: 9F8C7532D0A6BA55
2 changed files with 37 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/server/services/themes/storage.js
View file

@ -75,12 +75,14 @@ module.exports = {
name: themeName,
path: checkedTheme.path
});
// CASE: loads the theme from the fs & sets the theme on the themeList
const loadedTheme = await themeLoader.loadOneTheme(themeName);
overrideTheme = (themeName === settingsCache.get('active_theme'));
// CASE: if this is the active theme, we are overriding
if (overrideTheme) {
debug('setFromZip Theme is active alreadu');
debug('setFromZip Theme is active already');
activator.activateFromAPIOverride(themeName, loadedTheme, checkedTheme);
}

49
test/api-acceptance/admin/themes.test.js
View file

@ -1,4 +1,5 @@
const should = require('should');
const sinon = require('sinon');
const path = require('path');
const fs = require('fs');
const _ = require('lodash');
@ -7,6 +8,8 @@ const nock = require('nock');
const testUtils = require('../../utils');
const config = require('../../../core/shared/config');
const localUtils = require('./utils');
const settingsCache = require('../../../core/shared/settings-cache');
const origCache = _.cloneDeep(settingsCache);
describe('Themes API', function () {
let ownerRequest;
@ -28,6 +31,10 @@ describe('Themes API', function () {
await localUtils.doAuth(ownerRequest);
});
after(function () {
sinon.restore();
});
it('Can request all available themes', async function () {
const res = await ownerRequest
.get(localUtils.API.getApiQuery('themes/'))
@ -92,19 +99,8 @@ describe('Themes API', function () {
jsonResponse.themes[0].name.should.eql('valid');
jsonResponse.themes[0].active.should.be.false();
// upload same theme again to force override
const res2 = await uploadTheme({themePath: path.join(__dirname, '..', '..', 'utils', 'fixtures', 'themes', 'valid.zip')});
const jsonResponse2 = res2.body;
should.not.exist(res2.headers['x-cache-invalidate']);
should.exist(jsonResponse2.themes);
localUtils.API.checkResponse(jsonResponse2, 'themes');
jsonResponse2.themes.length.should.eql(1);
localUtils.API.checkResponse(jsonResponse2.themes[0], 'theme');
jsonResponse2.themes[0].name.should.eql('valid');
jsonResponse2.themes[0].active.should.be.false();
// ensure tmp theme folder contains two themes now
// Note: at this point, the tmpFolder can legitimately still contain a valid_34324324 backup
// As it is deleted asynchronously
const tmpFolderContents = fs.readdirSync(config.getContentPath('themes'));
tmpFolderContents.forEach((theme, index) => {
if (theme.match(/^\./)) {
@ -112,8 +108,6 @@ describe('Themes API', function () {
}
});
// Note: at this point, the tmpFolder can legitimately still contain a valid_34324324 backup
// As it is deleted asynchronously
tmpFolderContents.should.containEql('valid');
tmpFolderContents.should.containEql('valid.zip');
@ -307,4 +301,29 @@ describe('Themes API', function () {
.set('Origin', config.get('url'))
.expect(204);
});
it('Can re-upload the active theme to override', async function () {
// The tricky thing about this test is the default active theme is Casper and you're not allowed to override it.
// So we upload a valid theme, activate it, and then upload again.
sinon.stub(settingsCache, 'get').callsFake(function (key, options) {
if (key === 'active_theme') {
return 'valid';
}
return origCache.get(key, options);
});
// Upload the valid theme
const res = await uploadTheme({themePath: path.join(__dirname, '..', '..', 'utils', 'fixtures', 'themes', 'valid.zip')});
const jsonResponse = res.body;
should.exist(res.headers['x-cache-invalidate']);
should.exist(jsonResponse.themes);
localUtils.API.checkResponse(jsonResponse, 'themes');
jsonResponse.themes.length.should.eql(1);
localUtils.API.checkResponse(jsonResponse.themes[0], 'theme', 'templates');
jsonResponse.themes[0].name.should.eql('valid');
jsonResponse.themes[0].active.should.be.true();
});
});