chore: remove old shared header

City-of-Helsinki · Dec 5, 2024 · 477eea9 · 477eea9
1 parent e70a2fc
commit 477eea9
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 194 deletions.
diff --git a/frontend/kesaseteli/shared/src/__tests__/utils/component-apis/header-api.ts b/frontend/kesaseteli/shared/src/__tests__/utils/component-apis/header-api.ts
@@ -13,12 +13,6 @@ const defaultTranslations = {
   en: 'In English',
 };
 
-const languageMenuButtonAriaLabels = {
-  fi: 'Valitse kieli',
-  sv: 'Ändra språk',
-  en: 'Select language',
-};
-
 const expectations = {
   userIsLoggedIn: async (expectedUser?: User): Promise<void> => {
     await screen.findByRole('button', {
@@ -79,7 +73,7 @@ const actions = {
     toLang: Language
   ): Promise<void> => {
     return userEvent.click(
-      screen.getAllByRole('link', {
+      screen.getAllByRole('button', {
         name: new RegExp(
           `(${defaultTranslations[toLang]})|(languages.${toLang})`,
           'i'

diff --git a/frontend/shared/browser-tests/page-models/Header.ts b/frontend/shared/browser-tests/page-models/Header.ts
@@ -30,14 +30,8 @@ class Header<
       .nth(0);
   }
 
-  private languageSelector(): SelectorPromise {
-    return this.withinNavigationActions.findByRole('button', {
-      name: this.translations.header.languageMenuButtonAriaLabel,
-    });
-  }
-
   private languageSelectorItem(toLang: Language): SelectorPromise {
-    return this.withinNavigationActions.findByRole('link', {
+    return this.withinNavigationActions.findByRole('button', {
       name: this.translations.languages[toLang],
     });
   }
@@ -74,9 +68,7 @@ class Header<
   }
 
   public async changeLanguage(toLang: Language): Promise<void> {
-    return t
-      .click(this.languageSelector())
-      .click(this.languageSelectorItem(toLang));
+    return t.click(this.languageSelectorItem(toLang));
   }
 
   public clickLoginButton(): Promise<void> {

diff --git a/frontend/shared/src/components/header/Header.tsx b/frontend/shared/src/components/header/Header.tsx
diff --git a/frontend/shared/src/components/header/__tests__/Header.test.tsx b/frontend/shared/src/components/header/__tests__/Header.test.tsx
@@ -2,7 +2,7 @@ import { axe } from 'jest-axe';
 import React from 'react';
 import { render } from 'shared/__tests__/utils/test-utils';
 
-import Header from '../Header';
+import Header from '../HeaderV3';
 
 // "svg elements with an img role have an alternative text (svg-img-alt)"
 test.skip('test for accessibility violations', async () => {

diff --git a/frontend/shared/src/components/header/useHeader.ts b/frontend/shared/src/components/header/useHeader.ts
@@ -1,6 +1,6 @@
 import { TFunction, useTranslation } from 'next-i18next';
 import { useState } from 'react';
-import { HeaderProps } from 'shared/components/header/Header';
+import { HeaderProps } from 'shared/components/header/HeaderV3';
 import useLocale from 'shared/hooks/useLocale';
 import { Language } from 'shared/i18n/i18n';