Review changes

owncloud · Mar 12, 2020 · 608b23e · 608b23e
1 parent ce5119a
commit 608b23e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature b/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature
@@ -356,8 +356,7 @@ Feature: Sharing files and folders with internal groups
       | shareWith       | grp1       |
       | expireDate      | +14        |
     And user "user3" has logged in using the webUI
-    When the user edits share with group "grp1" of file "lorem.txt" changing following
-      | expireDate | +7 |
+    When the user edits the collaborator expiry date of "grp1" of file "lorem.txt" to "+7" days using the webUI
     Then user "user1" should have received a share with target "lorem (2).txt" and expiration date in 7 days
     Then user "user2" should have received a share with target "lorem (2).txt" and expiration date in 7 days
     And user "user3" should have a share with these details:

diff --git a/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature b/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
@@ -609,8 +609,7 @@ Feature: Sharing files and folders with internal users
       | shareWith  | user2      |
       | expireDate | +14        |
     And user "user1" has logged in using the webUI
-    When the user edits share with user "User Two" of file "lorem.txt" changing following
-      | expireDate | +7 |
+    When the user edits the collaborator expiry date of "User Two" of file "lorem.txt" to "+7" days using the webUI
     Then user "user2" should have received a share with target "lorem (2).txt" and expiration date in 7 days
     And user "user1" should have a share with these details:
       | field      | value      |

diff --git a/tests/acceptance/pageObjects/FilesPageElement/sharingDialog.js b/tests/acceptance/pageObjects/FilesPageElement/sharingDialog.js
@@ -487,17 +487,17 @@ module.exports = {
       return this.useXpath().expect.element(collaboratorSelector).to.not.be.present
     },
     /**
-     * @param collaborator
-     * @param value
+     * @param {string} collaborator Name of the collaborator
+     * @param {string} days number of days to be added or subtracted from current date
      *
      * @return {Promise<*>}
      */
-    changeCollaboratorExpiryDate: async function (collaborator, value) {
+    changeCollaboratorExpiryDate: async function (collaborator, days) {
       await collaboratorDialog.clickEditShare(collaborator)
       await this.api.page
         .FilesPageElement
         .expirationDatePicker()
-        .setExpirationDate(value)
+        .setExpirationDate(days)
       return this.saveChanges()
     }
   },

diff --git a/tests/acceptance/stepDefinitions/sharingContext.js b/tests/acceptance/stepDefinitions/sharingContext.js
@@ -87,7 +87,7 @@ Given('user {string} from remote server has shared {string} with user {string} f
  * @param {string} elementToShare  path of file/folder being shared
  * @param {string} sharer  username of the sharer
  * @param receiver  username of the receiver
- * @param {number} shareType  type of share user, group, public (link), federated (cloud share).
+ * @param shareType  Type of share 0 = user, 1 = group, 3 = public (link), 6 = federated (cloud share).
  * @param {string} permissionString  permissions of the share for valid permissions see sharingHelper.PERMISSION_TYPES
  * @param {string} name name of the link (for public links), default = "New Share"
  * @param {object} extraParams Extra parameters allowed on the share
@@ -777,15 +777,14 @@ When(
   }
 )
 
-When('the user edits share with user/group {string} of file/folder/resource {string} changing following',
-  async function (collaborator, resource, dataTable) {
+When('the user edits the collaborator expiry date of {string} of file/folder/resource {string} to {string} days/day using the webUI',
+  async function (collaborator, resource, days) {
     const api = client.page.FilesPageElement
-    const settings = dataTable.rowsHash()
     await api
       .appSideBar()
       .closeSidebar(100)
       .openSharingDialog(resource)
-    return api.sharingDialog().changeCollaboratorExpiryDate(collaborator, settings.expireDate)
+    return api.sharingDialog().changeCollaboratorExpiryDate(collaborator, days)
   })
 
 Then('user {string} should be listed as {string} in the collaborators list on the webUI', function (user, role) {