From 8540cfac60f0b3f4257b6c5aefae40b2f14f0308 Mon Sep 17 00:00:00 2001 From: Swikriti Tripathi Date: Wed, 7 Dec 2022 13:42:38 +0545 Subject: [PATCH 1/2] Skip private link related tests on ocis --- .../expected-failures-with-ocis-server-ocis-storage.md | 7 ------- .../features/webUIFilesCopy/copyPrivateLinks.feature | 2 +- .../webUIPrivateLinks/accessingPrivateLinks.feature | 5 +++-- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md b/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md index c2a5525384e..2628f5a2057 100644 --- a/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md +++ b/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md @@ -33,19 +33,12 @@ Other free text and markdown formatting can be used elsewhere in the document if ### [when sharer renames the shared resource, sharee get the updated name](https://github.com/owncloud/ocis/issues/2256) - [webUIRenameFiles/renameFiles.feature:226](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRenameFiles/renameFiles.feature#L226) -### [Scoped links](https://github.com/owncloud/web/issues/6844) -- [webUIFilesCopy/copyPrivateLinks.feature:20](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesCopy/copyPrivateLinks.feature#L20) -- [webUIFilesCopy/copyPrivateLinks.feature:21](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesCopy/copyPrivateLinks.feature#L21) - ### [Cannot create users with special characters](https://github.com/owncloud/ocis/issues/1417) - [webUISharingAutocompletion/shareAutocompletionSpecialChars.feature:37](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature#L37) - [webUISharingAutocompletion/shareAutocompletionSpecialChars.feature:38](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature#L38) - [webUISharingAutocompletion/shareAutocompletionSpecialChars.feature:39](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature#L39) - [webUISharingAutocompletion/shareAutocompletionSpecialChars.feature:36](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletionSpecialChars.feature#L36) -### [webUI-Private-Links](https://github.com/owncloud/web/issues/6844) -- [webUIPrivateLinks/accessingPrivateLinks.feature:9](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature#L9) -- [webUIPrivateLinks/accessingPrivateLinks.feature:23](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature#L23) ### [Share additional info](https://github.com/owncloud/ocis/issues/1253) - [webUISharingInternalUsersShareWithPage/shareWithUsers.feature:138](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature#L138) diff --git a/tests/acceptance/features/webUIFilesCopy/copyPrivateLinks.feature b/tests/acceptance/features/webUIFilesCopy/copyPrivateLinks.feature index db29b63acfa..b12aced2acf 100644 --- a/tests/acceptance/features/webUIFilesCopy/copyPrivateLinks.feature +++ b/tests/acceptance/features/webUIFilesCopy/copyPrivateLinks.feature @@ -1,4 +1,4 @@ -@ocis-web-issue-52 +@issue-6844 Feature: copy path as a permanent link As a user I want to copy the permanent link of a resource diff --git a/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature b/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature index f125e4b08a5..f3df2954fe7 100644 --- a/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature +++ b/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature @@ -1,3 +1,4 @@ +@skipOnOCIS @issue-6844 Feature: Access private link As a user I want to directly access item which I have received private link for @@ -5,14 +6,14 @@ Feature: Access private link Given user "Alice" has been created with default attributes and without skeleton files in the server And user "Alice" has uploaded file "lorem.txt" to "lorem.txt" in the server - @smokeTest @ocisSmokeTest + @smokeTest Scenario: Copy and access private link Given user "Alice" has logged in using the webUI When the user copies the private link of the file "lorem.txt" using the webUI And the user navigates to the copied private link using the webUI Then file "lorem.txt" should be listed on the webUI - @smokeTest @ocisSmokeTest + @smokeTest Scenario: Access private link before authorisation When an anonymous user tries to navigate to the private link created by user "Alice" for file "lorem.txt" Then the user should be redirected to the IdP login page From bc7ea9cb0b8a12fe9af2c200416e1247dfe39989 Mon Sep 17 00:00:00 2001 From: Swikriti Tripathi Date: Wed, 7 Dec 2022 14:43:49 +0545 Subject: [PATCH 2/2] add notToImplementOnOCIS tag instead of skip on --- .../acceptance/features/webUIFilesCopy/copyPrivateLinks.feature | 2 +- .../features/webUIPrivateLinks/accessingPrivateLinks.feature | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/acceptance/features/webUIFilesCopy/copyPrivateLinks.feature b/tests/acceptance/features/webUIFilesCopy/copyPrivateLinks.feature index b12aced2acf..9e9a1eb98cc 100644 --- a/tests/acceptance/features/webUIFilesCopy/copyPrivateLinks.feature +++ b/tests/acceptance/features/webUIFilesCopy/copyPrivateLinks.feature @@ -1,4 +1,4 @@ -@issue-6844 +@notToImplementOnOCIS @issue-6844 Feature: copy path as a permanent link As a user I want to copy the permanent link of a resource diff --git a/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature b/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature index f3df2954fe7..074b940c826 100644 --- a/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature +++ b/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature @@ -1,4 +1,4 @@ -@skipOnOCIS @issue-6844 +@notToImplementOnOCIS @issue-6844 Feature: Access private link As a user I want to directly access item which I have received private link for