From 332bd9a3dd6a0570c35ed2b8ee178cf3a4dab1ab Mon Sep 17 00:00:00 2001 From: hided62 Date: Sat, 5 Sep 2026 13:21:08 +0000 Subject: [PATCH] =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EC=9E=A5=EC=88=98=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=EC=97=90=EC=84=9C=20=EC=83=81=EC=84=B8=20?= =?UTF-8?q?=ED=86=B5=EA=B3=84=EC=99=80=20=EC=88=99=EB=A0=A8=EB=8F=84=20?= =?UTF-8?q?=ED=91=9C=EC=8B=9C=EB=A5=BC=20=EC=A0=9C=EC=99=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/game-frontend/e2e/inGameMenus.spec.ts | 5 +++-- app/game-frontend/e2e/mainNavigation.spec.ts | 14 ++++++++++---- .../components/main/GeneralInformationPanel.vue | 4 +++- app/game-frontend/src/views/MainView.vue | 2 ++ 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/app/game-frontend/e2e/inGameMenus.spec.ts b/app/game-frontend/e2e/inGameMenus.spec.ts index d17182d8..9d3a4204 100644 --- a/app/game-frontend/e2e/inGameMenus.spec.ts +++ b/app/game-frontend/e2e/inGameMenus.spec.ts @@ -38,6 +38,7 @@ const readGeneralPanelImages = async (panel: Locator) => label: image.getAttribute('aria-label'), width: rect.width, height: rect.height, + src: image instanceof HTMLImageElement ? image.src : null, backgroundImage: style.backgroundImage, backgroundSize: style.backgroundSize, pointerEvents: style.pointerEvents, @@ -1358,7 +1359,7 @@ test('내 정보&설정 keeps desktop density and becomes a 390px horizontal-ide { width: 64, height: 64 }, { width: 64, height: 64 }, ]); - expect(myPageImages[0]?.backgroundImage).toContain('/icons/default.jpg'); + expect(myPageImages[0]?.src).toContain('/icons/default.jpg'); expect(myPageImages[1]?.backgroundImage).toContain('/game/crewtype1.png'); await expect(page.locator('.general-table')).toContainText('병종보병'); await expect(page.locator('.general-table')).toContainText('삭턴6 턴'); @@ -2370,7 +2371,7 @@ test('감찰부 keeps the selector interaction and shows the permission error pa ]); const battleImages = await readGeneralPanelImages(page.locator('.battle-general-card')); expect(battleImages).toHaveLength(2); - expect(battleImages[0]?.backgroundImage).toContain('/icons/default.jpg'); + expect(battleImages[0]?.src).toContain('/icons/default.jpg'); expect(battleImages[1]?.backgroundImage).toContain('/game/crewtype1.png'); await expect(page.locator('.battle-general-card [role="progressbar"]')).toHaveCount(14); await expect(page.locator('.battle-general-card [aria-label*="1,275,975 (EX+)"]')).toHaveCount(5); diff --git a/app/game-frontend/e2e/mainNavigation.spec.ts b/app/game-frontend/e2e/mainNavigation.spec.ts index d1fccb58..f3a9b0e4 100644 --- a/app/game-frontend/e2e/mainNavigation.spec.ts +++ b/app/game-frontend/e2e/mainNavigation.spec.ts @@ -2918,9 +2918,11 @@ test('main cards and command input stay inside their Ref-sized grid slots', asyn await expect(statBars).toHaveCount(3); await expect(experienceBar).toHaveCount(1); await expect(page.locator('[data-main-target="general"] [data-general-information-panel]')).toHaveCount(1); - await expect(page.locator('[data-main-target="general"] [data-general-battle-summary]')).toHaveCount(1); - await expect(page.locator('[data-main-target="general"] [data-dex-progress]')).toHaveCount(5); - await expect(page.locator('[data-main-target="general"] [role="progressbar"]')).toHaveCount(14); + await expect(page.locator('[data-main-target="general"] [role="progressbar"]')).toHaveCount(4); + await expect(page.locator('[data-main-target="general"] .troop-label')).toHaveText('부대'); + await expect(page.locator('[data-main-target="general"] .penalty-label')).toHaveText('벌점'); + await expect(page.locator('[data-main-target="general"] [data-general-battle-summary]')).toHaveCount(0); + await expect(page.locator('[data-main-target="general"] [data-dex-progress]')).toHaveCount(0); const nationCard = page.locator('[data-main-target="nation"] [data-nation-basic-card]'); await expect(nationCard.locator('.head')).toHaveCount(17); @@ -3290,7 +3292,11 @@ test('main cards and command input stay inside their Ref-sized grid slots', asyn await page.locator('[data-main-target="commands"] .bottom-actions').getByRole('button', { name: '펼치기' }).click(); expect(await page.evaluate(() => document.documentElement.scrollWidth)).toBeLessThanOrEqual(500); await expect(page.locator('[data-main-target="city"] [role="progressbar"]')).toHaveCount(8); - await expect(page.locator('[data-main-target="general"] [role="progressbar"]')).toHaveCount(14); + await expect(page.locator('[data-main-target="general"] [role="progressbar"]')).toHaveCount(4); + await expect(page.locator('[data-main-target="general"] .troop-label')).toHaveText('부대'); + await expect(page.locator('[data-main-target="general"] .penalty-label')).toHaveText('벌점'); + await expect(page.locator('[data-main-target="general"] [data-general-battle-summary]')).toHaveCount(0); + await expect(page.locator('[data-main-target="general"] [data-dex-progress]')).toHaveCount(0); const mobileNationCard = page.locator('[data-main-target="nation"] [data-nation-basic-card]'); expect(await mobileNationCard.evaluate((element) => element.getBoundingClientRect().height)).toBe(193); expect(await mobileNationCard.evaluate((element) => element.scrollWidth - element.clientWidth)).toBeLessThanOrEqual( diff --git a/app/game-frontend/src/components/main/GeneralInformationPanel.vue b/app/game-frontend/src/components/main/GeneralInformationPanel.vue index 1e58c4e1..6517f5ad 100644 --- a/app/game-frontend/src/components/main/GeneralInformationPanel.vue +++ b/app/game-frontend/src/components/main/GeneralInformationPanel.vue @@ -18,6 +18,7 @@ const props = withDefaults( general: GeneralInformationPanelData | null; summary: GeneralBattleSummaryData | null; loading: boolean; + showDetails?: boolean; nationColor?: string | null; defenceText?: string | null; killTurn?: number | null; @@ -26,6 +27,7 @@ const props = withDefaults( penaltyText?: string | number | null; }>(), { + showDetails: true, nationColor: '#173d27', defenceText: null, killTurn: null, @@ -48,7 +50,7 @@ const props = withDefaults( :troop-text="props.troopText" :penalty-text="props.penaltyText" > -