Skip to content

TagSpaces is an offline, open source, document manager with tagging support

add Delete file and check revisions deleted

Stanimir299a94349deb
diff --git a/app/components/Revisions.tsx b/app/components/Revisions.tsx
index 51f02f7e7..4c2f43a97 100644
--- a/app/components/Revisions.tsx
+++ b/app/components/Revisions.tsx
@@ -178,6 +178,7 @@ function Revisions(props: Props) {
}}
>
<Table
+ data-tid="tableRevisionsTID"
sx={{ width: '100%', height: '100%' }}
stickyHeader
size="small"
@@ -212,6 +213,7 @@ function Revisions(props: Props) {
.slice(page * rowsPerPage, page * rowsPerPage + rowsPerPage)
.map(row => (
<TableRow
+ data-tid={openedFiles[0].uuid}
key={row.path}
sx={{ '&:last-child td, &:last-child th': { border: 0 } }}
>
diff --git a/tests/e2e/fileopener.pw.e2e.js b/tests/e2e/fileopener.pw.e2e.js
index 47c8d0ef7..641a5b8da 100644
--- a/tests/e2e/fileopener.pw.e2e.js
+++ b/tests/e2e/fileopener.pw.e2e.js
@@ -14,13 +14,15 @@ import {
expectMetaFilesExist,
getGridFileName,
getGridFileSelector,
+ getRevision,
selectorFile,
selectorFolder,
setInputKeys,
setInputValue,
setSettings,
takeScreenshot,
- waitForNotification
+ waitForNotification,
+ writeTextInIframeInput
} from './general.helpers';
import {
AddRemovePropertiesTags,
@@ -274,7 +276,7 @@ test.describe('TST08 - File folder properties', () => {
await expectFileContain(newFileContent);
});
- test('TST0813 - Delete file [web,minio,electron]', async () => {
+ test('TST0813 - Delete file and check meta and thumbnails deleted [web,minio,electron]', async () => {
const fileName = 'new_file.svg';
const svg = `<svg
xmlns="http://www.w3.org/2000/svg"
@@ -316,6 +318,28 @@ test.describe('TST08 - File folder properties', () => {
await expectMetaFilesExist(arrayMeta, false);
});
+ test('TST0813a - Delete file and check revisions deleted [web,minio,electron,_pro]', async () => {
+ const fileName = 'sample.txt';
+ await clickOn(getGridFileSelector(fileName));
+ await clickOn('[data-tid=fileContainerEditFile]');
+ await writeTextInIframeInput('txt');
+ await clickOn('[data-tid=fileContainerSaveFile]');
+
+ //Toggle Revisions
+ await clickOn('[data-tid=revisionsTID]');
+ await expectElementExist('[data-tid=viewRevisionTID]');
+
+ const revision = await getRevision(0);
+ expect(revision).not.toBeUndefined();
+ await expectMetaFilesExist([revision.file], true, revision.id);
+
+ await clickOn('[data-tid=deleteEntryTID]');
+ await clickOn('[data-tid=confirmSaveBeforeCloseDialog]');
+ await expectElementExist(getGridFileSelector(fileName), false, 5000);
+
+ await expectMetaFilesExist([revision.file], false, revision.id);
+ });
+
/**
* TODO dont work on web tests https://trello.com/c/93iEURf4/731-migrate-fullscreen-to-https-githubcom-snakesilk-react-fullscreen
* dont work on electron Mac https://github.com/microsoft/playwright/issues/1086
diff --git a/tests/e2e/general.helpers.js b/tests/e2e/general.helpers.js
index eb90d05c5..95c50dc95 100644
--- a/tests/e2e/general.helpers.js
+++ b/tests/e2e/general.helpers.js
@@ -197,6 +197,26 @@ export async function getGridFileName(fileIndex) {
return undefined;
}
+export async function getRevision(revIndex) {
+ try {
+ return await global.client.$$eval(
+ 'table[data-tid=tableRevisionsTID] tbody tr',
+ rows => {
+ if (rows.length > 0) {
+ return {
+ id: rows[0].getAttribute('data-tid'),
+ file: rows[0].querySelector('th').innerText
+ };
+ }
+ return undefined;
+ }
+ );
+ } catch (e) {
+ console.log("Can't find getRevision:" + revIndex, e);
+ }
+ return undefined;
+}
+
export async function getElementText(el) {
return await el.innerText();
}
@@ -641,12 +661,24 @@ export async function expectTagsExist(gridElement, arrTagNames, exist = true) {
}
}
-export async function expectMetaFilesExist(arrMetaFiles, exist = true) {
+export async function expectMetaFilesExist(
+ arrMetaFiles,
+ exist = true,
+ subFolder = undefined
+) {
await checkSettings('[data-tid=settingsSetShowUnixHiddenEntries]', true);
await clickOn('[data-tid=folderContainerOpenDirMenu]');
await clickOn('[data-tid=reloadDirectory]');
if (exist || (await isDisplayed(getGridFileSelector(AppConfig.metaFolder)))) {
await global.client.dblclick(getGridFileSelector(AppConfig.metaFolder));
+ if (subFolder) {
+ if (await isDisplayed(getGridFileSelector(subFolder))) {
+ await global.client.dblclick(getGridFileSelector(subFolder));
+ } else if (!exist) {
+ await clickOn('[data-tid=gridPerspectiveOnBackButton]');
+ return true;
+ }
+ }
for (let i = 0; i < arrMetaFiles.length; i++) {
// console.log('check ' + arrMetaFiles[i] + 'exist:' + exist);
await expectElementExist(
@@ -655,11 +687,26 @@ export async function expectMetaFilesExist(arrMetaFiles, exist = true) {
10000
);
}
- await checkSettings('[data-tid=settingsSetShowUnixHiddenEntries]', false);
await clickOn('[data-tid=gridPerspectiveOnBackButton]');
+ if (subFolder) {
+ await expectElementExist(getGridFileSelector(subFolder), exist, 10000);
+ await clickOn('[data-tid=gridPerspectiveOnBackButton]');
+ }
+ await expectElementExist(
+ getGridFileSelector(AppConfig.metaFolder),
+ exist,
+ 10000
+ );
+ await checkSettings('[data-tid=settingsSetShowUnixHiddenEntries]', false);
}
}
+export async function writeTextInIframeInput(txt) {
+ const fLocator = await frameLocator();
+ const editor = await fLocator.locator('#editorText');
+ await editor.type(txt);
+}
+
export async function expectFileContain(
txtToContain = 'etete&5435',
timeout = 10000