Skip to content

fix-flaky: safari upload test #2417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ScharfViktor merged 1 commit into from
Apr 22, 2026
Merged

fix-flaky: safari upload test #2417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 0 additions & 8 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,3 @@ l10n-read: node_modules
.PHONY: l10n-write
l10n-write: node_modules
make -C packages/web-runtime/l10n translations

.PHONY: generate-qa-activity-report
generate-qa-activity-report: node_modules
@if [ -z "${MONTH}" ] || [ -z "${YEAR}" ]; then \
echo "Please set the MONTH and YEAR environment variables. Usage: make generate-qa-activity-report MONTH=<month> YEAR=<year>"; \
exit 1; \
fi
pnpm exec node generate-qa-activity-report.js --month ${MONTH} --year ${YEAR}
213 changes: 0 additions & 213 deletions generate-qa-activity-report.js
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
"@vue/test-utils": "2.4.6",
"browserslist-to-esbuild": "^2.1.1",
"browserslist-useragent-regexp": "^4.1.3",
"commander": "14.0.3",
"eslint": "10.2.1",
"franc-min": "^6.2.0",
"happy-dom": "20.9.0",
Expand All @@ -74,7 +73,6 @@
"pino": "10.3.1",
"pino-pretty": "13.1.3",
"qs": "^6.15.0",
"simple-git": "3.36.0",
"tailwindcss": "^4.2.2",
"ts-node": "10.9.2",
"tslib": "2.8.1",
Expand Down
46 changes: 0 additions & 46 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions tests/e2e/support/environment/actor/actor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ export class ActorEnvironment extends EventEmitter implements Actor {
if (exception.message.includes('ResizeObserver')) {
return
}
if (
exception.message.includes('access control checks') &&
exception.message.includes('preview=1')
) {
return
}
}
// make the test fail if FAIL_ON_UNCAUGHT_CONSOLE_ERR=true
if (this.options.context.failOnUncaughtConsoleError) {
Expand Down
8 changes: 5 additions & 3 deletions tests/e2e/support/objects/app-files/resource/actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ const onlyOfficeCanvasEditorSelector = '#id_viewer_overlay'
const onlyOfficeCanvasCursorSelector = '#id_target_cursor'
const onlyOfficeInfoDialog = '.alert .info-box'
const onlyOfficeInfoDialogConfirm = `.alert button[result="ok"]`

const fileThumbnail = `//img[@data-test-thumbnail-resource-name="%s"]`
const fileIcon = '#oc-file-details-sidebar .details-icon'
const fileIconPreview = '#oc-file-details-sidebar .details-preview'
Expand All @@ -155,6 +156,7 @@ const openWithButton = '//*[@id="oc-files-context-actions-context"]//span[text()
const tilesSlider = '#tiles-size-slider'
const undoBtn = 'action-handler'
const previewFavoriteButton = '.preview-controls-favorite'
const uploadList = '#upload-list'

export const getResourceLocator = ({
page,
Expand Down Expand Up @@ -637,14 +639,14 @@ const performUpload = async (args: uploadResourceArgs): Promise<void> => {
await clickResource({ page, path: to })
}

await page.locator(addNewResourceButton).click()
const inputSelector = type === 'folder' ? folderUploadInput : fileUploadInput
await expect(page.locator(folderUploadInput)).toBeAttached()

let uploadAction: Promise<void> = page
.locator(inputSelector)
.setInputFiles(resources.map((file) => file.path))

await page.locator(addNewResourceButton).click()
await expect(page.locator(uploadList)).toBeVisible()

if (option) {
await uploadAction

Expand Down