From 23fe2cf393569c810d8e6e9e78a13a61c0f7d17f Mon Sep 17 00:00:00 2001 From: Kristijan Vizi Date: Mon, 7 Oct 2024 23:55:00 +0200 Subject: [PATCH] Fix: updated error pages URLs; refactored cards sharepoint paths; --- .../announcements/announcements.spec.js | 2 +- .../protected-content.spec.js | 48 +++++++++---------- nala/blocks/signin/signin.spec.js | 2 +- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/nala/blocks/announcements/announcements.spec.js b/nala/blocks/announcements/announcements.spec.js index ac502a6..9f00d10 100644 --- a/nala/blocks/announcements/announcements.spec.js +++ b/nala/blocks/announcements/announcements.spec.js @@ -79,7 +79,7 @@ export default { data: { searchCardTitle: 'Automation regression announcements card worldwide no1', numberOfMatchingTitleCards: 1, - expectedToSeeInURL: '/channelpartners/drafts/automation/regression/Cards/cpp-worldwide-no1', + expectedToSeeInURL: '/channelpartners/drafts/automation/regression/cards/cpp-worldwide-no1', }, }, { diff --git a/nala/blocks/protected-content/protected-content.spec.js b/nala/blocks/protected-content/protected-content.spec.js index 631ce54..87d5ec4 100644 --- a/nala/blocks/protected-content/protected-content.spec.js +++ b/nala/blocks/protected-content/protected-content.spec.js @@ -4,7 +4,7 @@ export default { { tcid: '1', name: '@desc-accessing-protected-content-with-non-logged-in-user', - path: '/channelpartners/drafts/automation/regression/Cards/cpp-gold-spain?akamaiLocale=na&martech=off', + path: '/channelpartners/drafts/automation/regression/cards/cpp-gold-spain?akamaiLocale=na&martech=off', tags: '@dme-protected-content @regression @login @circleCi', expectedToSeeInURL: 'https://auth-stg1.services.adobe.com/', }, @@ -16,9 +16,9 @@ export default { data: { partnerLevel: 'spp-platinum:', contactNotFoundPage: '/error/contact-not-found', - contentNotFoundPage: '/404-content-not-found', - goldLevelPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/Cards/cpp-gold-spain?akamaiLocale=na&martech=off', - platinumLevelPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/Cards/cpp-platinum-spain?akamaiLocale=na&martech=off', + contentNotFoundPage: '/error/404', + goldLevelPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/cards/cpp-gold-spain?akamaiLocale=na&martech=off', + platinumLevelPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/cards/cpp-platinum-spain?akamaiLocale=na&martech=off', }, }, { @@ -28,10 +28,10 @@ export default { tags: '@dme-protected-content @regression @login @circleCi', data: { partnerLevel: 'cpp-distributor-japan:', - contentNotFoundPage: '/404-content-not-found', - matchingRegionPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/Cards/cpp-distr-japan?akamaiLocale=na&martech=off', - nonMatchingRegionPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/Cards/cpp-distr-north-america?akamaiLocale=na&martech=off', - nonMatchingPartnerLevelPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/Cards/cpp-platinum-spain', + contentNotFoundPage: '/error/404', + matchingRegionPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/cards/cpp-distr-japan?akamaiLocale=na&martech=off', + nonMatchingRegionPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/cards/cpp-distr-north-america?akamaiLocale=na&martech=off', + nonMatchingPartnerLevelPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/cards/cpp-platinum-spain', }, matchingRegionCardText: 'CPP Distributor Japan Announcement', nonMatchingRegionCardText: 'CPP Distributor North America Announcement', @@ -43,10 +43,10 @@ export default { tags: '@dme-protected-content @regression @login @circleCi', data: { partnerLevel: 'cpp-spain-platinum:', - contentNotFoundPage: '/404-content-not-found', - matchingRegionPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/Cards/cpp-platinum-spain?akamaiLocale=na&martech=off', - nonMatchingRegionPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/Cards/cpp-platinum-latin-america?akamaiLocale=na&martech=off', - nonMatchingPartnerLevelPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/Cards/cpp-gold-spain?akamaiLocale=na&martech=off', + contentNotFoundPage: '/error/404', + matchingRegionPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/cards/cpp-platinum-spain?akamaiLocale=na&martech=off', + nonMatchingRegionPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/cards/cpp-platinum-latin-america?akamaiLocale=na&martech=off', + nonMatchingPartnerLevelPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/cards/cpp-gold-spain?akamaiLocale=na&martech=off', }, matchingRegionCardText: 'CPP Platinum Spain Announcement', nonMatchingRegionCardText: 'CPP Platinum Latin America Announcement', @@ -58,10 +58,10 @@ export default { tags: '@dme-protected-content @regression @login @circleCi', data: { partnerLevel: 'cpp-uk-gold:', - contentNotFoundPage: '/404-content-not-found', - matchingRegionPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/Cards/cpp-gold-uk-eur-west?akamaiLocale=na&martech=off', - nonMatchingRegionPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/Cards/cpp-gold-spain?akamaiLocale=na&martech=off', - nonMatchingPartnerLevelPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/Cards/cpp-certified-china?akamaiLocale=na&martech=off', + contentNotFoundPage: '/error/404', + matchingRegionPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/cards/cpp-gold-uk-eur-west?akamaiLocale=na&martech=off', + nonMatchingRegionPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/cards/cpp-gold-spain?akamaiLocale=na&martech=off', + nonMatchingPartnerLevelPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/cards/cpp-certified-china?akamaiLocale=na&martech=off', }, matchingRegionCardText: 'CPP Gold UK, Europe West Announcement', nonMatchingRegionCardText: 'CPP Gold Spain Announcement', @@ -73,10 +73,10 @@ export default { tags: '@dme-protected-content @regression @login @circleCi', data: { partnerLevel: 'cpp-pacific-certified:', - contentNotFoundPage: '/404-content-not-found', - matchingRegionPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/Cards/cpp-certified-pacific?akamaiLocale=na&martech=off', - nonMatchingRegionPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/Cards/cpp-certified-china?akamaiLocale=na&martech=off', - nonMatchingPartnerLevelPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/Cards/cpp-gold-spain?akamaiLocale=na&martech=off', + contentNotFoundPage: '/error/404', + matchingRegionPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/cards/cpp-certified-pacific?akamaiLocale=na&martech=off', + nonMatchingRegionPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/cards/cpp-certified-china?akamaiLocale=na&martech=off', + nonMatchingPartnerLevelPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/cards/cpp-gold-spain?akamaiLocale=na&martech=off', }, matchingRegionCardText: 'CPP Certified Pacific Announcement', nonMatchingRegionCardText: 'CPP Certified China Announcement', @@ -88,10 +88,10 @@ export default { tags: '@dme-protected-content @regression @login @circleCi', data: { partnerLevel: 'cpp-china-registered:', - contentNotFoundPage: '/404-content-not-found', - matchingRegionPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/Cards/cpp-registered-china?akamaiLocale=na&martech=off', - nonMatchingRegionPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/Cards/cpp-registered-europe-east?akamaiLocale=na&martech=off', - nonMatchingPartnerLevelPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/Cards/cpp-certified-china?akamaiLocale=na&martech=off', + contentNotFoundPage: '/error/404', + matchingRegionPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/cards/cpp-registered-china?akamaiLocale=na&martech=off', + nonMatchingRegionPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/cards/cpp-registered-europe-east?akamaiLocale=na&martech=off', + nonMatchingPartnerLevelPage: 'https://partners.stage.adobe.com/channelpartners/drafts/automation/regression/cards/cpp-certified-china?akamaiLocale=na&martech=off', }, matchingRegionCardText: 'CPP Registered China Announcement', nonMatchingRegionCardText: 'CPP Registered Europe East Announcement', diff --git a/nala/blocks/signin/signin.spec.js b/nala/blocks/signin/signin.spec.js index eea3357..7fc3e0e 100644 --- a/nala/blocks/signin/signin.spec.js +++ b/nala/blocks/signin/signin.spec.js @@ -92,7 +92,7 @@ export default { partnerLevel: 'tpp-platinum:', expectedPublicURL: 'https://partners.stage.adobe.com/channelpartners/', restrictedHomePath: 'https://partners.stage.adobe.com/channelpartners/home/?akamaiLocale=na&martech=off', - expectedToSeeInURL: 'https://partners.stage.adobe.com/channelpartners/404-content-not-found', + expectedToSeeInURL: 'https://partners.stage.adobe.com/channelpartners/error/404', }, }, {