EWPP-2827: Change https://ec.europa.eu/info/ to https://commission.eu…

…ropa.eu/.
openeuropa · Dec 5, 2022 · b303b5d · b303b5d
1 parent 6537276
commit b303b5d
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -49,7 +49,7 @@
         "openeuropa/code-review": "^2.0",
         "openeuropa/oe_contact_forms": "^1.5",
         "openeuropa/oe_content": "3.x-dev",
-        "openeuropa/oe_corporate_blocks": "^4.4",
+        "openeuropa/oe_corporate_blocks": "dev-EWPP-2827",
         "openeuropa/oe_corporate_countries": "~2.0",
         "openeuropa/oe_media": "^1.19",
         "openeuropa/oe_multilingual": "^1.10",

diff --git a/oe_theme.theme b/oe_theme.theme
@@ -1253,7 +1253,7 @@ function oe_theme_preprocess_block__system_branding_block(&$variables) {
     $variables['logo_aria_label'] = t('Home') . ' - ' . t('European Commission');
     $variables['site_logo_alt'] = t('European Commission logo');
     $variables['site_logo_title'] = t('European Commission');
-    $site_logo_href = 'https://ec.europa.eu/info';
+    $site_logo_href = 'https://commission.europa.eu';
   }
   else {
     $variables['logo_aria_label'] = t('Home') . ' - ' . t('European Union');

diff --git a/templates/patterns/navigation_list/navigation_list.ui_patterns.yml b/templates/patterns/navigation_list/navigation_list.ui_patterns.yml
@@ -11,7 +11,7 @@ navigation_list:
       type: "text"
       label: "Title URL"
       description: "URL to link the title of the navigation list."
-      preview: "https://ec.europa.eu/info/education/policy-educational-issues_en"
+      preview: "https://commission.europa.eu/education/policy-educational-issues_en"
     external_link:
       type: "boolean"
       label: "External link"
@@ -28,22 +28,22 @@ navigation_list:
       description: "Array of links that form the navigation list."
       preview:
         - label: 'Addressing shared challenges'
-          url: 'https://ec.europa.eu/info/education/policy-educational-issues/shared-challenges-education-and-training_en'
+          url: 'https://commission.europa.eu/education/policy-educational-issues/shared-challenges-education-and-training_en'
           is_external: true
         - label: 'Setting objectives and measuring progress'
-          url: 'https://ec.europa.eu/info/education/policy-educational-issues/setting-objectives-and-measuring-progress_en'
+          url: 'https://commission.europa.eu/education/policy-educational-issues/setting-objectives-and-measuring-progress_en'
         - label: 'International cooperation'
-          url: 'https://ec.europa.eu/info/education/policy-educational-issues/international-cooperation_en'
+          url: 'https://commission.europa.eu/education/policy-educational-issues/international-cooperation_en'
           is_external: true
     secondary_links:
       type: "array"
       label: "Secondary Links"
       description: "Secondary array of links that form the navigation list."
       preview:
         - label: 'Integrating migrants and refugees'
-          url: 'https://ec.europa.eu/info/education/policy-educational-issues/shared-challenges-education-and-training/integrating-migrants-and-refugees_en'
+          url: 'https://commission.europa.eu/education/policy-educational-issues/shared-challenges-education-and-training/integrating-migrants-and-refugees_en'
         - label: 'Early school leaving'
-          url: 'https://ec.europa.eu/info/education/policy-educational-issues/shared-challenges-education-and-training/early-school-leaving_en'
+          url: 'https://commission.europa.eu/education/policy-educational-issues/shared-challenges-education-and-training/early-school-leaving_en'
           is_external: true
     border:
       type: "boolean"

diff --git a/tests/features/corporate-blocks.feature b/tests/features/corporate-blocks.feature
@@ -17,7 +17,7 @@ Feature: Corporate blocks feature
   Scenario Outline: By default the European Commission footer is displayed.
     Given I am an anonymous user
     When I am on "<page>"
-    Then I should see the European Commission footer with link "https://ec.europa.eu/info/index_en"
+    Then I should see the European Commission footer with link "https://commission.europa.eu/index_en"
 
     Examples:
       | page                        |
@@ -27,7 +27,7 @@ Feature: Corporate blocks feature
   Scenario Outline: Changing the site's style will display either the European Commission or the European Union footer.
     Given I am an anonymous user
     When I am on "<page>"
-    Then I should see the European Commission footer with link "https://ec.europa.eu/info/index_en"
+    Then I should see the European Commission footer with link "https://commission.europa.eu/index_en"
     And I should not see the "European Union" footer
 
     When the theme is configured to use the "European Union" style
@@ -38,7 +38,7 @@ Feature: Corporate blocks feature
     When the theme is configured to use the "European Commission" style
     And I reload the page
     Then I should not see the "European Union" footer
-    But I should see the European Commission footer with link "https://ec.europa.eu/info/index_en"
+    But I should see the European Commission footer with link "https://commission.europa.eu/index_en"
 
     Examples:
       | page                        |

diff --git a/tests/features/site-branding.feature b/tests/features/site-branding.feature
@@ -105,8 +105,8 @@ Feature: Site branding
     Then the header logo should contain accessibility attributes with link "<link>" label "<label>" alt "<alt>" title "<title>"
 
     Examples:
-      | language_selector | link                                      | label                 | alt                 | title          |
-      | English           | https://ec.europa.eu/info/index_en | Home - European Commission | European Commission logo | European Commission |
-      | български         | https://ec.europa.eu/info/index_bg | Home - European Commission | European Commission logo | European Commission |
+      | language_selector | link                                  | label                      | alt                      | title               |
+      | English           | https://commission.europa.eu/index_en | Home - European Commission | European Commission logo | European Commission |
+      | български         | https://commission.europa.eu/index_bg | Home - European Commission | European Commission logo | European Commission |
       # Non-EU language.
-      | Icelandic         | https://ec.europa.eu/info          | Home - European Commission | European Commission logo | European Commission |
+      | Icelandic         | https://commission.europa.eu/         | Home - European Commission | European Commission logo | European Commission |
diff --git a/tests/src/Functional/fixtures/ec_footer.yml b/tests/src/Functional/fixtures/ec_footer.yml
@@ -1,5 +1,5 @@
 corporate_site_link:
-  href: 'https://ec.europa.eu/info/index_en'
+  href: 'https://commission.europa.eu/index_en'
   label: 'European Commission website'
 class_navigation:
   -