From 4ae546bc2038eb532c649b78468c537dd6f2f06c Mon Sep 17 00:00:00 2001 From: Swikriti Tripathi Date: Tue, 24 May 2022 14:07:36 +0545 Subject: [PATCH] Fix tests and update expected to fail file --- ...ailures-Iphone-oc10-server-oauth2-login.md | 4 --- ...lures-XGA-with-oc10-server-oauth2-login.md | 4 --- ...er-oauth2-login-and-web-integration-app.md | 4 --- ...-failures-with-oc10-server-oauth2-login.md | 6 +---- ...-failures-with-ocis-server-ocis-storage.md | 4 +-- .../acceptShares.feature | 17 ++++++++++++ .../notificationLink.feature | 26 ------------------- .../notificationLink.feature | 24 ----------------- 8 files changed, 20 insertions(+), 69 deletions(-) delete mode 100644 tests/acceptance/features/webUISharingNotifications/notificationLink.feature delete mode 100644 tests/acceptance/features/webUISharingNotificationsToRoot/notificationLink.feature diff --git a/tests/acceptance/expected-failures-Iphone-oc10-server-oauth2-login.md b/tests/acceptance/expected-failures-Iphone-oc10-server-oauth2-login.md index fb16f2889b1..414498494fe 100644 --- a/tests/acceptance/expected-failures-Iphone-oc10-server-oauth2-login.md +++ b/tests/acceptance/expected-failures-Iphone-oc10-server-oauth2-login.md @@ -3,10 +3,6 @@ ### [renaming a resource does not work](https://github.com/owncloud/ocis-reva/issues/14) - [webUISharingAcceptSharesToRoot/acceptShares.feature:50](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptSharesToRoot/acceptShares.feature#L50) -### [File link in notifications seems to not work](https://github.com/owncloud/web/issues/5227) -- [webUISharingNotifications/notificationLink.feature:18](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingNotifications/notificationLink.feature#L18) -- [webUISharingNotificationsToRoot/notificationLink.feature:17](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingNotificationsToRoot/notificationLink.feature#L17) - ### [impossible to navigate into a folder in the trashbin](https://github.com/owncloud/web/issues/1725) - [webUITrashbinDelete/trashbinDelete.feature:29](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L29) diff --git a/tests/acceptance/expected-failures-XGA-with-oc10-server-oauth2-login.md b/tests/acceptance/expected-failures-XGA-with-oc10-server-oauth2-login.md index e6d07891636..91f4eef18b4 100644 --- a/tests/acceptance/expected-failures-XGA-with-oc10-server-oauth2-login.md +++ b/tests/acceptance/expected-failures-XGA-with-oc10-server-oauth2-login.md @@ -1,9 +1,5 @@ ## Scenarios from web tests run on XGA Portrait that are expected to fail on oC10 -### [File link in notifications seems to not work](https://github.com/owncloud/web/issues/5227) -- [webUISharingNotifications/notificationLink.feature:18](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingNotifications/notificationLink.feature#L18) -- [webUISharingNotificationsToRoot/notificationLink.feature:17](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingNotificationsToRoot/notificationLink.feature#L17) - ### [impossible to navigate into a folder in the trashbin](https://github.com/owncloud/web/issues/1725) - [webUITrashbinDelete/trashbinDelete.feature:29](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L29) diff --git a/tests/acceptance/expected-failures-with-oc10-server-oauth2-login-and-web-integration-app.md b/tests/acceptance/expected-failures-with-oc10-server-oauth2-login-and-web-integration-app.md index a48b39bbcc5..2d9bac560c0 100644 --- a/tests/acceptance/expected-failures-with-oc10-server-oauth2-login-and-web-integration-app.md +++ b/tests/acceptance/expected-failures-with-oc10-server-oauth2-login-and-web-integration-app.md @@ -8,10 +8,6 @@ Level-3 headings should be used for the references to the relevant issues. Inclu Other free text and markdown formatting can be used elsewhere in the document if needed. But if you want to explain something about the issue, then please post that in the issue itself. -### [File link in notifications seems to not work](https://github.com/owncloud/web/issues/5227) -- [webUISharingNotifications/notificationLink.feature:18](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingNotifications/notificationLink.feature#L18) -- [webUISharingNotificationsToRoot/notificationLink.feature:17](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingNotificationsToRoot/notificationLink.feature#L17) - ### [impossible to navigate into a folder in the trashbin](https://github.com/owncloud/web/issues/1725) - [webUITrashbinDelete/trashbinDelete.feature:29](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L29) diff --git a/tests/acceptance/expected-failures-with-oc10-server-oauth2-login.md b/tests/acceptance/expected-failures-with-oc10-server-oauth2-login.md index 208c6806dd5..24039171655 100644 --- a/tests/acceptance/expected-failures-with-oc10-server-oauth2-login.md +++ b/tests/acceptance/expected-failures-with-oc10-server-oauth2-login.md @@ -9,7 +9,7 @@ Level-3 headings should be used for the references to the relevant issues. Inclu Other free text and markdown formatting can be used elsewhere in the document if needed. But if you want to explain something about the issue, then please post that in the issue itself. ### [Preview from share-with-others page doesn't work in oc10](https://github.com/owncloud/web/issues/7049) -- [webUIPreview/mediaPreview.feature:153](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIPreview/imageMediaViewer.feature#L153) +- [webUIPreview/mediaPreview.feature:143](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIPreview/imageMediaViewer.feature#L143) ### [user session of a blocked user is not cleared properly](https://github.com/owncloud/web/issues/4795) - [webUILogin/adminBlocksUser.feature:20](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUILogin/adminBlocksUser.feature#L20) @@ -41,10 +41,6 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUITags/createTags.feature:61](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITags/createTags.feature#L61) - [webUITags/createTags.feature:79](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITags/createTags.feature#L79) -### [File link in notifications seems to not work](https://github.com/owncloud/web/issues/5227) -- [webUISharingNotifications/notificationLink.feature:18](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingNotifications/notificationLink.feature#L18) -- [webUISharingNotificationsToRoot/notificationLink.feature:17](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingNotificationsToRoot/notificationLink.feature#L17) - ### [impossible to navigate into a folder in the trashbin](https://github.com/owncloud/web/issues/1725) - [webUITrashbinDelete/trashbinDelete.feature:29](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L29) 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 f3cc19d1d51..4b96f2eb81a 100644 --- a/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md +++ b/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md @@ -89,8 +89,8 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUISharingInternalGroupsSharingIndicator/shareWithGroups.feature:61](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroupsSharingIndicator/shareWithGroups.feature#L61) - [webUISharingInternalGroupsSharingIndicator/shareWithGroups.feature:20](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroupsSharingIndicator/shareWithGroups.feature#L20) - [webUISharingInternalGroupsSharingIndicator/shareWithGroups.feature:80](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroupsSharingIndicator/shareWithGroups.feature#L80) -- [webUISharingInternalGroupsSharingIndicator/shareWithGroups.feature:80](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroupsSharingIndicator/shareWithGroups.feature#L80) - +- [webUISharingInternalGroupsSharingIndicator/shareWithGroups.feature:42](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroupsSharingIndicator/shareWithGroups.feature#L42) +- [webUISharingInternalUsersSharingIndicator/shareWithUsers.feature:80](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersSharingIndicator/shareWithUsers.feature#L80) ### [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) diff --git a/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature b/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature index 6cca833ddb9..7f5f4b4496a 100644 --- a/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature +++ b/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature @@ -224,7 +224,24 @@ Feature: accept/decline shares coming from internal users And the user opens folder "Shares" using the webUI Then file "lorem.txt" should be listed on the webUI + @skipOnOCIS + Scenario: receive shares with same name from different users, accept one by one + Given user "Carol" has been created with default attributes and without skeleton files in the server + And user "Carol" has created folder "/simple-folder" in the server + And user "Carol" has created folder "/simple-folder/from_Carol" in the server + And user "Carol" has shared folder "/simple-folder" with user "Brian" in the server + And user "Alice" has created folder "/simple-folder" in the server + And user "Alice" has created folder "/simple-folder/from_Alice" in the server + And user "Alice" has shared folder "/simple-folder" with user "Brian" in the server + And the user has browsed to the shared-with-me page + When the user accepts share "simple-folder" offered by user "Alice Hansen" using the webUI + Then folder "simple-folder" shared by "Alice Hansen" should be in "Accepted" state on the webUI + When the user accepts share "simple-folder" offered by user "Carol King" using the webUI + Then folder "simple-folder (2)" shared by "Carol King" should be in "Accepted" state on the webUI + And as "Brian" folder "from_Alice" should exist inside folder "/Shares/simple-folder" in the server + And as "Brian" folder "from_Carol" should exist inside folder "/Shares/simple-folder (2)" in the server + @skipOnOC10 Scenario: receive shares with same name from different users, accept one by one Given user "Carol" has been created with default attributes and without skeleton files in the server And user "Carol" has created folder "/simple-folder" in the server diff --git a/tests/acceptance/features/webUISharingNotifications/notificationLink.feature b/tests/acceptance/features/webUISharingNotifications/notificationLink.feature deleted file mode 100644 index f69db35253c..00000000000 --- a/tests/acceptance/features/webUISharingNotifications/notificationLink.feature +++ /dev/null @@ -1,26 +0,0 @@ -@app-required @notifications-app-required @ocis-reva-issue-14 -Feature: Display notifications when receiving a share and follow embedded links - As a user - I want to use the notification header as a link - So that I will be redirected to the most appropriate screen - - Background: - Given app "notifications" has been "enabled" in the server - And the setting "shareapi_auto_accept_share" of app "core" has been set to "no" in the server - And the administrator has set the default folder for received shares to "Shares" in the server - And these users have been created with default attributes and without skeleton files in the server: - | username | - | Alice | - | Brian | - And user "Brian" has logged in using the webUI - - @smokeTest @issue-ocis-14 - Scenario: notification link redirection in case a share is pending - Given user "Alice" has created folder "simple-folder" in the server - And user "Alice" has shared folder "/simple-folder" with user "Brian" in the server - And user "Brian" has accepted the share "Shares/simple-folder" offered by user "Alice" in the server - When the user re-logs in as "Brian" using the webUI - And the user follows the link of following share from notification using the webUI - | resource | simple-folder | - | sharer | Alice | - Then the user should be redirected to a webUI page with the title "Shared with you - %productname%" diff --git a/tests/acceptance/features/webUISharingNotificationsToRoot/notificationLink.feature b/tests/acceptance/features/webUISharingNotificationsToRoot/notificationLink.feature deleted file mode 100644 index d7bfe8fecd2..00000000000 --- a/tests/acceptance/features/webUISharingNotificationsToRoot/notificationLink.feature +++ /dev/null @@ -1,24 +0,0 @@ -@app-required @notifications-app-required @notToImplementOnOCIS -Feature: Display notifications when receiving a share and follow embedded links - As a user - I want to use the notification header as a link - So that I will be redirected to the most appropriate screen - - Background: - Given app "notifications" has been "enabled" in the server - And the setting "shareapi_auto_accept_share" of app "core" has been set to "no" in the server - And these users have been created with default attributes and without skeleton files in the server: - | username | - | Alice | - | Brian | - And user "Brian" has logged in using the webUI - - @smokeTest @issue-5227 - Scenario: notification link redirection in case a share is pending - Given user "Alice" has created folder "simple-folder" in the server - And user "Alice" has shared folder "/simple-folder" with user "Brian" in the server - When the user re-logs in as "Brian" using the webUI - And the user follows the link of following share from notification using the webUI - | resource | simple-folder | - | sharer | Alice | - Then the user should be redirected to a webUI page with the title "Shared with you - %productname%"