TagSpaces is an offline, open source, document manager with tagging support
fix e2e
sytolkab981d42ba31
diff --git a/scripts/extconfig-objectstore-location.js b/scripts/extconfig-objectstore-location.jsindex 1a8c1c952..7adfb8774 100644--- a/scripts/extconfig-objectstore-location.js+++ b/scripts/extconfig-objectstore-location.js@@ -4,10 +4,10 @@ window.ExtUseGenerateThumbnails = true;window.ExtLocationsReadOnly = false;window.ExtSaveLocationsInBrowser = true;window.ExtLocations = [- /*{+ {uuid: '40565f09-c7fd-2333-fc67-a75db27rt5ba', // an unique id of the locationtype: '1', // 1 defines the locations a cloud based- name: 'supported-filestypes-s3', // the name of the location+ name: 'supported-filestypes-minio', // the name of the locationpath: '', // the path to sub folder in the locationendpointURL: 'http://127.0.0.1:9000',accessKeyId: 'minioadmin', // the access key of the user@@ -22,8 +22,27 @@ window.ExtLocations = [maxIndexAge: 600000,maxLoops: 2,creationDate: '2024-06-01T08:46:50.449Z',- },*/+ },{+ uuid: '30565f09-c7fd-2333-fc67-a75db27rt5ba', // an unique id of the location+ type: '1', // 1 defines the locations a cloud based+ name: 'supported-filestypes-s3', // the name of the location+ path: '', // the path to sub folder in the location+ endpointURL: 'http://localhost:4569',+ accessKeyId: 'S3RVER', // the access key of the user+ secretAccessKey: 'S3RVER', // the secret case of the user+ bucketName: 'supported-filestypes', // the name of the S3 bucket+ region: 'eu-central-1', // the AWS region+ isDefault: true, // if true this location will be loaded by the application start+ isReadOnly: false, // if true the user interface of the application turns to read-only mode+ disableIndexing: false, // if true the search index will be persisted and loaded by default on location opening+ fullTextIndex: false, // activated the full-text search for TXT, MD and HTML files+ watchForChanges: false, // activates the watching for changed files in the current location+ maxIndexAge: 600000,+ maxLoops: 2,+ creationDate: '2024-06-01T08:46:50.449Z',+ },+ /*{uuid: '30565f09-c7fd-2333-fc67-a75db27rt5ba', // an unique id of the locationtype: '0', // 1 defines the locations a cloud basedname: 'supported-filestypes', // the name of the location@@ -37,5 +56,5 @@ window.ExtLocations = [disableIndexing: false, // if true the search index will be persisted and loaded by default on location openingfullTextIndex: false, // activated the full-text search for TXT, MD and HTML fileswatchForChanges: false, // activates the watching for changed files in the current location- },+ },*/];diff --git a/tests/e2e/objectstore.pw.e2e.js b/tests/e2e/objectstore.pw.e2e.jsindex 563805b70..47df9798f 100644--- a/tests/e2e/objectstore.pw.e2e.js+++ b/tests/e2e/objectstore.pw.e2e.js@@ -2,7 +2,7 @@* Copyright (c) 2016-present - TagSpaces GmbH. All rights reserved.*/import { test, expect } from './fixtures';-import { defaultLocationName, createS3Location } from './location.helpers';+import { defaultLocationName } from './location.helpers';import {clickOn,expectElementExist,@@ -11,18 +11,18 @@ import {import { startTestingApp, stopApp } from './hook';import { openContextEntryMenu } from './test-utils';import { dataTidFormat } from '../../src/renderer/services/test';-import { clearDataStorage, closeWelcomePlaywright } from './welcome.helpers';+import { clearDataStorage } from './welcome.helpers';-test.beforeAll(async ({ isWeb, isS3, webServerPort }, testInfo) => {- if (isS3) {+test.beforeAll(async ({ isWeb, isS3, isMinio, webServerPort }, testInfo) => {+ /*if (isS3) {await startTestingApp({ isWeb, isS3, webServerPort, testInfo });await closeWelcomePlaywright();- } else {- await startTestingApp(- { isWeb, isS3, webServerPort, testInfo },- 'extconfig-objectstore-location.js',- );- }+ } else if(isMinio) {*/+ await startTestingApp(+ { isWeb, isS3, webServerPort, testInfo },+ 'extconfig-objectstore-location.js',+ );+ //}//await clearDataStorage();});@@ -30,21 +30,19 @@ test.afterAll(async () => {await stopApp();});-test.afterEach(async ({ page }, testInfo) => {- /*if (testInfo.status !== testInfo.expectedStatus) {- await takeScreenshot(testInfo);- }*/+test.afterEach(async () => {await clearDataStorage();});-test.beforeEach(async ({ isS3 }) => {- if (isS3) {- await createS3Location('', defaultLocationName, true);- } else {- await closeWelcomePlaywright();- await clickOn('[data-tid=locationManager]');- await clickOn('[data-tid=location_' + defaultLocationName + ']'); // + '-s3]');+test.beforeEach(async ({ isMinio, isS3 }) => {+ if (isMinio) {+ //await createPwMinioLocation('', defaultLocationName, true);+ await clickOn('[data-tid=location_' + defaultLocationName + '-minio]');+ } else if (isS3) {+ //await createS3Location('', defaultLocationName, true);+ await clickOn('[data-tid=location_' + defaultLocationName + '-s3]');}+ await expectElementExist(getGridFileSelector('empty_folder'), true, 8000);});test.describe('TST09 - ObjectStore location', () => {@@ -60,7 +58,7 @@ test.describe('TST09 - ObjectStore location', () => {await clickOn('[data-tid=toggleBookmarkTID]');await clickOn('[data-tid=fileContainerCloseOpenedFile]');- await clickOn('[data-tid=location_' + defaultLocationName + ']');+ //await clickOn('[data-tid=location_' + defaultLocationName + ']');// Openawait clickOn('[data-tid=quickAccessButton]');