diff --git a/ghost/core/core/server/data/migrations/versions/5.55/2023-07-10-05-15-55-add-built-in-collections.js b/ghost/core/core/server/data/migrations/versions/5.55/2023-07-10-05-15-55-add-built-in-collections.js index 003d14a9ad..16dc9c9696 100644 --- a/ghost/core/core/server/data/migrations/versions/5.55/2023-07-10-05-15-55-add-built-in-collections.js +++ b/ghost/core/core/server/data/migrations/versions/5.55/2023-07-10-05-15-55-add-built-in-collections.js @@ -19,7 +19,7 @@ module.exports = createTransactionalMigration( id: (new ObjectID()).toHexString(), title: 'Latest', slug: 'latest', - description: 'Collection with all posts', + description: 'All posts', type: 'automatic', filter: '', created_at: knex.raw('current_timestamp') @@ -39,7 +39,7 @@ module.exports = createTransactionalMigration( id: (new ObjectID()).toHexString(), title: 'Featured', slug: 'featured', - description: 'Collection of featured posts', + description: 'Featured posts', type: 'automatic', filter: 'featured:true', created_at: knex.raw('current_timestamp') diff --git a/ghost/core/core/server/data/schema/fixtures/fixtures.json b/ghost/core/core/server/data/schema/fixtures/fixtures.json index 4d1ed2ea0c..03250f9ddd 100644 --- a/ghost/core/core/server/data/schema/fixtures/fixtures.json +++ b/ghost/core/core/server/data/schema/fixtures/fixtures.json @@ -6,14 +6,14 @@ { "title": "Latest", "slug": "latest", - "description": "Collection with all posts", + "description": "All posts", "type": "automatic", "filter": "" }, { "title": "Featured", "slug": "featured", - "description": "Collection of featured posts", + "description": "Featured posts", "type": "automatic", "filter": "featured:true" } diff --git a/ghost/core/test/e2e-api/admin/__snapshots__/collections.test.js.snap b/ghost/core/test/e2e-api/admin/__snapshots__/collections.test.js.snap index 11caca73b2..27bc0dc581 100644 --- a/ghost/core/test/e2e-api/admin/__snapshots__/collections.test.js.snap +++ b/ghost/core/test/e2e-api/admin/__snapshots__/collections.test.js.snap @@ -119,7 +119,7 @@ Object { "collections": Array [ Object { "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "description": "Collection with all posts", + "description": "All posts", "feature_image": null, "filter": null, "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, @@ -184,7 +184,7 @@ Object { }, Object { "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "description": "Collection of featured posts", + "description": "Featured posts", "feature_image": null, "filter": "featured:true", "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, @@ -199,7 +199,7 @@ Object { }, ], "slug": "featured", - "title": "Featured Posts", + "title": "Featured", "type": "automatic", "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, }, @@ -233,7 +233,7 @@ exports[`Collections API Browse Can browse Collections 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": "1643", + "content-length": "1607", "content-type": "application/json; charset=utf-8", "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/, "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/, diff --git a/ghost/core/test/e2e-api/admin/__snapshots__/posts.test.js.snap b/ghost/core/test/e2e-api/admin/__snapshots__/posts.test.js.snap index e5c7f93674..fd426f606b 100644 --- a/ghost/core/test/e2e-api/admin/__snapshots__/posts.test.js.snap +++ b/ghost/core/test/e2e-api/admin/__snapshots__/posts.test.js.snap @@ -1459,7 +1459,7 @@ Object { }, Object { "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.\\\\d\\{3\\}Z/, - "description": "Collection with all posts", + "description": "All posts", "feature_image": null, "filter": null, "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, @@ -1632,7 +1632,7 @@ exports[`Posts API Update Can add and remove collections 6: [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": "5159", + "content-length": "5143", "content-type": "application/json; charset=utf-8", "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/, "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/, diff --git a/ghost/core/test/unit/server/data/schema/integrity.test.js b/ghost/core/test/unit/server/data/schema/integrity.test.js index 993d09a9c3..add03ba571 100644 --- a/ghost/core/test/unit/server/data/schema/integrity.test.js +++ b/ghost/core/test/unit/server/data/schema/integrity.test.js @@ -36,7 +36,7 @@ const validateRouteSettings = require('../../../../../core/server/services/route describe('DB version integrity', function () { // Only these variables should need updating const currentSchemaHash = '8e299caf33efbcf8a12c9cefaf8f6500'; - const currentFixturesHash = '03f3d9ddc0a1190e909a85808a591a04'; + const currentFixturesHash = 'af43eef1ac4f14fc1bc0ea351300420f'; const currentSettingsHash = '4f23a583335dcb4cb3fae553122ea200'; const currentRoutesHash = '3d180d52c663d173a6be791ef411ed01'; diff --git a/ghost/core/test/utils/fixtures/fixtures.json b/ghost/core/test/utils/fixtures/fixtures.json index 3e3f8ffe70..ac15292399 100644 --- a/ghost/core/test/utils/fixtures/fixtures.json +++ b/ghost/core/test/utils/fixtures/fixtures.json @@ -6,14 +6,14 @@ { "title": "Latest", "slug": "latest", - "description": "Collection with all posts", + "description": "All posts", "type": "automatic", "filter": "" }, { - "title": "Featured Posts", + "title": "Featured", "slug": "featured", - "description": "Collection of featured posts", + "description": "Featured posts", "type": "automatic", "filter": "featured:true" }