From f1f5c4e380f98ff8d737860cd6fb898ed69adf85 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 25 Mar 2024 11:47:32 +0200 Subject: [PATCH] temporary debug mode --- .github/workflows/E2E_On_PR.yml | 2 +- docker-compose.8.yml | 2 +- package-lock.json | 8 ++++---- package.json | 2 +- tests/seed/database/prestashop_8.sql | 14 +++++++------- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/E2E_On_PR.yml b/.github/workflows/E2E_On_PR.yml index dfb3d048d..9fcda060d 100755 --- a/.github/workflows/E2E_On_PR.yml +++ b/.github/workflows/E2E_On_PR.yml @@ -28,7 +28,7 @@ jobs: subdomain: 'demoshop8' port: '8002' yml: 'docker-compose.8.yml' - url: 'https://demoshop8.ngrok.io' + url: 'https://demoshop8debug.ngrok.io' test_spec: '**/cypress/e2e/ps8/**' TestRailID: R6470 env: diff --git a/docker-compose.8.yml b/docker-compose.8.yml index 8aef67ee9..b724e53b3 100755 --- a/docker-compose.8.yml +++ b/docker-compose.8.yml @@ -29,7 +29,7 @@ services: DB_PASSWD: $DB_PASSWD DB_NAME: prestashop DB_SERVER: mysql - PS_DOMAIN: demoshop8.ngrok.io + PS_DOMAIN: demoshop8debug.ngrok.io PS_FOLDER_INSTALL: install PS_FOLDER_ADMIN: admin1 depends_on: diff --git a/package-lock.json b/package-lock.json index 7647700e7..fef4507e0 100755 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "ISC", "devDependencies": { "@frsource/cypress-plugin-visual-regression-diff": "^3.3.10", - "cypress": "^13.7.0", + "cypress": "^13.7.1", "cypress-fail-fast": "^7.0.3", "cypress-iframe": "^1.0.1", "cypress-terminal-report": "^5.3.3", @@ -828,9 +828,9 @@ } }, "node_modules/cypress": { - "version": "13.7.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.7.0.tgz", - "integrity": "sha512-UimjRSJJYdTlvkChcdcfywKJ6tUYuwYuk/n1uMMglrvi+ZthNhoRYcxnWgTqUtkl17fXrPAsD5XT2rcQYN1xKA==", + "version": "13.7.1", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.7.1.tgz", + "integrity": "sha512-4u/rpFNxOFCoFX/Z5h+uwlkBO4mWzAjveURi3vqdSu56HPvVdyGTxGw4XKGWt399Y1JwIn9E1L9uMXQpc0o55w==", "dev": true, "hasInstallScript": true, "dependencies": { diff --git a/package.json b/package.json index 783c52dc7..dccc974ab 100755 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "homepage": "https://github.com/mollie/PrestaShop#readme", "devDependencies": { "@frsource/cypress-plugin-visual-regression-diff": "^3.3.10", - "cypress": "^13.7.0", + "cypress": "^13.7.1", "cypress-fail-fast": "^7.0.3", "cypress-iframe": "^1.0.1", "cypress-terminal-report": "^5.3.3", diff --git a/tests/seed/database/prestashop_8.sql b/tests/seed/database/prestashop_8.sql index 1b8c6b81d..588b04dad 100644 --- a/tests/seed/database/prestashop_8.sql +++ b/tests/seed/database/prestashop_8.sql @@ -3217,8 +3217,8 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (231, NULL, NULL, 'HOMESLIDER_PAUSE', '7700', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (232, NULL, NULL, 'HOMESLIDER_LOOP', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (233, NULL, NULL, 'PS_BASE_DISTANCE_UNIT', 'm', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop8.ngrok.io', '0000-00-00 00:00:00', '2024-02-05 10:58:30'), -(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop8.ngrok.io', '0000-00-00 00:00:00', '2024-02-05 10:58:30'), +(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop8debug.ngrok.io', '0000-00-00 00:00:00', '2024-02-05 10:58:30'), +(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop8debug.ngrok.io', '0000-00-00 00:00:00', '2024-02-05 10:58:30'), (236, NULL, NULL, 'PS_SHOP_NAME', 'PrestaShop', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (237, NULL, NULL, 'PS_SHOP_EMAIL', 'demo@prestashop.com', '0000-00-00 00:00:00', '2024-02-05 10:58:31'), (238, NULL, NULL, 'PS_MAIL_METHOD', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3637,10 +3637,10 @@ CREATE TABLE `ps_connections_source` ( ) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_connections_source` (`id_connections_source`, `id_connections`, `http_referer`, `request_uri`, `keywords`, `date_add`) VALUES -(1, 2, '', 'demoshop8.ngrok.io/', '', '2024-02-05 11:01:25'), -(2, 3, '', 'demoshop8.ngrok.io/', '', '2024-02-05 11:01:31'), -(3, 5, '', 'demoshop8.ngrok.io/de/module/mollie/webhook', '', '2024-03-04 16:08:24'), -(4, 6, '', 'demoshop8.ngrok.io/de/module/mollie/webhook', '', '2024-03-04 16:10:22'); +(1, 2, '', 'demoshop8debug.ngrok.io/', '', '2024-02-05 11:01:25'), +(2, 3, '', 'demoshop8debug.ngrok.io/', '', '2024-02-05 11:01:31'), +(3, 5, '', 'demoshop8debug.ngrok.io/de/module/mollie/webhook', '', '2024-03-04 16:08:24'), +(4, 6, '', 'demoshop8debug.ngrok.io/de/module/mollie/webhook', '', '2024-03-04 16:10:22'); DROP TABLE IF EXISTS `ps_contact`; CREATE TABLE `ps_contact` ( @@ -14291,7 +14291,7 @@ CREATE TABLE `ps_shop_url` ( ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_shop_url` (`id_shop_url`, `id_shop`, `domain`, `domain_ssl`, `physical_uri`, `virtual_uri`, `main`, `active`) VALUES -(1, 1, 'demoshop8.ngrok.io', 'demoshop8.ngrok.io', '/', '', 1, 1); +(1, 1, 'demoshop8debug.ngrok.io', 'demoshop8debug.ngrok.io', '/', '', 1, 1); DROP TABLE IF EXISTS `ps_smarty_cache`; CREATE TABLE `ps_smarty_cache` (