Skip to content
Snippets Groups Projects
Commit 689bca24 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-4078 reworked xdomea download

parent 8a4febca
No related branches found
No related tags found
No related merge requests found
...@@ -94,28 +94,14 @@ export default defineConfig({ ...@@ -94,28 +94,14 @@ export default defineConfig({
dropUserManagerCollectionsFromDatabase(config, collections); dropUserManagerCollectionsFromDatabase(config, collections);
return 0; return 0;
}, },
countDownloadFiles(folderName) { countFiles(folderName) {
return new Promise((resolve, reject) => { console.log('counting files in folder %s', folderName);
fs.readdir(folderName, (err, files) => { return countFiles(folderName);
if (err) { },
return reject(err) deleteFolder(folderName) {
} console.log('deleting folder %s', folderName);
deleteFolder(folderName);
resolve(files.length) return 0;
})
})},
deleteDownloadFolder(folderName) {
console.log('deleting folder %s', folderName)
return new Promise((resolve, reject) => {
rmdir(folderName, { maxRetries: 10, recursive: true }, (err) => {
if (err) {
console.error(err)
return reject(err)
}
resolve(null)
})
})
}, },
}); });
...@@ -371,3 +357,27 @@ function dropCollections(databaseUrl, databaseName, collections){ ...@@ -371,3 +357,27 @@ function dropCollections(databaseUrl, databaseName, collections){
} }
}); });
} }
function countFiles(folderName): Promise<number> {
return new Promise((resolve, reject) => {
fs.readdir(folderName, (err, files) => {
if (err) {
return reject(err)
}
resolve(files.length)
})
})
}
function deleteFolder(folderName): void {
new Promise((resolve, reject) => {
rmdir(folderName, { maxRetries: 10, recursive: true }, (err) => {
if (err) {
console.error(err)
return reject(err)
}
resolve(null)
})
})
}
\ No newline at end of file
...@@ -47,7 +47,6 @@ describe('Vorgang exportieren', () => { ...@@ -47,7 +47,6 @@ describe('Vorgang exportieren', () => {
const vorgangExportieren: VorgangE2E = { ...createVorgang(), name: 'DoExportieren' }; const vorgangExportieren: VorgangE2E = { ...createVorgang(), name: 'DoExportieren' };
before(() => { before(() => {
dropCollections();
initVorgaenge([vorgangExportieren]); initVorgaenge([vorgangExportieren]);
loginAsSabine(); loginAsSabine();
...@@ -85,7 +84,7 @@ describe('Vorgang exportieren', () => { ...@@ -85,7 +84,7 @@ describe('Vorgang exportieren', () => {
exist(menuItem.getButton()); exist(menuItem.getButton());
}) })
it('should be 1 file in download folder', () => { it('should have 1 file in download folder after download', () => {
menuItem.getButton().click(); menuItem.getButton().click();
waitForSpinnerToDisappear(); waitForSpinnerToDisappear();
......
...@@ -37,8 +37,8 @@ enum CypressTasks { ...@@ -37,8 +37,8 @@ enum CypressTasks {
INIT_VORGANG_DATA = 'initVorgangData', INIT_VORGANG_DATA = 'initVorgangData',
INIT_VORGANG_ATTACHED_ITEM_DATA = 'initVorgangAttachedItemData', INIT_VORGANG_ATTACHED_ITEM_DATA = 'initVorgangAttachedItemData',
INIT_USERMANAGER_DATA = 'initUsermanagerData', INIT_USERMANAGER_DATA = 'initUsermanagerData',
COUNT_DOWNLOAD_FILES = 'countDownloadFiles', COUNT_FILES = 'countFiles',
DELETE_DOWNLOAD_FOLDER = 'deleteDownloadFolder' DELETE_FOLDER = 'deleteFolder'
} }
enum MongoCollections { enum MongoCollections {
...@@ -113,11 +113,11 @@ export function dropCollections() { ...@@ -113,11 +113,11 @@ export function dropCollections() {
} }
export function countDownloadFiles(): Cypress.Chainable<number> { export function countDownloadFiles(): Cypress.Chainable<number> {
return cy.task(CypressTasks.COUNT_DOWNLOAD_FILES, DOWNLOAD_FOLDER); return cy.task(CypressTasks.COUNT_FILES, DOWNLOAD_FOLDER);
} }
export function deleteDownloadFolder() { export function deleteDownloadFolder(): void {
cy.task(CypressTasks.DELETE_DOWNLOAD_FOLDER, DOWNLOAD_FOLDER); cy.task(CypressTasks.DELETE_FOLDER, DOWNLOAD_FOLDER);
} }
export function scrollToWindowBottom(): void { export function scrollToWindowBottom(): void {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment