From b777e56be1bdd292103ae50a4311f4463aab8cea Mon Sep 17 00:00:00 2001
From: andyforrest <46865032+andyforrest@users.noreply.github.com>
Date: Wed, 14 Jun 2023 15:18:18 +0100
Subject: [PATCH] Edit/cypress port (#40764)

* Add db_port as environment variable to cypress config

* Remove commented code in tests/System/plugins/db.js

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>

* Added port for postgres in db.js

---------

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
---
 cypress.config.dist.js     | 1 +
 tests/System/plugins/db.js | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/cypress.config.dist.js b/cypress.config.dist.js
index f57a47d3efd..c402c269e5d 100644
--- a/cypress.config.dist.js
+++ b/cypress.config.dist.js
@@ -33,6 +33,7 @@ module.exports = defineConfig({
     password: 'joomla-17082005',
     db_type: 'MySQLi',
     db_host: 'localhost',
+    db_port: '',
     db_name: 'test_joomla',
     db_user: 'root',
     db_password: '',
diff --git a/tests/System/plugins/db.js b/tests/System/plugins/db.js
index 8e7ce71739f..02ee7b83c89 100644
--- a/tests/System/plugins/db.js
+++ b/tests/System/plugins/db.js
@@ -33,6 +33,7 @@ function queryTestDB(joomlaQuery, config) {
   if (config.env.db_type === 'pgsql' || config.env.db_type === 'PostgreSQL (PDO)') {
     const connection = postgres({
       host: config.env.db_host,
+      port: config.env.db_port,
       database: config.env.db_name,
       username: config.env.db_user,
       password: config.env.db_password,
@@ -73,6 +74,7 @@ function queryTestDB(joomlaQuery, config) {
     // Create the connection and connect
     const connection = mysql.createConnection({
       host: config.env.db_host,
+      port: config.env.db_port,
       user: config.env.db_user,
       password: config.env.db_password,
       database: config.env.db_name,