Download single file

owncloud · Apr 4, 2022 · e00256b · e00256b
1 parent 5acccdb
commit e00256b
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 12 deletions.
diff --git a/tests/e2e/cucumber/features/integrations/link.ocis.feature b/tests/e2e/cucumber/features/integrations/link.ocis.feature
@@ -31,7 +31,7 @@ Feature: link
     #Then the public should not see the following files on the files-drop page
     #  | textfile.txt |
     And "Anonymous" logs out
-    When "Alice" downloads the following resources using the batch action
+    When "Alice" downloads the following files using the batch action
       | resource     | from         |
       | lorem.txt    | folderPublic |
       | textfile.txt | folderPublic |

diff --git a/tests/e2e/cucumber/steps/app-files/resource.ts b/tests/e2e/cucumber/steps/app-files/resource.ts
@@ -35,7 +35,7 @@ When(
 )
 
 When(
-  /^"([^"]*)" downloads the following resource(s)? using the (sidebar panel|batch action)$/,
+  /^"([^"]*)" downloads the following file(s)? using the (sidebar panel|batch action)$/,
   async function (
     this: World,
     stepUser: string,
@@ -46,6 +46,7 @@ When(
     const { page } = this.actorsEnvironment.getActor({ key: stepUser })
     const resourceObject = new objects.applicationFiles.Resource({ page })
     let downloads
+    let files
     const downloadInfo = stepTable.hashes().reduce((acc, stepRow) => {
       const { resource, from } = stepRow
 
@@ -59,7 +60,7 @@ When(
     }, {})
 
     for (const folder of Object.keys(downloadInfo)) {
-      const files = downloadInfo[folder]
+      files = downloadInfo[folder]
       downloads = await resourceObject.download({
         folder,
         names: files,
@@ -74,10 +75,17 @@ When(
     }
 
     if (actionType === 'batch action') {
-      expect(downloads.length).toBe(1)
-      downloads.forEach((download) => {
-        expect(download.suggestedFilename()).toBe('download.tar')
-      })
+      if (files.length === 1) {
+        expect(files.length).toBe(downloads.length)
+        downloads.forEach((download) => {
+          expect(files[0]).toBe(download.suggestedFilename())
+        })
+      } else {
+        expect(downloads.length).toBe(1)
+        downloads.forEach((download) => {
+          expect(download.suggestedFilename()).toBe('download.tar')
+        })
+      }
     }
   }
 )

diff --git a/tests/e2e/support/objects/app-files/resource/actions.ts b/tests/e2e/support/objects/app-files/resource/actions.ts
@@ -124,11 +124,19 @@ export const downloadResources = async (args: downloadResourcesArgs): Promise<Do
 
     case 'BATCH_ACTION': {
       await selectMultipleResources({ page: page, names: names, folder: folder })
-      const [download] = await Promise.all([
-        page.waitForEvent('download'),
-        page.locator('.oc-files-actions-download-archive-trigger').click()
-      ])
-      downloads.push(download)
+      if (names.length === 1) {
+        const [download] = await Promise.all([
+          page.waitForEvent('download'),
+          page.locator('.oc-files-actions-download-file-trigger').click()
+        ])
+        downloads.push(download)
+      } else {
+        const [download] = await Promise.all([
+          page.waitForEvent('download'),
+          page.locator('.oc-files-actions-download-archive-trigger').click()
+        ])
+        downloads.push(download)
+      }
       break
     }
   }