From 28e5882c568f9b887d0976ca0baa86d9ded9c5b3 Mon Sep 17 00:00:00 2001 From: jdkfx Date: Wed, 11 Dec 2024 03:14:45 +0900 Subject: [PATCH 01/11] =?UTF-8?q?=E5=88=9D=E6=9C=9F=E8=A8=AD=E5=AE=9A?= =?UTF-8?q?=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD=E3=82=B0=E3=83=87=E3=83=90?= =?UTF-8?q?=E3=83=83=E3=82=B0=E7=94=A8=E3=81=AE=E3=83=9C=E3=82=BF=E3=83=B3?= =?UTF-8?q?=E3=82=92=E8=A8=AD=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Menu/MenuBar/MenuBar.vue | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/components/Menu/MenuBar/MenuBar.vue b/src/components/Menu/MenuBar/MenuBar.vue index 262628cd10..7d96638770 100644 --- a/src/components/Menu/MenuBar/MenuBar.vue +++ b/src/components/Menu/MenuBar/MenuBar.vue @@ -532,6 +532,16 @@ const menudata = computed(() => [ }, disableWhenUiLocked: false, }, + { + type: "button", + label: "初期設定ダイアログデバッグ用ボタン", + onClick() { + void store.actions.SET_DIALOG_OPEN({ + isInitialSettingsDialogOpen: true, + }); + }, + disableWhenUiLocked: true, + }, ], }, { From 728da61c206a85d1a5397de70d29bb90c4c0b692 Mon Sep 17 00:00:00 2001 From: jdkfx Date: Wed, 11 Dec 2024 03:15:27 +0900 Subject: [PATCH 02/11] =?UTF-8?q?=E7=B0=A1=E6=98=93=E7=9A=84=E3=81=AA?= =?UTF-8?q?=E5=88=9D=E6=9C=9F=E8=A8=AD=E5=AE=9A=E3=83=80=E3=82=A4=E3=82=A2?= =?UTF-8?q?=E3=83=AD=E3=82=B0=E3=82=92=E8=A1=A8=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Dialog/AllDialog.vue | 11 +++++ .../Dialog/InitialSettingsDialog.vue | 41 +++++++++++++++++++ src/store/type.ts | 1 + src/store/ui.ts | 1 + 4 files changed, 54 insertions(+) create mode 100644 src/components/Dialog/InitialSettingsDialog.vue diff --git a/src/components/Dialog/AllDialog.vue b/src/components/Dialog/AllDialog.vue index 468371c4a2..c1884691a8 100644 --- a/src/components/Dialog/AllDialog.vue +++ b/src/components/Dialog/AllDialog.vue @@ -24,6 +24,7 @@ /> + diff --git a/src/components/Dialog/InitialSettingsDialog.vue b/src/components/Dialog/InitialSettingsDialog.vue new file mode 100644 index 0000000000..aa8aff8eab --- /dev/null +++ b/src/components/Dialog/InitialSettingsDialog.vue @@ -0,0 +1,41 @@ + + + + + diff --git a/src/store/type.ts b/src/store/type.ts index 5f0847e14d..79311a25c7 100644 --- a/src/store/type.ts +++ b/src/store/type.ts @@ -1977,6 +1977,7 @@ export type DialogStates = { isUpdateNotificationDialogOpen: boolean; isExportSongAudioDialogOpen: boolean; isImportSongProjectDialogOpen: boolean; + isInitialSettingsDialogOpen: boolean; }; export type UiStoreTypes = { diff --git a/src/store/ui.ts b/src/store/ui.ts index 93a4c5383b..550cf51e34 100644 --- a/src/store/ui.ts +++ b/src/store/ui.ts @@ -81,6 +81,7 @@ export const uiStoreState: UiStoreState = { isUpdateNotificationDialogOpen: false, isExportSongAudioDialogOpen: false, isImportSongProjectDialogOpen: false, + isInitialSettingsDialogOpen: true, isMaximized: false, isPinned: false, isFullscreen: false, From a86855a74404db32241f2fa3246bebc1cc3d1b4f Mon Sep 17 00:00:00 2001 From: jdkfx Date: Thu, 12 Dec 2024 01:29:30 +0900 Subject: [PATCH 03/11] =?UTF-8?q?=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=AB?= =?UTF-8?q?=E3=82=88=E3=82=8B=E3=82=A8=E3=83=87=E3=82=A3=E3=82=BF=E5=88=87?= =?UTF-8?q?=E3=82=8A=E6=9B=BF=E3=81=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dialog/InitialSettingsDialog.vue | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/components/Dialog/InitialSettingsDialog.vue b/src/components/Dialog/InitialSettingsDialog.vue index aa8aff8eab..9cf1feea23 100644 --- a/src/components/Dialog/InitialSettingsDialog.vue +++ b/src/components/Dialog/InitialSettingsDialog.vue @@ -14,12 +14,16 @@ outline textColor="display" class="text-no-wrap text-bold q-mr-sm" + @click="selectEditor(talk)" + @update:modelValue="selectEditor" /> @@ -27,7 +31,23 @@ - + From 8b09574ff9bd443352e53d532d4009487d1c27f9 Mon Sep 17 00:00:00 2001 From: jdkfx Date: Sun, 15 Dec 2024 19:16:07 +0900 Subject: [PATCH 06/11] =?UTF-8?q?=E9=81=8E=E5=8E=BB=E3=81=AB=E9=96=8B?= =?UTF-8?q?=E3=81=84=E3=81=A6=E3=81=84=E3=81=9F=E3=82=A8=E3=83=87=E3=82=A3?= =?UTF-8?q?=E3=82=BF=E3=81=8Cundefined=E3=81=AE=E6=99=82=E3=83=80=E3=82=A4?= =?UTF-8?q?=E3=82=A2=E3=83=AD=E3=82=B0=E3=82=92=E9=96=8B=E3=81=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Dialog/AllDialog.vue | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/components/Dialog/AllDialog.vue b/src/components/Dialog/AllDialog.vue index c1884691a8..2fdee48e5d 100644 --- a/src/components/Dialog/AllDialog.vue +++ b/src/components/Dialog/AllDialog.vue @@ -182,11 +182,16 @@ const isImportSongProjectDialogOpenComputed = computed({ }); // 初期設定ダイアログ +const isSelectedEditorType = computed(() => store.state.openedEditor); +console.log(isSelectedEditorType.value); const isInitialSettingsDialogOpenComputed = computed({ get: () => store.state.isInitialSettingsDialogOpen, - set: (val) => - store.actions.SET_DIALOG_OPEN({ - isInitialSettingsDialogOpen: val, - }), + set: (val) => { + if (isSelectedEditorType.value) { + void store.actions.SET_DIALOG_OPEN({ + isInitialSettingsDialogOpen: val, + }); + } + }, }); From 101bd4c3582c637a7e2747df7a4ccff80621b01f Mon Sep 17 00:00:00 2001 From: Hiroshiba Date: Mon, 30 Dec 2024 03:14:15 +0900 Subject: [PATCH 07/11] =?UTF-8?q?feat:=20=E5=88=9D=E6=9C=9F=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD=E3=82=B0=E3=81=AE?= =?UTF-8?q?=E7=8A=B6=E6=85=8B=E7=AE=A1=E7=90=86=E3=82=92=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=E3=81=97=E3=80=81openedEditor=E3=82=92=E3=82=AA=E3=83=97?= =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=8A=E3=83=AB=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/App.vue | 1 + src/components/Dialog/AllDialog.vue | 29 +++++++++++++++-------------- src/store/type.ts | 4 +--- src/store/ui.ts | 2 +- src/type/preload.ts | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/components/App.vue b/src/components/App.vue index f49b89c372..cc6b8f4c80 100644 --- a/src/components/App.vue +++ b/src/components/App.vue @@ -160,6 +160,7 @@ onMounted(async () => { isAcceptTermsDialogOpen: import.meta.env.MODE !== "development" && store.state.acceptTerms !== "Accepted", + isInitialSettingsDialogOpen: store.state.openedEditor == undefined, }); // プロジェクトファイルが指定されていればロード diff --git a/src/components/Dialog/AllDialog.vue b/src/components/Dialog/AllDialog.vue index 2d594f3b57..57e62d764e 100644 --- a/src/components/Dialog/AllDialog.vue +++ b/src/components/Dialog/AllDialog.vue @@ -144,6 +144,21 @@ const isAcceptRetrieveTelemetryDialogOpenComputed = computed({ }), }); +// 初期設定ダイアログ +const isInitialSettingsDialogOpenComputed = computed({ + get: () => + !store.state.isAcceptTermsDialogOpen && + !store.state.isCharacterOrderDialogOpen && + !store.state.isDefaultStyleSelectDialogOpen && + !store.state.isAcceptRetrieveTelemetryDialogOpen && + store.state.isInitialSettingsDialogOpen, + set: (val) => { + void store.actions.SET_DIALOG_OPEN({ + isInitialSettingsDialogOpen: val, + }); + }, +}); + // エディタのアップデート確認ダイアログ const canOpenNotificationDialog = computed(() => { return ( @@ -172,18 +187,4 @@ const isImportSongProjectDialogOpenComputed = computed({ isImportSongProjectDialogOpen: val, }), }); - -// 初期設定ダイアログ -const isSelectedEditorType = computed(() => store.state.openedEditor); -console.log(isSelectedEditorType.value); -const isInitialSettingsDialogOpenComputed = computed({ - get: () => store.state.isInitialSettingsDialogOpen, - set: (val) => { - if (isSelectedEditorType.value) { - void store.actions.SET_DIALOG_OPEN({ - isInitialSettingsDialogOpen: val, - }); - } - }, -}); diff --git a/src/store/type.ts b/src/store/type.ts index 0a956c255c..e6f30ea84a 100644 --- a/src/store/type.ts +++ b/src/store/type.ts @@ -1874,9 +1874,7 @@ export type SettingStoreState = { experimentalSetting: ExperimentalSettingType; confirmedTips: ConfirmedTips; engineSettings: EngineSettings; -} & Omit & { - openedEditor: EditorType | undefined; // undefinedのときはどのエディタを開くか定まっていない - }; +} & RootMiscSettingType; // keyとvalueの型を連動するようにしたPayloadを作る type KeyValuePayload = K extends keyof R diff --git a/src/store/ui.ts b/src/store/ui.ts index 26e6931d3b..68fbb87fad 100644 --- a/src/store/ui.ts +++ b/src/store/ui.ts @@ -80,7 +80,7 @@ export const uiStoreState: UiStoreState = { isUpdateNotificationDialogOpen: false, isExportSongAudioDialogOpen: false, isImportSongProjectDialogOpen: false, - isInitialSettingsDialogOpen: true, + isInitialSettingsDialogOpen: false, isMaximized: false, isPinned: false, isFullscreen: false, diff --git a/src/type/preload.ts b/src/type/preload.ts index cd1e6cf9e4..c3a4560120 100644 --- a/src/type/preload.ts +++ b/src/type/preload.ts @@ -377,7 +377,7 @@ export type ConfirmedTips = { // ルート直下にある雑多な設定値 export const rootMiscSettingSchema = z.object({ - openedEditor: z.enum(["talk", "song"]).default("talk"), + openedEditor: z.enum(["talk", "song"]).optional(), editorFont: z.enum(["default", "os"]).default("default"), showTextLineNumber: z.boolean().default(false), showAddAudioItemButton: z.boolean().default(true), From 7fdd64d2e82c48f09434af85583226c39ea9dbc1 Mon Sep 17 00:00:00 2001 From: jdkfx Date: Mon, 27 Jan 2025 01:00:32 +0900 Subject: [PATCH 08/11] =?UTF-8?q?=E3=83=87=E3=83=90=E3=83=83=E3=82=B0?= =?UTF-8?q?=E7=94=A8=E3=83=9C=E3=82=BF=E3=83=B3=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Menu/MenuBar/MenuBar.vue | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/components/Menu/MenuBar/MenuBar.vue b/src/components/Menu/MenuBar/MenuBar.vue index 271a4854ca..5df82f18d2 100644 --- a/src/components/Menu/MenuBar/MenuBar.vue +++ b/src/components/Menu/MenuBar/MenuBar.vue @@ -526,16 +526,6 @@ const menudata = computed(() => [ }, disableWhenUiLocked: false, }, - { - type: "button", - label: "初期設定ダイアログデバッグ用ボタン", - onClick() { - void store.actions.SET_DIALOG_OPEN({ - isInitialSettingsDialogOpen: true, - }); - }, - disableWhenUiLocked: true, - }, ], }, { From 94fd07c56b4d6f5142b531d8b2811872dd226e8c Mon Sep 17 00:00:00 2001 From: jdkfx Date: Wed, 19 Feb 2025 22:21:23 +0900 Subject: [PATCH 09/11] =?UTF-8?q?=E3=82=B9=E3=83=8A=E3=83=83=E3=83=97?= =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=83=E3=83=88=E3=81=AE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unit/backend/common/__snapshots__/configManager.spec.ts.snap | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/unit/backend/common/__snapshots__/configManager.spec.ts.snap b/tests/unit/backend/common/__snapshots__/configManager.spec.ts.snap index 23598f3943..74dc0c7795 100644 --- a/tests/unit/backend/common/__snapshots__/configManager.spec.ts.snap +++ b/tests/unit/backend/common/__snapshots__/configManager.spec.ts.snap @@ -198,7 +198,6 @@ exports[`0.13.0からマイグレーションできる 1`] = ` }, ], "inheritAudioInfo": true, - "openedEditor": "talk", "playheadPositionDisplayFormat": "MINUTES_SECONDS", "presets": { "items": {}, From 253a9c5d35ce77a92844bd48da807f29b9764421 Mon Sep 17 00:00:00 2001 From: jdkfx Date: Tue, 11 Mar 2025 22:50:37 +0900 Subject: [PATCH 10/11] =?UTF-8?q?=E3=81=84=E3=82=89=E3=81=AA=E3=81=84void?= =?UTF-8?q?=E3=82=92=E6=B6=88=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Dialog/AllDialog.vue | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/components/Dialog/AllDialog.vue b/src/components/Dialog/AllDialog.vue index 57e62d764e..15fdcf410c 100644 --- a/src/components/Dialog/AllDialog.vue +++ b/src/components/Dialog/AllDialog.vue @@ -152,11 +152,10 @@ const isInitialSettingsDialogOpenComputed = computed({ !store.state.isDefaultStyleSelectDialogOpen && !store.state.isAcceptRetrieveTelemetryDialogOpen && store.state.isInitialSettingsDialogOpen, - set: (val) => { - void store.actions.SET_DIALOG_OPEN({ + set: (val) => + store.actions.SET_DIALOG_OPEN({ isInitialSettingsDialogOpen: val, - }); - }, + }), }); // エディタのアップデート確認ダイアログ From d5cc9fd30c41123c55f352bfe081ee108288c748 Mon Sep 17 00:00:00 2001 From: jdkfx Date: Sat, 15 Mar 2025 00:37:18 +0900 Subject: [PATCH 11/11] =?UTF-8?q?e2e=E3=83=86=E3=82=B9=E3=83=88=E3=82=92?= =?UTF-8?q?=E6=94=B9=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...3\202\273\343\203\263\343\203\210.spec.ts" | 6 +++--- ...3\202\242\343\203\255\343\202\260.spec.ts" | 4 ++-- ...3\202\242\343\203\255\343\202\260.spec.ts" | 4 ++-- ...3\203\247\343\203\203\343\203\210.spec.ts" | 4 ++-- ...3\202\242\343\203\255\343\202\260.spec.ts" | 4 ++-- ...3\202\214\346\233\277\343\201\210.spec.ts" | 4 ++-- ...3\202\242\343\203\255\343\202\260.spec.ts" | 4 ++-- ...5\200\244\345\244\211\346\233\264.spec.ts" | 4 ++-- .../\351\201\270\346\212\236.spec.ts" | 4 ++-- ...6\225\264\347\265\220\346\236\234.spec.ts" | 4 ++-- ...3\202\242\343\203\255\343\202\260.spec.ts" | 4 ++-- .../browser/\351\237\263\345\243\260.spec.ts" | 4 ++-- ...3\203\241\343\203\274\343\202\277.spec.ts" | 4 ++-- ...5\243\260\350\251\263\347\264\260.spec.ts" | 6 +++--- tests/e2e/navigators.ts | 20 ++++++++++++++----- 15 files changed, 45 insertions(+), 35 deletions(-) diff --git "a/tests/e2e/browser/\343\202\242\343\202\257\343\202\273\343\203\263\343\203\210.spec.ts" "b/tests/e2e/browser/\343\202\242\343\202\257\343\202\273\343\203\263\343\203\210.spec.ts" index 02a611fee7..d355c72191 100644 --- "a/tests/e2e/browser/\343\202\242\343\202\257\343\202\273\343\203\263\343\203\210.spec.ts" +++ "b/tests/e2e/browser/\343\202\242\343\202\257\343\202\273\343\203\263\343\203\210.spec.ts" @@ -1,11 +1,11 @@ import { test, expect } from "@playwright/test"; -import { gotoHome, navigateToMain } from "../navigators"; +import { gotoHome, navigateToTalk, navigateToSong } from "../navigators"; test.beforeEach(gotoHome); test("アクセント分割したらアクセント区間が増える", async ({ page }) => { - await navigateToMain(page); + await navigateToSong(page); await expect(page.locator(".audio-cell").first()).toBeVisible(); await page.locator(".audio-cell input").first().fill("こんにちは"); await page.locator(".audio-cell input").first().press("Enter"); @@ -19,7 +19,7 @@ test("アクセント分割したらアクセント区間が増える", async ({ test("アクセントの読み部分をクリックすると読みを変更できる", async ({ page, }) => { - await navigateToMain(page); + await navigateToTalk(page); await page.getByRole("textbox", { name: "1行目" }).click(); await page.getByRole("textbox", { name: "1行目" }).fill("テストです"); diff --git "a/tests/e2e/browser/\343\202\242\343\203\203\343\203\227\343\203\207\343\203\274\343\203\210\351\200\232\347\237\245\343\203\200\343\202\244\343\202\242\343\203\255\343\202\260.spec.ts" "b/tests/e2e/browser/\343\202\242\343\203\203\343\203\227\343\203\207\343\203\274\343\203\210\351\200\232\347\237\245\343\203\200\343\202\244\343\202\242\343\203\255\343\202\260.spec.ts" index e36c0276c8..8ac81ebe5c 100644 --- "a/tests/e2e/browser/\343\202\242\343\203\203\343\203\227\343\203\207\343\203\274\343\203\210\351\200\232\347\237\245\343\203\200\343\202\244\343\202\242\343\203\255\343\202\260.spec.ts" +++ "b/tests/e2e/browser/\343\202\242\343\203\203\343\203\227\343\203\207\343\203\274\343\203\210\351\200\232\347\237\245\343\203\200\343\202\244\343\202\242\343\203\255\343\202\260.spec.ts" @@ -1,7 +1,7 @@ import { test, expect } from "@playwright/test"; import dotenv from "dotenv"; import semver from "semver"; -import { navigateToMain, gotoHome } from "../navigators"; +import { navigateToTalk, gotoHome } from "../navigators"; import { getNewestQuasarDialog } from "../locators"; import { UpdateInfo } from "@/type/preload"; import { assertNonNullable } from "@/type/utility"; @@ -39,7 +39,7 @@ test.beforeEach(async ({ page }) => { test.beforeEach(async ({ page }) => { await gotoHome({ page }); - await navigateToMain(page); + await navigateToTalk(page); await page.waitForTimeout(100); }); diff --git "a/tests/e2e/browser/\343\202\255\343\203\243\343\203\251\343\202\257\343\202\277\343\203\274\344\270\246\343\201\263\346\233\277\343\201\210\343\203\200\343\202\244\343\202\242\343\203\255\343\202\260.spec.ts" "b/tests/e2e/browser/\343\202\255\343\203\243\343\203\251\343\202\257\343\202\277\343\203\274\344\270\246\343\201\263\346\233\277\343\201\210\343\203\200\343\202\244\343\202\242\343\203\255\343\202\260.spec.ts" index 123421fd68..8ac4c79ed0 100644 --- "a/tests/e2e/browser/\343\202\255\343\203\243\343\203\251\343\202\257\343\202\277\343\203\274\344\270\246\343\201\263\346\233\277\343\201\210\343\203\200\343\202\244\343\202\242\343\203\255\343\202\260.spec.ts" +++ "b/tests/e2e/browser/\343\202\255\343\203\243\343\203\251\343\202\257\343\202\277\343\203\274\344\270\246\343\201\263\346\233\277\343\201\210\343\203\200\343\202\244\343\202\242\343\203\255\343\202\260.spec.ts" @@ -1,13 +1,13 @@ import { test, expect } from "@playwright/test"; -import { gotoHome, navigateToMain } from "../navigators"; +import { gotoHome, navigateToTalk } from "../navigators"; test.beforeEach(gotoHome); test("「設定」→「キャラクター並び替え・視聴」で「設定 / キャラクター並び替え・視聴」ページが表示される", async ({ page, }) => { - await navigateToMain(page); + await navigateToTalk(page); await page.getByText("設定").click(); await page.waitForTimeout(100); await page.getByText("キャラクター並び替え・試聴").click(); diff --git "a/tests/e2e/browser/\343\202\271\343\202\257\343\203\252\343\203\274\343\203\263\343\202\267\343\203\247\343\203\203\343\203\210.spec.ts" "b/tests/e2e/browser/\343\202\271\343\202\257\343\203\252\343\203\274\343\203\263\343\202\267\343\203\247\343\203\203\343\203\210.spec.ts" index 37196f334a..ca322d7570 100644 --- "a/tests/e2e/browser/\343\202\271\343\202\257\343\203\252\343\203\274\343\203\263\343\202\267\343\203\247\343\203\203\343\203\210.spec.ts" +++ "b/tests/e2e/browser/\343\202\271\343\202\257\343\203\252\343\203\274\343\203\263\343\202\267\343\203\247\343\203\203\343\203\210.spec.ts" @@ -1,11 +1,11 @@ import { test, expect } from "@playwright/test"; -import { gotoHome, navigateToMain } from "../navigators"; +import { gotoHome, navigateToTalk } from "../navigators"; test.beforeEach(gotoHome); test("メイン画面の表示", async ({ page }) => { test.skip(process.platform !== "win32", "Windows以外のためスキップします"); - await navigateToMain(page); + await navigateToTalk(page); // トーク画面の表示 while (true) { diff --git "a/tests/e2e/browser/\343\203\204\343\203\274\343\203\253\343\203\220\343\203\274\343\202\253\343\202\271\343\202\277\343\203\236\343\202\244\343\202\272\343\203\200\343\202\244\343\202\242\343\203\255\343\202\260.spec.ts" "b/tests/e2e/browser/\343\203\204\343\203\274\343\203\253\343\203\220\343\203\274\343\202\253\343\202\271\343\202\277\343\203\236\343\202\244\343\202\272\343\203\200\343\202\244\343\202\242\343\203\255\343\202\260.spec.ts" index 45abbd9e49..28d2dab4f3 100644 --- "a/tests/e2e/browser/\343\203\204\343\203\274\343\203\253\343\203\220\343\203\274\343\202\253\343\202\271\343\202\277\343\203\236\343\202\244\343\202\272\343\203\200\343\202\244\343\202\242\343\203\255\343\202\260.spec.ts" +++ "b/tests/e2e/browser/\343\203\204\343\203\274\343\203\253\343\203\220\343\203\274\343\202\253\343\202\271\343\202\277\343\203\236\343\202\244\343\202\272\343\203\200\343\202\244\343\202\242\343\203\255\343\202\260.spec.ts" @@ -1,6 +1,6 @@ import { test, expect } from "@playwright/test"; -import { gotoHome, navigateToMain } from "../navigators"; +import { gotoHome, navigateToTalk } from "../navigators"; import { getNewestQuasarDialog, getQuasarMenu } from "../locators"; test.beforeEach(gotoHome); @@ -8,7 +8,7 @@ test.beforeEach(gotoHome); test("ツールバーのカスタマイズでボタンを追加でき、デフォルトに戻すこともできる", async ({ page, }) => { - await navigateToMain(page); + await navigateToTalk(page); // 全部書き出しボタンはデフォルトでないことを確認 expect( await page diff --git "a/tests/e2e/browser/\343\203\206\343\202\255\343\202\271\343\203\210\350\277\275\345\212\240\343\203\273\345\211\212\351\231\244\343\203\273\345\205\245\343\202\214\346\233\277\343\201\210.spec.ts" "b/tests/e2e/browser/\343\203\206\343\202\255\343\202\271\343\203\210\350\277\275\345\212\240\343\203\273\345\211\212\351\231\244\343\203\273\345\205\245\343\202\214\346\233\277\343\201\210.spec.ts" index 10f7043829..f46233badb 100644 --- "a/tests/e2e/browser/\343\203\206\343\202\255\343\202\271\343\203\210\350\277\275\345\212\240\343\203\273\345\211\212\351\231\244\343\203\273\345\205\245\343\202\214\346\233\277\343\201\210.spec.ts" +++ "b/tests/e2e/browser/\343\203\206\343\202\255\343\202\271\343\203\210\350\277\275\345\212\240\343\203\273\345\211\212\351\231\244\343\203\273\345\205\245\343\202\214\346\233\277\343\201\210.spec.ts" @@ -1,6 +1,6 @@ import { test, expect, Locator, Page } from "@playwright/test"; -import { gotoHome, navigateToMain } from "../navigators"; +import { gotoHome, navigateToSong } from "../navigators"; test.beforeEach(gotoHome); @@ -27,7 +27,7 @@ async function getCenter(locator: Locator) { test("テキストの追加・入れ替え・削除", async ({ page }) => { // デフォルトでaudioCellは一つなのを確認 - await navigateToMain(page); + await navigateToSong(page); await expect( page.getByRole("button").filter({ hasText: "add" }), ).toBeVisible(); diff --git "a/tests/e2e/browser/\343\203\207\343\203\225\343\202\251\343\203\253\343\203\210\343\202\271\343\202\277\343\202\244\343\203\253\343\203\200\343\202\244\343\202\242\343\203\255\343\202\260.spec.ts" "b/tests/e2e/browser/\343\203\207\343\203\225\343\202\251\343\203\253\343\203\210\343\202\271\343\202\277\343\202\244\343\203\253\343\203\200\343\202\244\343\202\242\343\203\255\343\202\260.spec.ts" index 8af7d3ed7d..f65f705116 100644 --- "a/tests/e2e/browser/\343\203\207\343\203\225\343\202\251\343\203\253\343\203\210\343\202\271\343\202\277\343\202\244\343\203\253\343\203\200\343\202\244\343\202\242\343\203\255\343\202\260.spec.ts" +++ "b/tests/e2e/browser/\343\203\207\343\203\225\343\202\251\343\203\253\343\203\210\343\202\271\343\202\277\343\202\244\343\203\253\343\203\200\343\202\244\343\202\242\343\203\255\343\202\260.spec.ts" @@ -1,13 +1,13 @@ import { test, expect } from "@playwright/test"; -import { gotoHome, navigateToMain } from "../navigators"; +import { gotoHome, navigateToTalk } from "../navigators"; test.beforeEach(gotoHome); test("「設定」→「デフォルトスタイル」で「設定 / デフォルトスタイル・試聴」ダイアログが表示される", async ({ page, }) => { - await navigateToMain(page); + await navigateToTalk(page); await page.getByRole("button", { name: "設定" }).click(); await page.getByText("デフォルトスタイル").click(); await expect(page.getByText("設定 / デフォルトスタイル・試聴")).toBeVisible(); diff --git "a/tests/e2e/browser/\350\244\207\346\225\260\351\201\270\346\212\236/\345\200\244\345\244\211\346\233\264.spec.ts" "b/tests/e2e/browser/\350\244\207\346\225\260\351\201\270\346\212\236/\345\200\244\345\244\211\346\233\264.spec.ts" index a79efcf022..2620d8c31d 100644 --- "a/tests/e2e/browser/\350\244\207\346\225\260\351\201\270\346\212\236/\345\200\244\345\244\211\346\233\264.spec.ts" +++ "b/tests/e2e/browser/\350\244\207\346\225\260\351\201\270\346\212\236/\345\200\244\345\244\211\346\233\264.spec.ts" @@ -1,5 +1,5 @@ import { test, expect, Page } from "@playwright/test"; -import { toggleSetting, navigateToMain, gotoHome } from "../../navigators"; +import { toggleSetting, navigateToTalk, gotoHome } from "../../navigators"; import { addAudioCells } from "./utils"; /* @@ -70,7 +70,7 @@ async function getAudioInfoParameters( test.beforeEach(async ({ page }) => { await gotoHome({ page }); - await navigateToMain(page); + await navigateToTalk(page); await page.waitForTimeout(100); await toggleSetting(page, "複数選択"); diff --git "a/tests/e2e/browser/\350\244\207\346\225\260\351\201\270\346\212\236/\351\201\270\346\212\236.spec.ts" "b/tests/e2e/browser/\350\244\207\346\225\260\351\201\270\346\212\236/\351\201\270\346\212\236.spec.ts" index acfed4c3df..d8191cfc50 100644 --- "a/tests/e2e/browser/\350\244\207\346\225\260\351\201\270\346\212\236/\351\201\270\346\212\236.spec.ts" +++ "b/tests/e2e/browser/\350\244\207\346\225\260\351\201\270\346\212\236/\351\201\270\346\212\236.spec.ts" @@ -1,11 +1,11 @@ import { test, expect, Page } from "@playwright/test"; -import { toggleSetting, navigateToMain, gotoHome } from "../../navigators"; +import { toggleSetting, navigateToTalk, gotoHome } from "../../navigators"; import { ctrlLike, addAudioCells } from "./utils"; test.beforeEach(async ({ page }) => { await gotoHome({ page }); - await navigateToMain(page); + await navigateToTalk(page); await page.waitForTimeout(100); await toggleSetting(page, "複数選択"); diff --git "a/tests/e2e/browser/\350\252\277\346\225\264\347\265\220\346\236\234.spec.ts" "b/tests/e2e/browser/\350\252\277\346\225\264\347\265\220\346\236\234.spec.ts" index f31e9bf26f..71013891c7 100644 --- "a/tests/e2e/browser/\350\252\277\346\225\264\347\265\220\346\236\234.spec.ts" +++ "b/tests/e2e/browser/\350\252\277\346\225\264\347\265\220\346\236\234.spec.ts" @@ -1,5 +1,5 @@ import { test, expect, Page } from "@playwright/test"; -import { toggleSetting, navigateToMain, gotoHome } from "../navigators"; +import { toggleSetting, navigateToTalk, gotoHome } from "../navigators"; test.beforeEach(gotoHome); @@ -26,7 +26,7 @@ async function getSliderValues(page: Page) { } test("実験的機能：調整結果の保持", async ({ page }) => { - await navigateToMain(page); + await navigateToTalk(page); await toggleSetting(page, "調整結果の保持"); await page.waitForTimeout(100); diff --git "a/tests/e2e/browser/\350\276\236\346\233\270\343\203\200\343\202\244\343\202\242\343\203\255\343\202\260.spec.ts" "b/tests/e2e/browser/\350\276\236\346\233\270\343\203\200\343\202\244\343\202\242\343\203\255\343\202\260.spec.ts" index bfd2e9b0db..07f580544b 100644 --- "a/tests/e2e/browser/\350\276\236\346\233\270\343\203\200\343\202\244\343\202\242\343\203\255\343\202\260.spec.ts" +++ "b/tests/e2e/browser/\350\276\236\346\233\270\343\203\200\343\202\244\343\202\242\343\203\255\343\202\260.spec.ts" @@ -1,5 +1,5 @@ import { test, expect, Page, Locator } from "@playwright/test"; -import { gotoHome, navigateToMain } from "../navigators"; +import { gotoHome, navigateToTalk } from "../navigators"; import { getNewestQuasarDialog } from "../locators"; test.beforeEach(gotoHome); @@ -50,7 +50,7 @@ async function validateInputTag( test("「設定」→「読み方＆アクセント辞書」で「読み方＆アクセント辞書」ページが表示される", async ({ page, }) => { - await navigateToMain(page); + await navigateToTalk(page); const targetString = "あいうえお"; diff --git "a/tests/e2e/browser/\351\237\263\345\243\260.spec.ts" "b/tests/e2e/browser/\351\237\263\345\243\260.spec.ts" index cc2bb5c18b..4fbaf6cb60 100644 --- "a/tests/e2e/browser/\351\237\263\345\243\260.spec.ts" +++ "b/tests/e2e/browser/\351\237\263\345\243\260.spec.ts" @@ -1,13 +1,13 @@ import { test } from "@playwright/test"; -import { gotoHome, navigateToMain } from "../navigators"; +import { gotoHome, navigateToTalk } from "../navigators"; test.beforeEach(gotoHome); test("テキストを入力→アクセントを変更→音声合成→再生ができる", async ({ page, }) => { - await navigateToMain(page); + await navigateToTalk(page); await page.getByRole("textbox", { name: "1行目" }).click(); await page.getByRole("textbox", { name: "1行目" }).fill("テストです"); diff --git "a/tests/e2e/browser/\351\237\263\345\243\260\343\203\221\343\203\251\343\203\241\343\203\274\343\202\277.spec.ts" "b/tests/e2e/browser/\351\237\263\345\243\260\343\203\221\343\203\251\343\203\241\343\203\274\343\202\277.spec.ts" index 01145b34a5..37f40e13f1 100644 --- "a/tests/e2e/browser/\351\237\263\345\243\260\343\203\221\343\203\251\343\203\241\343\203\274\343\202\277.spec.ts" +++ "b/tests/e2e/browser/\351\237\263\345\243\260\343\203\221\343\203\251\343\203\241\343\203\274\343\202\277.spec.ts" @@ -1,6 +1,6 @@ import { test, expect, Locator } from "@playwright/test"; -import { gotoHome, navigateToMain, toggleSetting } from "../navigators"; +import { gotoHome, navigateToTalk, toggleSetting } from "../navigators"; test.beforeEach(gotoHome); @@ -10,7 +10,7 @@ async function validateValue(locator: Locator, expectedValue: string) { } test("音声パラメータ引き継ぎの設定", async ({ page }) => { - await navigateToMain(page); + await navigateToTalk(page); await page.waitForTimeout(100); await page.locator(".audio-cell input").first().press("Enter"); await page.waitForTimeout(100); diff --git "a/tests/e2e/browser/\351\237\263\345\243\260\350\251\263\347\264\260.spec.ts" "b/tests/e2e/browser/\351\237\263\345\243\260\350\251\263\347\264\260.spec.ts" index 57b873104b..31127ab863 100644 --- "a/tests/e2e/browser/\351\237\263\345\243\260\350\251\263\347\264\260.spec.ts" +++ "b/tests/e2e/browser/\351\237\263\345\243\260\350\251\263\347\264\260.spec.ts" @@ -1,6 +1,6 @@ import { test, expect, Page } from "@playwright/test"; -import { gotoHome, navigateToMain } from "../navigators"; +import { gotoHome, navigateToTalk } from "../navigators"; test.beforeEach(gotoHome); @@ -9,7 +9,7 @@ function getNthAccentPhraseInput({ page, n }: { page: Page; n: number }) { } test("単体アクセント句の読み変更", async ({ page }) => { - await navigateToMain(page); + await navigateToTalk(page); await page.waitForTimeout(100); const textField = page.getByRole("textbox", { name: "1行目" }); @@ -51,7 +51,7 @@ test("単体アクセント句の読み変更", async ({ page }) => { }); test("詳細調整欄のコンテキストメニュー", async ({ page }) => { - await navigateToMain(page); + await navigateToTalk(page); await page.waitForTimeout(100); // 削除 diff --git a/tests/e2e/navigators.ts b/tests/e2e/navigators.ts index 20a0fbbe1a..f204278c45 100644 --- a/tests/e2e/navigators.ts +++ b/tests/e2e/navigators.ts @@ -43,7 +43,7 @@ export async function toggleSetting(page: Page, settingName: string) { export async function navigateToHelpDialog(page: Page): Promise { return await test.step("ヘルプダイアログの表示まで移動", async () => { - await navigateToMain(page); + await navigateToTalk(page); await page.waitForTimeout(100); await page.getByRole("button", { name: "ヘルプ" }).click(); return getNewestQuasarDialog(page); @@ -52,7 +52,7 @@ export async function navigateToHelpDialog(page: Page): Promise { export async function navigateToSettingDialog(page: Page): Promise { return await test.step("設定ダイアログの表示まで移動", async () => { - await navigateToMain(page); + await navigateToTalk(page); await page.waitForTimeout(100); await page.getByRole("button", { name: "設定" }).click(); await getQuasarMenu(page, "オプション").click(); @@ -60,11 +60,21 @@ export async function navigateToSettingDialog(page: Page): Promise { }); } +export async function navigateToTalk(page: Page) { + await navigateToMain(page); + + await test.step("トーク画面に移動", async () => { + await page.getByRole("button", { name: "トーク" }).click(); + await page.waitForTimeout(100); + }); +} + export async function navigateToSong(page: Page) { + await navigateToMain(page); + await test.step("ソング画面に移動", async () => { - await navigateToMain(page); - await expect(page.getByText("ソング")).toBeVisible(); - await page.getByText("ソング").click(); + await page.getByRole("button", { name: "ソング" }).click(); + await page.waitForTimeout(100); // 見やすいようにスナップを1/8に変更 await page.getByLabel("スナップ").click();