TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-01 05:50:35 +03:00
Code Issues Projects Releases Wiki Activity

Updated newsletter fixtures to remove nullable sender name (#14479)

Browse Source 
refs https://github.com/TryGhost/Team/issues/1513

Since `sender_name` for newsletter is now nullable field, this change removes hardcoded `sender_name` from fixtures.
This commit is contained in:
Rishabh Garg 2022-04-14 23:45:59 +05:30 committed by GitHub
parent 5d62758e64
commit 1362750640
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/server/data/schema/fixtures/fixtures.json
View File

@ -24,8 +24,7 @@
"entries": [
{
"name": "Default Newsletter",
"slug": "default-newsletter",
"sender_name": "Ghost"
"slug": "default-newsletter"
}
]
},

3
core/server/services/auth/setup.js
View File

@ -132,8 +132,7 @@ async function doProductAndNewsletter(data, api) {
if (defaultNewsletter) {
await newslettersAPI.edit({newsletters: [{
name: blogTitle.trim(),
sender_name: blogTitle.trim()
name: blogTitle.trim()
}]}, {context: context.context, id: defaultNewsletter.id});
}
} catch (e) {

6
test/e2e-api/admin/__snapshots__/members.test.js.snap
View File

@ -2158,7 +2158,7 @@ Object {
"id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
"name": "Default Newsletter",
"sender_email": null,
"sender_name": "Ghost",
"sender_name": null,
"sender_reply_to": "newsletter",
"show_badge": true,
"show_feature_image": true,
@ -2233,7 +2233,7 @@ exports[`Members API: with multiple newsletters Can add with default newsletters
Object {
"access-control-allow-origin": "http://127.0.0.1:2369",
"cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
"content-length": "2126",
"content-length": "2123",
"content-type": "application/json; charset=utf-8",
"etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
"location": StringMatching /https\\?:\\\\/\\\\/\\.\\*\\?\\\\/members\\\\/\\[a-f0-9\\]\\{24\\}\\\\//,
@ -2481,7 +2481,7 @@ exports[`Members API: with multiple newsletters Can filter on newsletter slug 2:
Object {
"access-control-allow-origin": "http://127.0.0.1:2369",
"cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
"content-length": "2200",
"content-length": "2197",
"content-type": "application/json; charset=utf-8",
"etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
"vary": "Origin, Accept-Encoding",

16
test/e2e-api/admin/__snapshots__/newsletters.test.js.snap
View File

@ -63,7 +63,7 @@ Object {
"id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
"name": "Default Newsletter",
"sender_email": null,
"sender_name": "Ghost",
"sender_name": null,
"sender_reply_to": "newsletter",
"show_badge": true,
"show_feature_image": true,
@ -107,7 +107,7 @@ exports[`Newsletters API Can add a newsletter 4: [headers] 1`] = `
Object {
"access-control-allow-origin": "http://127.0.0.1:2369",
"cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
"content-length": "1100",
"content-length": "1097",
"content-type": "application/json; charset=utf-8",
"etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
"vary": "Origin, Accept-Encoding",
@ -136,7 +136,7 @@ Object {
"id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
"name": "Default Newsletter",
"sender_email": null,
"sender_name": "Ghost",
"sender_name": null,
"sender_reply_to": "newsletter",
"show_badge": true,
"show_feature_image": true,
@ -180,7 +180,7 @@ exports[`Newsletters API Can browse newsletters 2: [headers] 1`] = `
Object {
"access-control-allow-origin": "http://127.0.0.1:2369",
"cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
"content-length": "1100",
"content-length": "1097",
"content-type": "application/json; charset=utf-8",
"etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
"vary": "Origin, Accept-Encoding",
@ -209,7 +209,7 @@ Object {
"id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
"name": "Default Newsletter",
"sender_email": null,
"sender_name": "Ghost",
"sender_name": null,
"sender_reply_to": "newsletter",
"show_badge": true,
"show_feature_image": true,
@ -231,7 +231,7 @@ exports[`Newsletters API Can edit newsletters 2: [headers] 1`] = `
Object {
"access-control-allow-origin": "http://127.0.0.1:2369",
"cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
"content-length": "597",
"content-length": "594",
"content-type": "application/json; charset=utf-8",
"etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
"vary": "Origin, Accept-Encoding",
@ -250,7 +250,7 @@ Object {
"id": StringMatching /\\[a-f0-9\\]\\{24\\}/,
"name": "Updated newsletter name",
"sender_email": null,
"sender_name": "Ghost",
"sender_name": null,
"sender_reply_to": "newsletter",
"show_badge": true,
"show_feature_image": true,
@ -272,7 +272,7 @@ exports[`Newsletters API Can edit newsletters 4: [headers] 1`] = `
Object {
"access-control-allow-origin": "http://127.0.0.1:2369",
"cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
"content-length": "518",
"content-length": "515",
"content-type": "application/json; charset=utf-8",
"etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
"vary": "Origin, Accept-Encoding",

2
test/regression/api/admin/authentication.test.js
View File

@ -104,7 +104,7 @@ describe('Authentication API', function () {
=== 'Default Newsletter');
assert (defaultNewsletter.name === 'a test blog', 'The default newsletter should have had a name change');
assert (defaultNewsletter.sender_name === 'a test blog', 'The default newsletter should have had a sender name change');
assert(newsletterWithDefaultName === undefined, 'The default newsletter should have had a name change');
});

2
test/unit/server/data/schema/integrity.test.js
View File

@ -36,7 +36,7 @@ const validateRouteSettings = require('../../../../../core/server/services/route
describe('DB version integrity', function () {
// Only these variables should need updating
const currentSchemaHash = '026d0bffc2be9420c1d9fccf76656dac';
const currentFixturesHash = 'a08bedf7a552498ed6f4a0d72c732dd5';
const currentFixturesHash = '2fb171312dfdd1dc3a569dfb845ac6f5';
const currentSettingsHash = '71fa38d0c805c18ceebe0fda80886230';
const currentRoutesHash = '3d180d52c663d173a6be791ef411ed01';

2
test/unit/server/services/auth/setup.test.js
View File

@ -62,7 +62,7 @@ describe('Auth Service: setup', function () {
);
sinon.assert.calledOnceWithExactly(
newsletterEditStub,
{newsletters: [{name: 'Test Blog', sender_name: 'Test Blog'}]},
{newsletters: [{name: 'Test Blog'}]},
{context: {user: 'user-1'}, id: 'newsletter-2'}
);
});

3
test/utils/fixtures/fixtures.json
View File

@ -24,8 +24,7 @@
"entries": [
{
"name": "Default Newsletter",
"slug": "default-newsletter",
"sender_name": "Ghost"
"slug": "default-newsletter"
}
]
},