Skip to content
Merged
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
2 changes: 1 addition & 1 deletion .woodpecker.star
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ docker_repo_slug = "opencloudeu/web"

ALPINE_GIT = "alpine/git:latest"
APACHE_TIKA = "apache/tika:2.8.0.0"
COLLABORA_CODE = "collabora/code:25.04.7.3.1"
COLLABORA_CODE = "collabora/code:25.04.8.2.1"
KEYCLOAK = "quay.io/keycloak/keycloak:25.0.0"
MINIO_MC = "minio/mc:RELEASE.2021-10-07T04-19-58Z"
OC_CI_BAZEL_BUILDIFIER = "quay.io/opencloudeu/bazel-buildifier-ci:latest"
Expand Down
5 changes: 3 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,7 @@ services:
container_name: web_tika_service
depends_on:
- tika
command:
- 'wait-for -it tika:9998 -t 300'
command: 'tika:9998'
networks:
- traefik

Expand All @@ -300,6 +299,8 @@ services:
ports:
- 9998:9998
restart: unless-stopped
networks:
- traefik

radicale:
image: ${RADICALE_DOCKER_IMAGE:-opencloudeu/radicale}:${RADICALE_DOCKER_TAG:-latest}
Expand Down
8 changes: 4 additions & 4 deletions tests/e2e/cucumber/features/app-provider/lock.feature
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ Feature: lock
Then "Brian" should see the content "some content" in editor "Collabora"

# file-locked
# And "Alice" should get "file-locked" SSE event
# And for "Alice" file "test.odt" should be locked
And "Alice" should get "file-locked" SSE event
And for "Alice" file "test.odt" should be locked

# checking that user cannot 'move', 'rename', 'delete' locked file
And "Alice" should not be able to edit file "test.odt"
Expand All @@ -45,8 +45,8 @@ Feature: lock

# file-unlocked
When "Brian" closes the file viewer
# Then "Alice" should get "file-unlocked" SSE event
# And for "Alice" file "test.odt" should not be locked
Then "Alice" should get "file-unlocked" SSE event
And for "Alice" file "test.odt" should not be locked
And "Alice" should be able to manage share of a file "test.odt" for user "Brian"

And "Brian" logs out
Expand Down
7 changes: 5 additions & 2 deletions tests/e2e/support/objects/app-files/resource/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ const textEditorContainer = '#text-editor-container div.md-editor-content'
// Collabora
const collaboraDocPermissionModeSelector = '#permissionmode-container'
const collaboraDocTextAreaSelector = '#clipboard-area'
const collaboraCanvasEditorSelector = '.leaflet-layer'
const collaboraCanvasEditorSelector = '#document-canvas'
// OnlyOffice
const onlyOfficeInnerFrameSelector = '[name="frameEditor"]'
const onlyOfficeSaveButtonSelector = '#slot-btn-dt-save > button'
Expand Down Expand Up @@ -1181,7 +1181,10 @@ export const renameResource = async (args: renameResourceArgs): Promise<void> =>

await page.locator(util.format(resourceNameSelector, resourceBase)).click({ button: 'right' })
await page.locator(util.format(filesContextMenuAction, 'rename')).click()
await page.locator(fileRenameInput).fill(newName)
const resourceInput = page.locator(fileRenameInput)
// Clear the field and fill in the name
await resourceInput.clear()
await resourceInput.fill(newName)
await Promise.all([
page.waitForResponse(
(resp) =>
Expand Down