Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 56 additions & 0 deletions browser_tests/fixtures/components/SidebarTab.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type { Locator, Page } from '@playwright/test'
import { expect } from '@playwright/test'

import type { WorkspaceStore } from '@e2e/types/globals'
import { ConfirmDialog } from '@e2e/fixtures/components/ConfirmDialog'
import { TestIds } from '@e2e/fixtures/selectors'

export class SidebarTab {
Expand Down Expand Up @@ -340,8 +341,12 @@ export class AssetsSidebarTab extends SidebarTab {
// --- Loading ---
public readonly skeletonLoaders: Locator

// --- Delete confirmation ---
public readonly deleteConfirmDialog: ConfirmDialog

constructor(public override readonly page: Page) {
super(page, 'assets')
this.deleteConfirmDialog = new ConfirmDialog(page)
this.generatedTab = page.getByRole('tab', { name: 'Generated' })
this.importedTab = page.getByRole('tab', { name: 'Imported' })
this.emptyStateMessage = page.getByText(
Expand Down Expand Up @@ -422,6 +427,57 @@ export class AssetsSidebarTab extends SidebarTab {
return this.assetCards.filter({ hasText: name })
}

getListViewItemByName(name: string) {
return this.listViewItems.filter({ hasText: name })
}

getSeeMoreOutputsButton(name: string) {
return this.getListViewItemByName(name).getByRole('button', {
name: 'See more outputs'
})
}

/**
* Touch-driven pass over list view, search, output grouping and delete
* confirmation, asserting every control the sequence touches stays fully
* inside the viewport on a phone-sized screen.
*/
async expectTouchControlsUsable({
assetName,
groupedAssetName
}: {
assetName: string
groupedAssetName: string
}) {
await this.open()
await this.openSettingsMenu()
await this.listViewOption.tap()

const listItem = this.getListViewItemByName(assetName)
await expect(listItem).toBeVisible()

await this.searchInput.fill(assetName)
await expect(this.listViewItems).toHaveCount(1)
await this.searchInput.clear()

const groupButton = this.getSeeMoreOutputsButton(assetName)
await expect(groupButton).toBeInViewport({ ratio: 1 })
await groupButton.tap()
await expect(groupButton).toHaveAttribute('aria-expanded', 'true')
await expect(this.getListViewItemByName(groupedAssetName)).toBeVisible()

await this.openSettingsMenu()
await this.gridLargeOption.tap()
await this.waitForAssets()
await this.getAssetCardByName(assetName).tap()
await expect(this.deleteSelectedButton).toBeInViewport({ ratio: 1 })
await this.deleteSelectedButton.tap()
await expect(this.deleteConfirmDialog.delete).toBeInViewport({ ratio: 1 })
await expect(this.deleteConfirmDialog.reject).toBeInViewport({ ratio: 1 })
await this.deleteConfirmDialog.reject.tap()
await expect(this.deleteConfirmDialog.root).toBeHidden()
}

async getFirstGridItemWidth() {
return await this.gridItems.first().evaluate((element) => {
return element.getBoundingClientRect().width
Expand Down
75 changes: 73 additions & 2 deletions browser_tests/tests/sidebar/assetsSidebarTab.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ import {
import { TestIds } from '@e2e/fixtures/selectors'
import { mockViewFiles } from '@e2e/fixtures/utils/viewFileMocks'
import { PropertiesPanelHelper } from '@e2e/tests/propertiesPanel/PropertiesPanelHelper'
import type {
AssetItem,
AssetResponse
} from '@/platform/assets/schemas/assetSchema'
import type {
JobDetail,
RawJobListItem
Expand Down Expand Up @@ -83,7 +87,7 @@ const multiOutputJobDetail: JobDetail = {
}

const previewableCountJob = createRouteMockJob({
id: 'previewable-count-job',
id: '00000000-0000-4000-a000-000000000003',
create_time: routeMockJobTimestamp - 4_000,
execution_start_time: routeMockJobTimestamp - 4_000,
execution_end_time: routeMockJobTimestamp,
Expand Down Expand Up @@ -150,6 +154,53 @@ async function mockInputFiles(page: Page, files: readonly string[]) {
})
}

const mobileAssetNames = ['previewable-count-a.png', 'previewable-count-b.png']

const mobileAssets = mobileAssetNames.map(
(name, index): AssetItem => ({
id: `00000000-0000-4000-b000-00000000000${index}`,
name,
job_id: previewableCountJob.id,
mime_type: 'image/png',
tags: ['output'],
preview_url: `/api/view?filename=${name}&type=output`,
created_at: new Date(
previewableCountJob.create_time - index * 1_000
).toISOString(),
updated_at: new Date(
previewableCountJob.create_time - index * 1_000
).toISOString()
})
)

const mobileAssetsResponse: AssetResponse = {
assets: mobileAssets,
total: mobileAssets.length,
has_more: false
}

const mobileTouchControlNames = {
assetName: 'previewable-count-a',
groupedAssetName: 'previewable-count-b'
}

const mobileListSmokeTest = comfyPageFixture.extend({
page: async ({ page }, use) => {
const jobsRoutes = new JobsRouteMocker(page)
await jobsRoutes.mockJobsQueue([])
await jobsRoutes.mockJobsHistory([previewableCountJob])
await jobsRoutes.mockJobDetail(
previewableCountJob.id,
previewableCountJobDetail
)
await page.route(/\/api\/assets(?:\?.*)?$/, (route) =>
route.fulfill({ json: mobileAssetsResponse })
)
await mockViewFiles(page, viewFiles)
await use(page)
}
})

function isGeneratedAssetVerificationResponse(response: Response): boolean {
const url = new URL(response.url())
return (
Expand Down Expand Up @@ -296,7 +347,7 @@ test.describe('FE-130 assets sidebar route mocks', () => {

await jobsRoutes.mockJobsHistory([previewableCountJob])
await jobsRoutes.mockJobDetail(
'previewable-count-job',
previewableCountJob.id,
previewableCountJobDetail
)

Expand Down Expand Up @@ -339,6 +390,26 @@ test.describe('FE-130 assets sidebar route mocks', () => {
})
})

mobileListSmokeTest.describe('FE-130 assets sidebar route mocks', () => {
mobileListSmokeTest(
'@mobile list, filter, group, and delete controls remain usable',
async ({ comfyPage }) => {
await comfyPage.menu.assetsTab.expectTouchControlsUsable(
mobileTouchControlNames
)
}
)

mobileListSmokeTest(
'@mobile-ios list, filter, group, and delete controls remain usable',
async ({ comfyPage }) => {
await comfyPage.menu.assetsTab.expectTouchControlsUsable(
mobileTouchControlNames
)
}
)
})

bulkInsertionTest.describe(
'Assets sidebar - bulk insert as nodes',
{ tag: ['@vue-nodes', '@ui', '@node', '@widget'] },
Expand Down
Loading