Fixed tests

Author: Max-7

client/src/views/files/FoldersPage.vue

@@ -100,7 +100,7 @@
           v-show="querying"
           class="body-lg"
         >
-          <div class="no-files-content">
+          <div class="loading-files-content">
             <ms-spinner class="ms-spinner" />
             <ion-text>
               {{ $msTranslate('FoldersPage.loading') }}

client/tests/e2e/helpers/utils.ts

@@ -488,12 +488,12 @@ export async function importDefaultFiles(
     await dragAndDropFile(documentsPage, dropZone, paths);
     imported = paths.length;
   }
-  // Hide the import menu
+  // Minimize the import menu
   if (imported > 0) {
     const uploadMenu = documentsPage.locator('.upload-menu');
     await expect(uploadMenu).toBeVisible();
     expect(await uploadMenu.locator('.upload-menu-list').locator('.file-operation-item').count()).toBeGreaterThan(0);
-    await uploadMenu.locator('.menu-header-icons').locator('ion-icon').nth(1).click();
+    await uploadMenu.locator('.menu-header-icons').locator('ion-icon').nth(0).click();
   }
   await expect(documentsPage.locator('.folder-container').locator('.no-files-content')).toBeHidden();
 }

client/tests/e2e/specs/download_file.spec.ts

@@ -194,7 +194,7 @@ msTest.describe(() => {
     await expect(uploadMenu).toBeVisible();
     const opItems = uploadMenu.locator('.upload-menu-list').locator('.file-operation-item');
     await expect(opItems).toHaveCount(1);
-    await uploadMenu.locator('.menu-header-icons').locator('ion-icon').nth(1).click();
+    await uploadMenu.locator('.menu-header-icons').locator('ion-icon').nth(0).click();
     await expect(documents.locator('.folder-container').locator('.no-files-content')).toBeHidden();
     // cspell:disable-next-line
     await renameDocument(documents, entries.nth(1), '文件名.png');

client/tests/e2e/specs/file_copy.spec.ts

@@ -102,7 +102,7 @@ msTest.describe(() => {
       await expect(opItems).toHaveCount(2);
       await expect(opItems.nth(0).locator('.element-details-title__name')).toHaveText('Copying image.png');
       await expect(opItems.nth(0).locator('.element-details-info')).toHaveText('wksp1');
-      await uploadMenu.locator('.menu-header-icons').locator('ion-icon').nth(1).click();
+      await uploadMenu.locator('.menu-header-icons').locator('ion-icon').nth(0).click();
 
       // File should still be here
       if (gridMode) {
@@ -145,7 +145,7 @@ msTest.describe(() => {
       await expect(opItems.nth(0).locator('.element-details-info')).toHaveText('5 B •  wksp1');
       await expect(opItems.nth(1).locator('.element-details-title__name')).toHaveText('file.txt');
       await expect(opItems.nth(1).locator('.element-details-info')).toHaveText('1 B •  wksp1');
-      await uploadMenu.locator('.menu-header-icons').locator('ion-icon').nth(1).click();
+      await uploadMenu.locator('.menu-header-icons').locator('ion-icon').nth(0).click();
 
       const entries = documents.locator('.folder-container').locator('.file-list-item');
       await expect(entries).toHaveCount(2);
@@ -186,7 +186,6 @@ msTest.describe(() => {
         await buttons.nth(0).click();
         await expect(dupModal).toBeHidden();
         await expect(documents).toShowToast('No files to copy.', 'Info');
-        await expect(uploadMenu).toBeHidden();
         await expect(entries).toHaveCount(2);
         await expect(entries.locator('.label-name')).toHaveText(['Folder', 'file.txt']);
         await entries.nth(0).dblclick();
@@ -248,7 +247,7 @@ msTest.describe(() => {
       await expect(opItems.nth(0).locator('.element-details-info')).toHaveText('5 B •  wksp1');
       await expect(opItems.nth(1).locator('.element-details-title__name')).toHaveText('file.txt');
       await expect(opItems.nth(1).locator('.element-details-info')).toHaveText('1 B •  wksp1');
-      await uploadMenu.locator('.menu-header-icons').locator('ion-icon').nth(1).click();
+      await uploadMenu.locator('.menu-header-icons').locator('ion-icon').nth(0).click();
 
       const modal = documents.locator('.folder-selection-modal');
       const dupModal = documents.locator('.file-operation-conflicts-modal');
@@ -288,7 +287,6 @@ msTest.describe(() => {
         await expect(opItems).toHaveCount(3);
         await expect(opItems.nth(0).locator('.element-details-title__name')).toHaveText('Copying Folder');
       } else {
-        await expect(uploadMenu).toBeHidden();
         await expect(documents).toShowToast('No files to copy.', 'Info');
       }
       // Folder is still there

client/tests/e2e/specs/file_import.spec.ts

@@ -186,9 +186,6 @@ for (const displaySize of [DisplaySize.Small, DisplaySize.Large]) {
     } else {
       await documents.locator('#folders-ms-action-bar').getByText('Import').click();
     }
-    const uploadMenu = documents.locator('.upload-menu');
-    await expect(uploadMenu).toBeHidden();
-
     const fileChooserPromise = documents.waitForEvent('filechooser');
     if (displaySize === DisplaySize.Large) {
       await documents.locator('.import-popover').locator('.import-container').getByRole('listitem').nth(1).click();
@@ -198,8 +195,7 @@ for (const displaySize of [DisplaySize.Small, DisplaySize.Large]) {
     const importPath = path.join(testInfo.config.rootDir, 'data', 'imports');
     await fileChooser.setFiles([importPath]);
     await checkFilesUploaded(documents, 1, 11);
-    await documents.locator('.upload-menu').locator('.menu-header-icons').locator('ion-icon').nth(1).click();
-    await expect(documents.locator('.upload-menu')).toBeHidden();
+    await documents.locator('.upload-menu').locator('.menu-header-icons').locator('ion-icon').nth(0).click();
     await documents.locator('.folder-container').locator('.file-list-item').locator('.label-name').nth(0).click();
     if (displaySize === DisplaySize.Large) {
       await expect(workspaces).toHaveHeader(['New_Workspace', 'imports'], true, true);
@@ -234,9 +230,6 @@ for (const displaySize of [DisplaySize.Small, DisplaySize.Large]) {
       await documents.locator('#folders-ms-action-bar').getByText('Import').click();
     }
 
-    const uploadMenu = documents.locator('.upload-menu');
-    await expect(uploadMenu).toBeHidden();
-
     const fileChooserPromise = documents.waitForEvent('filechooser');
     if (displaySize === DisplaySize.Large) {
       const importFilesButton = documents.locator('.import-popover').locator('.import-container').getByRole('listitem').nth(0);

client/tests/e2e/specs/file_move.spec.ts

@@ -104,7 +104,7 @@ msTest.describe(() => {
       await expect(opItems).toHaveCount(2);
       await expect(opItems.nth(0).locator('.element-details-title__name')).toHaveText('Moving image.png');
       await expect(opItems.nth(0).locator('.element-details-info')).toHaveText('wksp1');
-      await uploadMenu.locator('.menu-header-icons').locator('ion-icon').nth(1).click();
+      await uploadMenu.locator('.menu-header-icons').locator('ion-icon').nth(0).click();
 
       // File should not be here anymore
       if (gridMode) {
@@ -196,7 +196,7 @@ msTest.describe(() => {
       await expect(opItems.nth(0).locator('.element-details-info')).toHaveText('5 B •  wksp1');
       await expect(opItems.nth(1).locator('.element-details-title__name')).toHaveText('file.txt');
       await expect(opItems.nth(1).locator('.element-details-info')).toHaveText('1 B •  wksp1');
-      await uploadMenu.locator('.menu-header-icons').locator('ion-icon').nth(1).click();
+      await uploadMenu.locator('.menu-header-icons').locator('ion-icon').nth(0).click();
 
       const entries = documents.locator('.folder-container').locator('.file-list-item');
       await expect(entries).toHaveCount(2);
@@ -236,8 +236,7 @@ msTest.describe(() => {
       } else if (dupPolicy === 'ignore') {
         await buttons.nth(0).click();
         await expect(dupModal).toBeHidden();
-        await expect(documents).toShowToast('No files to move.', 'Info');
-        await expect(uploadMenu).toBeHidden();
+        await expect(documents).toShowToast('No files to move.', 'Info');;
         await expect(entries).toHaveCount(2);
         await expect(entries.locator('.label-name')).toHaveText(['Folder', 'file.txt']);
         await entries.nth(0).dblclick();
@@ -299,7 +298,7 @@ msTest.describe(() => {
       await expect(opItems.nth(0).locator('.element-details-info')).toHaveText('5 B •  wksp1');
       await expect(opItems.nth(1).locator('.element-details-title__name')).toHaveText('file.txt');
       await expect(opItems.nth(1).locator('.element-details-info')).toHaveText('1 B •  wksp1');
-      await uploadMenu.locator('.menu-header-icons').locator('ion-icon').nth(1).click();
+      await uploadMenu.locator('.menu-header-icons').locator('ion-icon').nth(0).click();
 
       const modal = documents.locator('.folder-selection-modal');
       const dupModal = documents.locator('.file-operation-conflicts-modal');
@@ -342,7 +341,6 @@ msTest.describe(() => {
         await expect(opItems.nth(0).locator('.element-details-title__name')).toHaveText('Moving Folder');
       } else {
         await expect(documents).toShowToast('No files to move.', 'Info');
-        await expect(uploadMenu).toBeHidden();
         await expect(entries.locator('.label-name')).toHaveText('Folder');
       }