From ace65eab3ab118d8465fbc0b39e3b908c8c2f770 Mon Sep 17 00:00:00 2001 From: Zhihe Li Date: Fri, 20 Sep 2024 11:41:47 -0400 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Fix=20theme=20selector=20?= =?UTF-8?q?not=20properly=20selecting=20option=20(#2495)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/desktop/app/components/settings-card/application/index.js | 4 ++++ .../integration/components/settings-card/application-test.js | 2 +- .../integration/components/settings-card/client-agent-test.js | 2 +- .../tests/integration/components/settings-card/logs-test.js | 2 +- .../tests/integration/components/settings-card/server-test.js | 2 +- .../tests/integration/components/settings-card/user-test.js | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ui/desktop/app/components/settings-card/application/index.js b/ui/desktop/app/components/settings-card/application/index.js index 4bd00b484..6e38af3d5 100644 --- a/ui/desktop/app/components/settings-card/application/index.js +++ b/ui/desktop/app/components/settings-card/application/index.js @@ -4,6 +4,7 @@ */ import Component from '@glimmer/component'; +import { inject as service } from '@ember/service'; const THEMES = [ { @@ -21,6 +22,9 @@ const THEMES = [ ]; export default class SettingsApplicationComponent extends Component { + // =services + @service session; + /** * Returns available themes */ diff --git a/ui/desktop/tests/integration/components/settings-card/application-test.js b/ui/desktop/tests/integration/components/settings-card/application-test.js index a5ac67e80..090962140 100644 --- a/ui/desktop/tests/integration/components/settings-card/application-test.js +++ b/ui/desktop/tests/integration/components/settings-card/application-test.js @@ -17,7 +17,7 @@ const LAST_ERROR_MESSAGE = '.hds-reveal__content > p:last-child'; module('Integration | Component | settings-card/application', function (hooks) { setupRenderingTest(hooks); - setupIntl(hooks); + setupIntl(hooks, 'en-us'); let model; diff --git a/ui/desktop/tests/integration/components/settings-card/client-agent-test.js b/ui/desktop/tests/integration/components/settings-card/client-agent-test.js index f8208ddcc..bf85439ef 100644 --- a/ui/desktop/tests/integration/components/settings-card/client-agent-test.js +++ b/ui/desktop/tests/integration/components/settings-card/client-agent-test.js @@ -20,7 +20,7 @@ module( 'Integration | Component | settings-card/client-agent', function (hooks) { setupRenderingTest(hooks); - setupIntl(hooks); + setupIntl(hooks, 'en-us'); test('it renders running badge and pause button', async function (assert) { this.set('model', { diff --git a/ui/desktop/tests/integration/components/settings-card/logs-test.js b/ui/desktop/tests/integration/components/settings-card/logs-test.js index 4131c3e78..7dd622ece 100644 --- a/ui/desktop/tests/integration/components/settings-card/logs-test.js +++ b/ui/desktop/tests/integration/components/settings-card/logs-test.js @@ -11,7 +11,7 @@ import { setupIntl } from 'ember-intl/test-support'; module('Integration | Component | settings-card/logs', function (hooks) { setupRenderingTest(hooks); - setupIntl(hooks); + setupIntl(hooks, 'en-us'); const SELECTED_OPTION = 'select option:checked'; const COPY_BUTTON_TEXT = '.hds-copy-snippet__text'; diff --git a/ui/desktop/tests/integration/components/settings-card/server-test.js b/ui/desktop/tests/integration/components/settings-card/server-test.js index f1b4a53f4..7bc997a7b 100644 --- a/ui/desktop/tests/integration/components/settings-card/server-test.js +++ b/ui/desktop/tests/integration/components/settings-card/server-test.js @@ -14,7 +14,7 @@ const SERVER_URL = '[data-test-server-url]'; module('Integration | Component | settings-card/server', function (hooks) { setupRenderingTest(hooks); - setupIntl(hooks); + setupIntl(hooks, 'en-us'); const setDefaultClusterUrl = (test) => { const windowOrigin = 'hashicorp.cloud'; diff --git a/ui/desktop/tests/integration/components/settings-card/user-test.js b/ui/desktop/tests/integration/components/settings-card/user-test.js index daa1bf048..91bd82cd4 100644 --- a/ui/desktop/tests/integration/components/settings-card/user-test.js +++ b/ui/desktop/tests/integration/components/settings-card/user-test.js @@ -23,7 +23,7 @@ const AUTHENTICATION_BADGE = '.hds-badge__text'; module('Integration | Component | settings-card/user', function (hooks) { setupRenderingTest(hooks); - setupIntl(hooks); + setupIntl(hooks, 'en-us'); test('it renders password correctly', async function (assert) { this.owner.register(