From 01d0cfc9a102f2721be967b11e44b53917adff4c Mon Sep 17 00:00:00 2001 From: Bartek Wajda Date: Thu, 5 Dec 2024 15:26:30 +0100 Subject: [PATCH] IBX-9289: Update integration tests --- .../REST/Schemas/ContentTreeNode.json | 2 -- .../Resources/REST/Schemas/ContentTreeNode.xsd | 2 -- .../Schemas/ContentTreeNodeExtendedInfo.json | 18 ++++++++++++++++-- .../Schemas/ContentTreeNodeExtendedInfo.xsd | 7 +++++++ ...ype-identifier-folder-and-landing-page.json | 5 ----- ...dentifier-folder-and-media-location-id.json | 2 -- ...tent-type-identifier-folder-or-subtree.json | 5 ----- ...lter-by-content-type-identifier-folder.json | 4 ---- .../ContentTreeNode/filter/json/no-filter.json | 6 ------ .../ContentTreeNode/filter/xml/no-filter.xml | 6 ------ .../Snapshots/ContentTreeNodeExtendedInfo.json | 3 +++ .../Snapshots/ContentTreeNodeExtendedInfo.xml | 3 +++ .../REST/Snapshots/ContentTreeRoot.json | 2 -- 13 files changed, 29 insertions(+), 36 deletions(-) diff --git a/tests/integration/Resources/REST/Schemas/ContentTreeNode.json b/tests/integration/Resources/REST/Schemas/ContentTreeNode.json index 8652632758..7c6c5c1537 100644 --- a/tests/integration/Resources/REST/Schemas/ContentTreeNode.json +++ b/tests/integration/Resources/REST/Schemas/ContentTreeNode.json @@ -88,7 +88,6 @@ "pathString", "contentId", "versionNo", - "translations", "name", "contentTypeIdentifier", "isContainer", @@ -109,7 +108,6 @@ "pathString", "contentId", "versionNo", - "translations", "name", "contentTypeIdentifier", "isContainer", diff --git a/tests/integration/Resources/REST/Schemas/ContentTreeNode.xsd b/tests/integration/Resources/REST/Schemas/ContentTreeNode.xsd index d3cd136b92..9da3d622eb 100644 --- a/tests/integration/Resources/REST/Schemas/ContentTreeNode.xsd +++ b/tests/integration/Resources/REST/Schemas/ContentTreeNode.xsd @@ -7,7 +7,6 @@ - @@ -24,7 +23,6 @@ - diff --git a/tests/integration/Resources/REST/Schemas/ContentTreeNodeExtendedInfo.json b/tests/integration/Resources/REST/Schemas/ContentTreeNodeExtendedInfo.json index 753b688a84..3d520aa1d9 100644 --- a/tests/integration/Resources/REST/Schemas/ContentTreeNodeExtendedInfo.json +++ b/tests/integration/Resources/REST/Schemas/ContentTreeNodeExtendedInfo.json @@ -66,12 +66,26 @@ ] } } - } + }, + "translations": { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": [ + { + "type": "string" + } + ] + } + } + } }, "required": [ "_media-type", "permissions", - "previewableTranslations" + "previewableTranslations", + "translations" ] } }, diff --git a/tests/integration/Resources/REST/Schemas/ContentTreeNodeExtendedInfo.xsd b/tests/integration/Resources/REST/Schemas/ContentTreeNodeExtendedInfo.xsd index cd01c211ce..c9f6409121 100644 --- a/tests/integration/Resources/REST/Schemas/ContentTreeNodeExtendedInfo.xsd +++ b/tests/integration/Resources/REST/Schemas/ContentTreeNodeExtendedInfo.xsd @@ -33,6 +33,13 @@ + + + + + + + diff --git a/tests/integration/Resources/REST/Snapshots/ContentTreeNode/filter/json/filter-by-content-type-identifier-folder-and-landing-page.json b/tests/integration/Resources/REST/Snapshots/ContentTreeNode/filter/json/filter-by-content-type-identifier-folder-and-landing-page.json index b93aa863fd..2125da70f2 100644 --- a/tests/integration/Resources/REST/Snapshots/ContentTreeNode/filter/json/filter-by-content-type-identifier-folder-and-landing-page.json +++ b/tests/integration/Resources/REST/Snapshots/ContentTreeNode/filter/json/filter-by-content-type-identifier-folder-and-landing-page.json @@ -17,7 +17,6 @@ "pathString": "/1/2/", "reverseRelationsCount": 0, "totalChildrenCount": 0, - "translations": "eng-GB", "versionNo": 1 }, { @@ -35,7 +34,6 @@ "pathString": "/1/43/", "reverseRelationsCount": 0, "totalChildrenCount": 3, - "translations": "eng-US", "versionNo": 1 }, { @@ -53,7 +51,6 @@ "pathString": "/1/48/", "reverseRelationsCount": 0, "totalChildrenCount": 0, - "translations": "eng-US", "versionNo": 1 }, { @@ -71,7 +68,6 @@ "pathString": "/1/58/", "reverseRelationsCount": 0, "totalChildrenCount": 0, - "translations": "eng-US", "versionNo": 1 } ], @@ -87,7 +83,6 @@ "pathString": "/1/", "reverseRelationsCount": 0, "totalChildrenCount": 4, - "translations": "", "versionNo": 1 } } diff --git a/tests/integration/Resources/REST/Snapshots/ContentTreeNode/filter/json/filter-by-content-type-identifier-folder-and-media-location-id.json b/tests/integration/Resources/REST/Snapshots/ContentTreeNode/filter/json/filter-by-content-type-identifier-folder-and-media-location-id.json index 8d133ecb73..a5c583fdd9 100644 --- a/tests/integration/Resources/REST/Snapshots/ContentTreeNode/filter/json/filter-by-content-type-identifier-folder-and-media-location-id.json +++ b/tests/integration/Resources/REST/Snapshots/ContentTreeNode/filter/json/filter-by-content-type-identifier-folder-and-media-location-id.json @@ -17,7 +17,6 @@ "pathString": "/1/43/", "reverseRelationsCount": 0, "totalChildrenCount": 0, - "translations": "eng-US", "versionNo": 1 } ], @@ -33,7 +32,6 @@ "pathString": "/1/", "reverseRelationsCount": 0, "totalChildrenCount": 1, - "translations": "", "versionNo": 1 } } diff --git a/tests/integration/Resources/REST/Snapshots/ContentTreeNode/filter/json/filter-by-content-type-identifier-folder-or-subtree.json b/tests/integration/Resources/REST/Snapshots/ContentTreeNode/filter/json/filter-by-content-type-identifier-folder-or-subtree.json index 240568a68f..c93a0a1d7c 100644 --- a/tests/integration/Resources/REST/Snapshots/ContentTreeNode/filter/json/filter-by-content-type-identifier-folder-or-subtree.json +++ b/tests/integration/Resources/REST/Snapshots/ContentTreeNode/filter/json/filter-by-content-type-identifier-folder-or-subtree.json @@ -17,7 +17,6 @@ "pathString": "/1/43/", "reverseRelationsCount": 0, "totalChildrenCount": 3, - "translations": "eng-US", "versionNo": 1 }, { @@ -35,7 +34,6 @@ "pathString": "/1/48/", "reverseRelationsCount": 0, "totalChildrenCount": 0, - "translations": "eng-US", "versionNo": 1 }, { @@ -53,7 +51,6 @@ "pathString": "/1/5/", "reverseRelationsCount": 0, "totalChildrenCount": 5, - "translations": "eng-US", "versionNo": 1 }, { @@ -71,7 +68,6 @@ "pathString": "/1/58/", "reverseRelationsCount": 0, "totalChildrenCount": 0, - "translations": "eng-US", "versionNo": 1 } ], @@ -87,7 +83,6 @@ "pathString": "/1/", "reverseRelationsCount": 0, "totalChildrenCount": 4, - "translations": "", "versionNo": 1 } } diff --git a/tests/integration/Resources/REST/Snapshots/ContentTreeNode/filter/json/filter-by-content-type-identifier-folder.json b/tests/integration/Resources/REST/Snapshots/ContentTreeNode/filter/json/filter-by-content-type-identifier-folder.json index ded51eb7fd..362e61fad0 100644 --- a/tests/integration/Resources/REST/Snapshots/ContentTreeNode/filter/json/filter-by-content-type-identifier-folder.json +++ b/tests/integration/Resources/REST/Snapshots/ContentTreeNode/filter/json/filter-by-content-type-identifier-folder.json @@ -17,7 +17,6 @@ "pathString": "/1/43/", "reverseRelationsCount": 0, "totalChildrenCount": 3, - "translations": "eng-US", "versionNo": 1 }, { @@ -35,7 +34,6 @@ "pathString": "/1/48/", "reverseRelationsCount": 0, "totalChildrenCount": 0, - "translations": "eng-US", "versionNo": 1 }, { @@ -53,7 +51,6 @@ "pathString": "/1/58/", "reverseRelationsCount": 0, "totalChildrenCount": 0, - "translations": "eng-US", "versionNo": 1 } ], @@ -69,7 +66,6 @@ "pathString": "/1/", "reverseRelationsCount": 0, "totalChildrenCount": 3, - "translations": "", "versionNo": 1 } } diff --git a/tests/integration/Resources/REST/Snapshots/ContentTreeNode/filter/json/no-filter.json b/tests/integration/Resources/REST/Snapshots/ContentTreeNode/filter/json/no-filter.json index 0337e22d7e..0892041a5a 100644 --- a/tests/integration/Resources/REST/Snapshots/ContentTreeNode/filter/json/no-filter.json +++ b/tests/integration/Resources/REST/Snapshots/ContentTreeNode/filter/json/no-filter.json @@ -17,7 +17,6 @@ "pathString": "/1/2/", "reverseRelationsCount": 0, "totalChildrenCount": 1, - "translations": "eng-GB", "versionNo": 1 }, { @@ -35,7 +34,6 @@ "pathString": "/1/43/", "reverseRelationsCount": 0, "totalChildrenCount": 3, - "translations": "eng-US", "versionNo": 1 }, { @@ -53,7 +51,6 @@ "pathString": "/1/48/", "reverseRelationsCount": 0, "totalChildrenCount": 0, - "translations": "eng-US", "versionNo": 1 }, { @@ -71,7 +68,6 @@ "pathString": "/1/5/", "reverseRelationsCount": 0, "totalChildrenCount": 5, - "translations": "eng-US", "versionNo": 1 }, { @@ -89,7 +85,6 @@ "pathString": "/1/58/", "reverseRelationsCount": 0, "totalChildrenCount": 0, - "translations": "eng-US", "versionNo": 1 } ], @@ -105,7 +100,6 @@ "pathString": "/1/", "reverseRelationsCount": 0, "totalChildrenCount": 5, - "translations": "", "versionNo": 1 } } diff --git a/tests/integration/Resources/REST/Snapshots/ContentTreeNode/filter/xml/no-filter.xml b/tests/integration/Resources/REST/Snapshots/ContentTreeNode/filter/xml/no-filter.xml index e4a55a1fc0..a28ef0d08a 100644 --- a/tests/integration/Resources/REST/Snapshots/ContentTreeNode/filter/xml/no-filter.xml +++ b/tests/integration/Resources/REST/Snapshots/ContentTreeNode/filter/xml/no-filter.xml @@ -4,7 +4,6 @@ /1/ 0 1 - eng-GB @@ -19,7 +18,6 @@ /1/2/ 57 1 - eng-GB eng-GB Home landing_page @@ -35,7 +33,6 @@ /1/43/ 41 1 - eng-US eng-US Media folder @@ -51,7 +48,6 @@ /1/48/ 45 1 - eng-US eng-US Setup folder @@ -67,7 +63,6 @@ /1/5/ 4 1 - eng-US eng-US Users user_group @@ -83,7 +78,6 @@ /1/58/ 56 1 - eng-US eng-US Design folder diff --git a/tests/integration/Resources/REST/Snapshots/ContentTreeNodeExtendedInfo.json b/tests/integration/Resources/REST/Snapshots/ContentTreeNodeExtendedInfo.json index 85be359381..25a913466a 100644 --- a/tests/integration/Resources/REST/Snapshots/ContentTreeNodeExtendedInfo.json +++ b/tests/integration/Resources/REST/Snapshots/ContentTreeNodeExtendedInfo.json @@ -38,6 +38,9 @@ ], "previewableTranslations": { "values": ["eng-GB"] + }, + "translations": { + "values": ["eng-GB"] } } } diff --git a/tests/integration/Resources/REST/Snapshots/ContentTreeNodeExtendedInfo.xml b/tests/integration/Resources/REST/Snapshots/ContentTreeNodeExtendedInfo.xml index 926eeef47f..2fd90b0e52 100644 --- a/tests/integration/Resources/REST/Snapshots/ContentTreeNodeExtendedInfo.xml +++ b/tests/integration/Resources/REST/Snapshots/ContentTreeNodeExtendedInfo.xml @@ -26,4 +26,7 @@ eng-GB + + eng-GB + diff --git a/tests/integration/Resources/REST/Snapshots/ContentTreeRoot.json b/tests/integration/Resources/REST/Snapshots/ContentTreeRoot.json index 1a7c7c051d..aacf1ed1bd 100644 --- a/tests/integration/Resources/REST/Snapshots/ContentTreeRoot.json +++ b/tests/integration/Resources/REST/Snapshots/ContentTreeRoot.json @@ -8,7 +8,6 @@ "mainLanguageCode": "eng-GB", "contentId": 57, "versionNo": 1, - "translations": "eng-GB", "name": "Home", "pathString": "/1/2/", "contentTypeIdentifier": "landing_page", @@ -25,7 +24,6 @@ "mainLanguageCode": "eng-GB", "contentId": 58, "versionNo": 1, - "translations": "eng-GB", "name": "Contact Us", "pathString": "/1/2/60/", "contentTypeIdentifier": "feedback_form",