e2e test config

e2e-tests/cypress.config.js

@@ -1,6 +1,6 @@
 const { defineConfig } = require('cypress');
 const killPort = require('kill-port');
-const { clearDataWithBackup } = require('./e2eTestTools');
+const { clearTestingData } = require('./e2eTestTools');
 const waitOn = require('wait-on');
 const { exec } = require('child_process');
 
@@ -10,7 +10,7 @@ module.exports = defineConfig({
       // implement node event listeners here
 
       on('before:spec', async details => {
-        await clearDataWithBackup();
+        await clearTestingData();
         
         if (config.isInteractive) {
           await killPort(3000);

e2e-tests/e2eTestTools.js

@@ -4,29 +4,26 @@ const fs = require('fs');
 
 const baseDir = path.join(os.homedir(), '.dbgate');
 
-function createTimeStamp() {
-  const now = new Date();
-  const year = now.getFullYear();
-  const month = String(now.getMonth() + 1).padStart(2, '0'); // měsíc je 0-indexovaný
-  const day = String(now.getDate()).padStart(2, '0');
-  const hours = String(now.getHours()).padStart(2, '0');
-  const minutes = String(now.getMinutes()).padStart(2, '0');
-  const seconds = String(now.getSeconds()).padStart(2, '0');
+// function createTimeStamp() {
+//   const now = new Date();
+//   const year = now.getFullYear();
+//   const month = String(now.getMonth() + 1).padStart(2, '0'); // měsíc je 0-indexovaný
+//   const day = String(now.getDate()).padStart(2, '0');
+//   const hours = String(now.getHours()).padStart(2, '0');
+//   const minutes = String(now.getMinutes()).padStart(2, '0');
+//   const seconds = String(now.getSeconds()).padStart(2, '0');
 
-  // Poskládáme datum a čas do názvu souboru
-  const ts = `${year}-${month}-${day}_${hours}-${minutes}-${seconds}`;
-  return ts;
-}
+//   // Poskládáme datum a čas do názvu souboru
+//   const ts = `${year}-${month}-${day}_${hours}-${minutes}-${seconds}`;
+//   return ts;
+// }
 
-function clearDataWithBackup() {
-  if (fs.existsSync(path.join(baseDir, 'connections.jsonl'))) {
-    fs.renameSync(
-      path.join(baseDir, 'connections.jsonl'),
-      path.join(baseDir, `connections-${createTimeStamp()}.jsonl.bak`)
-    );
+function clearTestingData() {
+  if (fs.existsSync(path.join(baseDir, 'connections-e2etests.jsonl'))) {
+    fs.unlinkSync(path.join(baseDir, 'connections-e2etests.jsonl'));
   }
 }
 
 module.exports = {
-  clearDataWithBackup,
+  clearTestingData,
 };

packages/api/src/controllers/config.js

@@ -9,6 +9,7 @@ const _ = require('lodash');
 const AsyncLock = require('async-lock');
 const jwt = require('jsonwebtoken');
 
+const processArgs = require('../utility/processArgs');
 const currentVersion = require('../currentVersion');
 const platformInfo = require('../utility/platformInfo');
 const connections = require('../controllers/connections');
@@ -83,7 +84,8 @@ module.exports = {
       isElectron: platformInfo.isElectron,
       isLicenseValid,
       isLicenseExpired: checkedLicense?.isExpired,
-      trialDaysLeft: checkedLicense?.licenseTypeObj?.isTrial && !checkedLicense?.isExpired ? checkedLicense?.daysLeft : null,
+      trialDaysLeft:
+        checkedLicense?.licenseTypeObj?.isTrial && !checkedLicense?.isExpired ? checkedLicense?.daysLeft : null,
       checkedLicense,
       configurationError,
       logoutUrl,
@@ -101,7 +103,10 @@ module.exports = {
       adminPasswordState: adminConfig?.adminPasswordState,
       storageDatabase: process.env.STORAGE_DATABASE,
       logsFilePath: getLogsFilePath(),
-      connectionsFilePath: path.join(datadir(), 'connections.jsonl'),
+      connectionsFilePath: path.join(
+        datadir(),
+        processArgs.runE2eTests ? 'connections-e2etests.jsonl' : 'connections.jsonl'
+      ),
       ...currentVersion,
     };
 

packages/api/src/controllers/connections.js

@@ -199,7 +199,9 @@ module.exports = {
     const dir = datadir();
     if (!portalConnections) {
       // @ts-ignore
-      this.datastore = new JsonLinesDatabase(path.join(dir, 'connections.jsonl'));
+      this.datastore = new JsonLinesDatabase(
+        path.join(dir, processArgs.runE2eTests ? 'connections-e2etests.jsonl' : 'connections.jsonl')
+      );
     }
     await this.checkUnsavedConnectionsLimit();
   },