TagSpaces is an offline, open source, document manager with tagging support
TST5003 - Testing sort files (#1872)
Stanimir5942a5126f11
diff --git a/app/components/EntryProperties.tsx b/app/components/EntryProperties.tsxindex e8c1bdd6f..cb4ba5001 100644--- a/app/components/EntryProperties.tsx+++ b/app/components/EntryProperties.tsx@@ -104,7 +104,6 @@ import { actions as LocationActions } from '-/reducers/locations';import { actions as AppActions } from '-/reducers/app';import useFirstRender from '-/utils/useFirstRender';import SharingLinkDialog from '-/components/dialogs/SharingLinkDialog';-import { saveFsEntryMeta } from '../../extensions/tagspacespro/modules/metaoperations';const ThumbnailChooserDialog =Pro && Pro.UI ? Pro.UI.ThumbnailChooserDialog : false;diff --git a/app/package.json b/app/package.jsonindex 34a3a4cbb..d9a38fc10 100644--- a/app/package.json+++ b/app/package.json@@ -16,7 +16,7 @@"@tagspaces/extensions": "1.0.71"},"nodeDependencies": {- "@tagspaces/tagspaces-ws": "2.1.17",+ "@tagspaces/tagspaces-ws": "2.1.18","@tagspaces/extensions": "1.0.71","sharp": "0.31.3"}diff --git a/package.json b/package.jsonindex 9bff1bacc..5451c3385 100644--- a/package.json+++ b/package.json@@ -159,7 +159,7 @@"@mui/styles": "5.10.15","@mui/x-date-pickers": "^5.0.8","@tagspaces/tagspaces-md": "2.1.6",- "@tagspaces/tagspaces-platforms": "2.1.17",+ "@tagspaces/tagspaces-platforms": "2.1.18","aws-amplify": "^4.3.8","aws-sdk": "^2.1036.0","babel-polyfill": "^6.26.0",diff --git a/tests/e2e/key-bindings.pw.e2e.js b/tests/e2e/key-bindings.pw.e2e.jsindex b96ffdbad..b456f747e 100644--- a/tests/e2e/key-bindings.pw.e2e.js+++ b/tests/e2e/key-bindings.pw.e2e.js@@ -38,7 +38,7 @@ describe('TST13 - Settings Key Bindings [electron]', () => {} else {await global.client.keyboard.press('Control+KeyF');}- await expectElementExist('#textQuery', true);+ await expectElementExist('#textQuery', true, 2000);});it('TST1312 - Test rename file [electron]', async () => {diff --git a/tests/e2e/perspective-grid.pw.e2e.js b/tests/e2e/perspective-grid.pw.e2e.jsindex c7c0d48e8..b79c92f3d 100644--- a/tests/e2e/perspective-grid.pw.e2e.js+++ b/tests/e2e/perspective-grid.pw.e2e.js@@ -28,6 +28,16 @@ import {setGridOptions,waitForNotification} from './general.helpers';+import {+ cleanFileName,+ extractFileExtension,+ extractTagsAsObjects+} from '@tagspaces/tagspaces-common/paths';+import { sortByCriteria } from '@tagspaces/tagspaces-common/misc';+import {+ dirSeparator,+ tagDelimiter+} from '@tagspaces/tagspaces-common/AppConfig';import { AddRemoveTagsToSelectedFiles } from './perspective-grid.helpers';import { getPropertiesFileName } from './file.properties.helpers';import { startTestingApp, stopSpectronApp, testDataRefresh } from './hook';@@ -74,6 +84,33 @@ describe('TST50 - Perspective Grid', () => {// Scenarios for sorting files in grid perspectivedescribe('TST5003 - Testing sort files in the grid perspective [web,minio,electron]', () => {+ let dirEntries;+ beforeAll(async () => {+ const path = require('path');+ const fs = require('fs-extra');+ const testDir = path.join(+ __dirname,+ '..',+ 'testdata-tmp',+ 'file-structure',+ 'supported-filestypes'+ );+ dirEntries = (await fs.readdir(testDir, { withFileTypes: true }))+ .filter(item => !item.isDirectory() && !item.name.startsWith('.'))+ .map(item => {+ const entryPath = testDir + dirSeparator + item.name;+ const stats = fs.statSync(entryPath);+ return {+ name: cleanFileName(item.name),+ isFile: item.isFile(),+ size: stats.size,+ lmdt: stats.mtime.getTime ? stats.mtime.getTime() : stats.mtime,+ extension: extractFileExtension(item.name, dirSeparator),+ tags: extractTagsAsObjects(item.name, tagDelimiter, dirSeparator)+ };+ });+ });+beforeEach(async () => {await clickOn('[data-tid=gridPerspectiveSortMenu]');});@@ -81,68 +118,94 @@ describe('TST50 - Perspective Grid', () => {test('TST10xx - Sort by name [web,minio,electron]', async () => {// DESCawait clickOn('[data-tid=gridPerspectiveSortByName]');- let firstFileName = await getGridFileName(0);- expect(firstFileName).toBe('sample_exif.jpg');+ let sorted = sortByCriteria(dirEntries, 'byName', false);+ for (let i = 0; i < sorted.length; i += 1) {+ const fileName = await getGridFileName(i);+ expect(fileName).toBe(sorted[i].name); //'sample_exif.jpg');+ }+// ASCawait clickOn('[data-tid=gridPerspectiveSortMenu]');await clickOn('[data-tid=gridPerspectiveSortByName]');- firstFileName = await getGridFileName(0);- expect(firstFileName).toBe('sample.avif');++ sorted = sortByCriteria(dirEntries, 'byName', true);+ for (let i = 0; i < sorted.length; i += 1) {+ const fileName = await getGridFileName(i);+ expect(fileName).toBe(sorted[i].name); //'sample.avif');+ }});test('TST10xx - Sort by size [web,minio,electron]', async () => {await clickOn('[data-tid=gridPerspectiveSortBySize]');- let firstFileName = await getGridFileName(0);- expect(firstFileName).toBe('sample.csv');+ // DESC+ let sorted = sortByCriteria(dirEntries, 'byFileSize', true);+ for (let i = 0; i < sorted.length; i += 1) {+ const fileName = await getGridFileName(i);+ expect(fileName).toBe(sorted[i].name); //'sample.csv');+ }// ASCawait clickOn('[data-tid=gridPerspectiveSortMenu]');await clickOn('[data-tid=gridPerspectiveSortBySize]');- firstFileName = await getGridFileName(0);- expect(firstFileName).toBe('sample.nef');+ sorted = sortByCriteria(dirEntries, 'byFileSize', false);+ for (let i = 0; i < sorted.length; i += 1) {+ const fileName = await getGridFileName(i);+ expect(fileName).toBe(sorted[i].name); //'sample.nef');+ }});test('TST10xx - Sort by date [web,minio,electron]', async () => {await clickOn('[data-tid=gridPerspectiveSortByDate]');- await createTxtFile();- // await global.client.pause(500);+ let sorted = sortByCriteria(dirEntries, 'byDateModified', true);+ for (let i = 0; i < sorted.length; i += 1) {+ const fileName = await getGridFileName(i);+ expect(fileName).toBe(sorted[i].name);+ }// ASCawait clickOn('[data-tid=gridPerspectiveSortMenu]');await clickOn('[data-tid=gridPerspectiveSortByDate]');- const firstFileName = await getGridFileName(0);- expect(firstFileName).toBe('note.txt');-- // cleanup- // await setSettings('[data-tid=settingsSetUseTrashCan]');- // await global.client.pause(500);- await deleteFileFromMenu();- // firstFileName = await getGridFileName(0);- // expect(firstFileName).not.toBe('note.txt'); TODO its have note.txt from another tests+ sorted = sortByCriteria(dirEntries, 'byDateModified', false);+ for (let i = 0; i < sorted.length; i += 1) {+ const fileName = await getGridFileName(i);+ expect(fileName).toBe(sorted[i].name);+ }});test('TST10xx - Sort by extension [web,minio,electron]', async () => {await clickOn('[data-tid=gridPerspectiveSortByExt]');- let firstFileName = await getGridFileName(0);- expect(firstFileName).toBe('sample.avif');+ let sorted = sortByCriteria(dirEntries, 'byExtension', true);+ for (let i = 0; i < sorted.length; i += 1) {+ const fileName = await getGridFileName(i);+ expect(fileName).toBe(sorted[i].name);+ }await clickOn('[data-tid=gridPerspectiveSortMenu]');await clickOn('[data-tid=gridPerspectiveSortByExt]');- firstFileName = await getGridFileName(0);- expect(firstFileName).toBe('sample.zip');+ sorted = sortByCriteria(dirEntries, 'byExtension', false);+ for (let i = 0; i < sorted.length; i += 1) {+ const fileName = await getGridFileName(i);+ expect(fileName).toBe(sorted[i].name);+ }});test('TST10xx - Sort by tags [web,minio,electron]', async () => {await clickOn('[data-tid=gridPerspectiveSortByFirstTag]');- let firstFileName = await getGridFileName(0);- expect(firstFileName).toBe('sample.avif');+ let sorted = sortByCriteria(dirEntries, 'byFirstTag', true);+ for (let i = 0; i < sorted.length; i += 1) {+ const fileName = await getGridFileName(i);+ expect(fileName).toBe(sorted[i].name);+ }// ASCawait clickOn('[data-tid=gridPerspectiveSortMenu]');await clickOn('[data-tid=gridPerspectiveSortByFirstTag]');- firstFileName = await getGridFileName(0);- expect(firstFileName).toBe('sample_exif.jpg');+ sorted = sortByCriteria(dirEntries, 'byFirstTag', false);+ for (let i = 0; i < sorted.length; i += 1) {+ const fileName = await getGridFileName(i);+ expect(fileName).toBe(sorted[i].name);+ }});});