From 05c875b1a0aab83f3195957668cd0567f13c3bbc Mon Sep 17 00:00:00 2001 From: Viktor Scharf Date: Mon, 11 Nov 2024 15:36:36 +0100 Subject: [PATCH] [full-ci]fix thumbnails in federated ocis. enable tests after fixing bugs (#11884) * fix thumbnails in federated ocis. enable tests after fixing bugs * update ocis --- .drone.env | 2 +- docker-compose.yml | 3 -- tests/e2e/cucumber/features/ocm/ocm.feature | 32 +++++++++++++-------- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/.drone.env b/.drone.env index b9b835d832e..fbacd3848e0 100644 --- a/.drone.env +++ b/.drone.env @@ -1,3 +1,3 @@ # The version of OCIS to use in pipelines that test against OCIS -OCIS_COMMITID=75cba423c2bbccaa8b0fdce352dacc498793ff6e +OCIS_COMMITID=4f42e344ea0103687d4220fad7c5e72d51f8dfcc OCIS_BRANCH=master diff --git a/docker-compose.yml b/docker-compose.yml index a5f61fd42d8..ef23fbfeedd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -68,9 +68,6 @@ x-ocis-server: &ocis-service OCM_OCM_INVITE_MANAGER_INSECURE: 'true' OCM_OCM_SHARE_PROVIDER_INSECURE: 'true' OCM_OCM_STORAGE_PROVIDER_INSECURE: 'true' - OCM_DEBUG_ADDR: '127.0.0.1:10281' - OCM_HTTP_ADDR: '127.0.0.1:10280' - OCM_GRPC_ADDR: '127.0.0.1:10282' extra_hosts: - host.docker.internal:${DOCKER_HOST:-host-gateway} diff --git a/tests/e2e/cucumber/features/ocm/ocm.feature b/tests/e2e/cucumber/features/ocm/ocm.feature index cc0f97a8cae..009a03264fd 100644 --- a/tests/e2e/cucumber/features/ocm/ocm.feature +++ b/tests/e2e/cucumber/features/ocm/ocm.feature @@ -49,20 +49,28 @@ Feature: federation management And "Brian" opens the "files" app When "Brian" navigates to the shared with me page - # should be work after fixing https://github.com/owncloud/ocis/issues/10272 - # Then "Brian" should see thumbnail and preview for file "testavatar.jpg" - # And "Brian" should see thumbnail and preview for file "sampleGif.gif" - # When "Brian" opens the following file in mediaviewer - # | resource | - # | testavatar.jpg | - # Then "Brian" is in a media-viewer - # And "Brian" navigates to the next media resource - # When "Brian" closes the file viewer + Then "Brian" should see thumbnail and preview for file "testavatar.jpg" + And "Brian" should see thumbnail and preview for file "sampleGif.gif" + When "Brian" opens the following file in mediaviewer + | resource | + | testavatar.jpg | + Then "Brian" is in a media-viewer + # should be work after fixing https://github.com/owncloud/web/issues/11883 + # And "Brian" navigates to the next media resource + And "Brian" closes the file viewer And "Brian" downloads the following resources using the sidebar panel | resource | type | | folderPublic | folder | - # should be work after fixing https://github.com/owncloud/ocis/issues/11821 - # | sampleGif.gif | file | - # | testavatar.jpg | file | + | sampleGif.gif | file | + | testavatar.jpg | file | + When "Brian" uploads the following resources + | resource | to | + | testavatar.png | folderPublic | + And "Brian" opens folder "folderPublic" + Then "Brian" should see thumbnail and preview for file "testavatar.png" + When "Brian" opens the following file in mediaviewer + | resource | + | testavatar.png | + Then "Brian" is in a media-viewer And "Brian" logs out