fix ts and specs

cars10 · Oct 15, 2024 · 0b191bf · 0b191bf
1 parent c14eeab
commit 0b191bf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/src/components/base/ThemeSwitcher.vue b/src/components/base/ThemeSwitcher.vue
@@ -29,19 +29,19 @@
 </template>
 
 <script setup lang="ts">
-  import { useThemeStore } from '../../store/theme.js'
+  import { ThemePreferences, useThemeStore } from '../../store/theme.js'
   import { computed } from 'vue'
   import { useTranslation } from '../../composables/i18n.ts'
   import { setAppThemeCss } from '../../helpers/theme.ts'
 
   const themeStore = useThemeStore()
   const t = useTranslation()
   const themes = {
-    light: 'light_mode',
-    dark: 'dark_mode',
-    auto: 'brightness_medium'
+    [ThemePreferences.light]: 'light_mode',
+    [ThemePreferences.dark]: 'dark_mode',
+    [ThemePreferences.auto]: 'brightness_medium'
   }
-  const changeTheme = (theme) => {
+  const changeTheme = (theme: ThemePreferences) => {
     themeStore.setPreference(theme)
     setAppThemeCss(themeStore.appTheme)
   }

diff --git a/src/store/theme.ts b/src/store/theme.ts
@@ -11,7 +11,7 @@ export enum AppThemes {
   dark = 'dark'
 }
 
-type ThemeState = {
+export type ThemeState = {
   preference: ThemePreferences,
   appTheme: AppThemes
 }

diff --git a/tests/e2e/tests/pages/Base.spec.ts b/tests/e2e/tests/pages/Base.spec.ts
@@ -20,8 +20,9 @@ test.describe('base', () => {
 
       test('can change to dark theme', async ({ page }) => {
         await openElasticvue(page)
-        const body = await page.locator('body')
-        page.getByTestId('change-theme-button').click()
+        const body = page.locator('body')
+        await page.getByTestId('change-theme-button').click()
+        await page.getByTestId('change-theme__dark').click()
 
         await expect(body).toHaveClass(/theme--dark/)
         await expect(body).not.toHaveClass(/theme--light/)
@@ -31,7 +32,7 @@ test.describe('base', () => {
     test.describe('language', () => {
       test('defaults to english', async ({ page }) => {
         await openElasticvue(page)
-        page.getByTestId('change-language-button').click()
+        await page.getByTestId('change-language-button').click()
 
         await expect(page.getByTestId('change-language__en')).toHaveClass(/q-item--active/)
       })