nexte E2E test DBS

e2e-tests/env/browse-data/.env

@@ -6,3 +6,10 @@ USER_mysql=root
 PASSWORD_mysql=Pwd2020Db
 PORT_mysql=16004
 ENGINE_mysql=mysql@dbgate-plugin-mysql
+
+LABEL_postgres=Postgres-connection
+SERVER_postgres=localhost
+USER_postgres=postgres
+PASSWORD_postgres=Pwd2020Db
+PORT_postgres=16000
+ENGINE_postgres=postgres@dbgate-plugin-postgres

e2e-tests/init/browse-data.js

@@ -1,3 +1,4 @@
+const path = require('path');
 const dbgateApi = require('dbgate-api');
 dbgateApi.initializeApiEnvironment();
 const dbgatePluginMysql = require('dbgate-plugin-mysql');
@@ -5,7 +6,7 @@ dbgateApi.registerPlugins(dbgatePluginMysql);
 const dbgatePluginPostgres = require('dbgate-plugin-postgres');
 dbgateApi.registerPlugins(dbgatePluginPostgres);
 
-async function run() {
+async function initMySqlDatabase(dbname, inputFile) {
   await dbgateApi.executeQuery({
     connection: {
       server: process.env.SERVER_mysql,
@@ -14,7 +15,7 @@ async function run() {
       port: process.env.PORT_mysql,
       engine: 'mysql@dbgate-plugin-mysql',
     },
-    sql: 'drop database if exists Chinook',
+    sql: `drop database if exists ${dbname}`,
   });
 
   await dbgateApi.executeQuery({
@@ -25,7 +26,7 @@ async function run() {
       port: process.env.PORT_mysql,
       engine: 'mysql@dbgate-plugin-mysql',
     },
-    sql: 'create database Chinook',
+    sql: `create database ${dbname}`,
   });
 
   await dbgateApi.importDatabase({
@@ -34,10 +35,55 @@ async function run() {
       user: process.env.USER_mysql,
       password: process.env.PASSWORD_mysql,
       port: process.env.PORT_mysql,
+      database: dbname,
       engine: 'mysql@dbgate-plugin-mysql',
     },
-    inputFile: '../data/Chinook-mysql.sql',
+    inputFile,
   });
 }
 
+async function initPostgresDatabase(dbname, inputFile) {
+  await dbgateApi.executeQuery({
+    connection: {
+      server: process.env.SERVER_postgres,
+      user: process.env.USER_postgres,
+      password: process.env.PASSWORD_postgres,
+      port: process.env.PORT_postgres,
+      engine: 'postgres@dbgate-plugin-postgres',
+    },
+    sql: `drop database if exists "${dbname}"`,
+  });
+
+  await dbgateApi.executeQuery({
+    connection: {
+      server: process.env.SERVER_postgres,
+      user: process.env.USER_postgres,
+      password: process.env.PASSWORD_postgres,
+      port: process.env.PORT_postgres,
+      engine: 'postgres@dbgate-plugin-postgres',
+    },
+    sql: `create database "${dbname}"`,
+  });
+
+  await dbgateApi.importDatabase({
+    connection: {
+      server: process.env.SERVER_postgres,
+      user: process.env.USER_postgres,
+      password: process.env.PASSWORD_postgres,
+      port: process.env.PORT_postgres,
+      database: dbname,
+      engine: 'postgres@dbgate-plugin-postgres',
+    },
+    inputFile,
+  });
+}
+
+async function run() {
+  await initMySqlDatabase('Chinook', path.resolve(path.join(__dirname, '../data/Chinook-mysql.sql')));
+  await initMySqlDatabase('Northwind', path.resolve(path.join(__dirname, '../data/northwind-mysql.sql')));
+  await initMySqlDatabase('Sakila', path.resolve(path.join(__dirname, '../data/sakila-mysql.sql')));
+
+  await initPostgresDatabase('Chinook', path.resolve(path.join(__dirname, '../data/Chinook-postgres.sql')));
+}
+
 dbgateApi.runScript(run);

e2e-tests/package.json

@@ -23,7 +23,7 @@
     "start:add-connection": "cd .. && node packer/build/bundle.js --listen-api --run-e2e-tests",
     "start:portal": "cd .. && env-cmd -f e2e-tests/env/portal/.env node e2e-tests/init/portal.js && env-cmd -f e2e-tests/env/portal/.env node packer/build/bundle.js --listen-api --run-e2e-tests",
     "start:oauth": "cd .. && env-cmd -f e2e-tests/env/oauth/.env node packer/build/bundle.js --listen-api --run-e2e-tests",
-    "start:browse-data": "cd .. && env-cmd -f e2e-tests/env/browse-data/.env node packer/build/bundle.js --listen-api --run-e2e-tests",
+    "start:browse-data": "cd .. && env-cmd -f e2e-tests/env/portal/.env node e2e-tests/init/browse-data.js && env-cmd -f e2e-tests/env/browse-data/.env node packer/build/bundle.js --listen-api --run-e2e-tests",
 
     "test": "start-server-and-test start:add-connection http://localhost:3000 cy:run:add-connection && start-server-and-test start:portal http://localhost:3000 cy:run:portal && start-server-and-test start:oauth http://localhost:3000 cy:run:oauth && start-server-and-test start:browse-data http://localhost:3000 cy:run:browse-data",
     "test:ci": "yarn test"