shareFileFolder compatible for federated share

owncloud · Apr 20, 2021 · c8af844 · c8af844
1 parent 4587da2
commit c8af844
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/tests/acceptance/features/webUISharingExternal/federationSharing.feature b/tests/acceptance/features/webUISharingExternal/federationSharing.feature
@@ -343,9 +343,8 @@ Feature: Federation Sharing - sharing with users on other cloud storages
     Given user "Brian" has been created with default attributes and without skeleton files
     And user "Carol" has been created with default attributes and without skeleton files
     And user "Alice" has created folder "simple-folder"
-    And user "Alice" has created folder "simple-folder/sub-folder"
-    And user "Alice" has created folder "simple-folder/sub-folder/simple-empty-folder"
-    And user "Alice" has created file "simple-folder/sub-folder/lorem.txt"
+    And user "Alice" has created folder "simple-folder/simple-empty-folder"
+    And user "Alice" has created file "simple-folder/lorem.txt"
     And user "Alice" has shared folder "simple-folder" with user "Brian"
     And user "Brian" has accepted the share "simple-folder" offered by user "Alice"
     When the user re-logs in as "Brian" using the webUI
@@ -355,7 +354,7 @@ Feature: Federation Sharing - sharing with users on other cloud storages
     Then the following resources should have share indicators on the webUI
       | fileName      | expectedIndicators |
       | simple-folder | user-indirect      |
-    When the user opens folder "/Shares/simple-folder/sub-folder" directly on the webUI
+    When the user opens folder "simple-folder" using the webUI
     Then the following resources should have share indicators on the webUI
       | fileName            | expectedIndicators |
       | simple-empty-folder | user-direct        |

diff --git a/tests/acceptance/features/webUISharingExternalToRoot/federationSharing.feature b/tests/acceptance/features/webUISharingExternalToRoot/federationSharing.feature
@@ -334,7 +334,7 @@ Feature: Federation Sharing - sharing with users on other cloud storages
     Given user "Brian" has been created with default attributes and without skeleton files
     And user "Alice" has created folder "simple-folder"
     And user "Alice" has created folder "simple-folder/simple-empty-folder"
-    And user "Alice" has created file "simple-folder/simple-empty-folder/lorem.txt"
+    And user "Alice" has created file "simple-folder/lorem.txt"
     And user "Alice" has shared folder "simple-folder" with user "Brian"
     When the user re-logs in as "Brian" using the webUI
     And the user opens folder "simple-folder" using the webUI

diff --git a/tests/acceptance/stepDefinitions/filesContext.js b/tests/acceptance/stepDefinitions/filesContext.js
@@ -110,7 +110,7 @@ Given('user {string} has uploaded file {string} to {string}', async function(
   await webdav.createFile(user, filename, content)
 })
 
-Given('user {string} has uploaded file {string} to {string} on remote server', async function(
+Given('user {string} has uploaded file {string} to {string} on remote server', function(
   user,
   source,
   filename

diff --git a/tests/acceptance/stepDefinitions/sharingContext.js b/tests/acceptance/stepDefinitions/sharingContext.js
@@ -163,6 +163,10 @@ const shareFileFolder = async function(
   const permissions = sharingHelper.humanReadablePermissionsToBitmask(permissionString)
   params.append('path', elementToShare)
   if (receiver) {
+    if (receiver.endsWith('@%remote_backend_url%')) {
+      shareType = SHARE_TYPES.federated_cloud_share
+      receiver = receiver.replace('%remote_backend_url%', client.globals.remote_backend_url)
+    }
     params.append('shareWith', receiver)
   }
   params.append('shareType', shareType)