Move db setup code to plugins file (#40098)

* Move db setup code to plugins file * require
joomla · Mar 13, 2023 · 52715d6 · 52715d6
1 parent 90435d6
commit 52715d6
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 47 deletions.
diff --git a/cypress.config.dist.js b/cypress.config.dist.js
@@ -1,6 +1,5 @@
 const { defineConfig } = require('cypress');
-const mysql = require('mysql');
-const postgres = require('postgres');
+const setupPlugins =require('./tests/cypress/plugins/index');
 
 module.exports = defineConfig({
   fixturesFolder: 'tests/cypress/fixtures',
@@ -10,51 +9,7 @@ module.exports = defineConfig({
   viewportWidth: 1200,
   e2e: {
     setupNodeEvents(on, config) {
-      function queryTestDB(query, config) {
-        if (config.env.db_type === 'pgsql' || config.env.db_type === 'PostgreSQL (PDO)') {
-          const connection = postgres({
-            host: config.env.db_host,
-            database: config.env.db_name,
-            username: config.env.db_user,
-            password: config.env.db_password,
-            idle_timeout: 5,
-            max_lifetime: 60
-          });
-
-          // Postgres delivers the data direct as result of the insert query
-          if (query.indexOf('INSERT') === 0) {
-            query += ' returning *'
-          }
-
-          // Postgres needs double quotes
-          query = query.replaceAll('\`', '"');
-
-          return connection.unsafe(query).then((result) => {
-            if (query.indexOf('INSERT') !== 0 || result.length === 0) {
-              return result;
-            }
-
-            // Normalize the object
-            return {insertId: result[0].id};
-          });
-        }
-
-        return new Promise((resolve, reject) => {
-          const connection = mysql.createConnection({
-            host: config.env.db_host,
-            user: config.env.db_user,
-            password: config.env.db_password,
-            database: config.env.db_name
-          });
-          connection.connect();
-
-          connection.query(query, (error, results) => !error || !error.errno ? resolve(results) : reject(error));
-        });
-      }
-
-      on('task', {
-        queryDB: (query) => queryTestDB(query.replace('#__', config.env.db_prefix), config)
-      });
+      setupPlugins(on, config);
     },
     baseUrl: 'http://localhost/',
     specPattern: [

diff --git a/tests/cypress/plugins/.gitkeep b/tests/cypress/plugins/.gitkeep
diff --git a/tests/cypress/plugins/index.js b/tests/cypress/plugins/index.js
@@ -0,0 +1,52 @@
+const mysql = require('mysql');
+const postgres = require('postgres');
+
+function queryTestDB(query, config) {
+  if (config.env.db_type === 'pgsql' || config.env.db_type === 'PostgreSQL (PDO)') {
+    const connection = postgres({
+      host: config.env.db_host,
+      database: config.env.db_name,
+      username: config.env.db_user,
+      password: config.env.db_password,
+      idle_timeout: 5,
+      max_lifetime: 60
+    });
+
+    // Postgres delivers the data direct as result of the insert query
+    if (query.indexOf('INSERT') === 0) {
+      query += ' returning *'
+    }
+
+    // Postgres needs double quotes
+    query = query.replaceAll('\`', '"');
+
+    return connection.unsafe(query).then((result) => {
+      if (query.indexOf('INSERT') !== 0 || result.length === 0) {
+        return result;
+      }
+
+      // Normalize the object
+      return { insertId: result[0].id };
+    });
+  }
+
+  return new Promise((resolve, reject) => {
+    const connection = mysql.createConnection({
+      host: config.env.db_host,
+      user: config.env.db_user,
+      password: config.env.db_password,
+      database: config.env.db_name
+    });
+    connection.connect();
+
+    connection.query(query, (error, results) => !error || !error.errno ? resolve(results) : reject(error));
+  });
+};
+
+function setupPlugins(on, config) {
+  on('task', {
+    queryDB: (query) => queryTestDB(query.replace('#__', config.env.db_prefix), config)
+  });
+}
+
+module.exports = setupPlugins;