From d93da8f99de50d2b5c82caf9d3893c34145af6b4 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 22 Apr 2024 10:12:06 +0300 Subject: [PATCH 01/10] debug mode --- .github/workflows/E2E_On_PR.yml | 2 +- docker-compose.8.yml | 2 +- tests/seed/database/prestashop_8.sql | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/E2E_On_PR.yml b/.github/workflows/E2E_On_PR.yml index 119cf4207..b27674114 100755 --- a/.github/workflows/E2E_On_PR.yml +++ b/.github/workflows/E2E_On_PR.yml @@ -29,7 +29,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/tests/seed/database/prestashop_8.sql b/tests/seed/database/prestashop_8.sql index 22e1c4b0f..d3a65cbe1 100644 --- a/tests/seed/database/prestashop_8.sql +++ b/tests/seed/database/prestashop_8.sql @@ -3267,8 +3267,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'), @@ -3707,11 +3707,11 @@ CREATE TABLE `ps_connections_source` ( ) ENGINE=InnoDB 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'), -(5, 9, '', 'demoshop8.ngrok.io/en/', '', '2024-04-08 17:54:05'); +(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'), +(5, 9, '', 'demoshop8debug.ngrok.io/en/', '', '2024-04-08 17:54:05'); DROP TABLE IF EXISTS `ps_contact`; CREATE TABLE `ps_contact` ( @@ -15070,7 +15070,7 @@ CREATE TABLE `ps_shop_url` ( ) ENGINE=InnoDB 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` ( From 600e2c38aff2a62e4c7136afb2dfd69c086b87ef Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 22 Apr 2024 10:14:09 +0300 Subject: [PATCH 02/10] cypress update --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index cdaa595ef..b635b9eab 100755 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@cypress/vue": "^6.0.0", "@frsource/cypress-plugin-visual-regression-diff": "^3.3.10", - "cypress": "^13.7.3", + "cypress": "^13.8.0", "cypress-fail-fast": "^7.0.3", "cypress-iframe": "^1.0.1", "cypress-shadow-dom": "^1.4.1", @@ -984,9 +984,9 @@ "peer": true }, "node_modules/cypress": { - "version": "13.7.3", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.7.3.tgz", - "integrity": "sha512-uoecY6FTCAuIEqLUYkTrxamDBjMHTYak/1O7jtgwboHiTnS1NaMOoR08KcTrbRZFCBvYOiS4tEkQRmsV+xcrag==", + "version": "13.8.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.8.0.tgz", + "integrity": "sha512-Qau//mtrwEGOU9cn2YjavECKyDUwBh8J2tit+y9s1wsv6C3BX+rlv6I9afmQnL8PmEEzJ6be7nppMHacFzZkTw==", "dev": true, "hasInstallScript": true, "dependencies": { diff --git a/package.json b/package.json index 873153d1f..319b3281f 100755 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "devDependencies": { "@cypress/vue": "^6.0.0", "@frsource/cypress-plugin-visual-regression-diff": "^3.3.10", - "cypress": "^13.7.3", + "cypress": "^13.8.0", "cypress-fail-fast": "^7.0.3", "cypress-iframe": "^1.0.1", "cypress-shadow-dom": "^1.4.1", From 6a60105babd9410805be4fcf58023f180e8f7b3e Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 22 Apr 2024 12:05:28 +0300 Subject: [PATCH 03/10] adding Bancomat payment method to E2E --- .../ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js | 18 ++++++++++++++++++ cypress/support/commands.js | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js b/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js index 529e4ba30..172e99e41 100755 --- a/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js +++ b/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js @@ -325,4 +325,22 @@ it('C1860460: Pay with Klarna UK Checkouting [Orders API]', () => { it('C1860461: Pay with Klarna UK Order Shipping, Refunding [Orders API]', () => { cy.OrderShippingRefundingOrdersAPI() }) +it.only('C3006613: Bancomat Checkouting [Orders API]', () => { + cy.visit('/en/order-history') + cy.contains('Reorder').click() + cy.contains('DE').click({force:true}) + //Billing country LT, DE etc. + cy.get('.clearfix > .btn').click() + cy.get('#js-delivery > .continue').click() + //Payment method choosing + cy.contains('Bancomat').click({force:true}) + cy.get('.condition-label > .js-terms').click({force:true}) + cy.contains('Place order').click() + cy.get('[value="paid"]').click() + cy.get('[class="button form__button"]').click() + cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') +}); +it.only('C3006614: Bancomat Order Shipping, Refunding [Orders API]', () => { + cy.OrderShippingRefundingOrdersAPI() +}) }) diff --git a/cypress/support/commands.js b/cypress/support/commands.js index 6f976a0ba..860faab4d 100755 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -42,7 +42,7 @@ import 'cypress-iframe'; // Cypress.Commands.add("login", (email, password) => { ... }) Cypress.Commands.add("ConfOrdersAPI1784", () => { - const paymentMethods = ["applepay", "ideal", "creditcard", "in3", "klarnapaylater", "klarnapaynow", "klarnasliceit", "paypal", "banktransfer", "bancontact", "eps", "giropay", "przelewy24", "kbc", "belfius", "voucher", "directdebit", "billie", "klarna", "twint", "blik"]; + const paymentMethods = ["applepay", "ideal", "creditcard", "in3", "klarnapaylater", "klarnapaynow", "klarnasliceit", "paypal", "banktransfer", "bancontact", "eps", "giropay", "przelewy24", "kbc", "belfius", "voucher", "directdebit", "billie", "klarna", "twint", "blik", "bancomatpay"]; // Iterate through the paymentMethods array using forEach paymentMethods.forEach(method => { @@ -59,7 +59,7 @@ Cypress.Commands.add("ConfOrdersAPI1784", () => { }) Cypress.Commands.add("ConfPaymentsAPI1784", () => { - const paymentMethods = ["giropay", "eps", "przelewy24", "kbc", "belfius", "bancontact", "creditcard", "ideal", "banktransfer", "paypal", "applepay", "twint", "blik"]; + const paymentMethods = ["giropay", "eps", "przelewy24", "kbc", "belfius", "bancontact", "creditcard", "ideal", "banktransfer", "paypal", "applepay", "twint", "blik", "bancomatpay"]; // Iterate through the paymentMethods array using forEach paymentMethods.forEach(method => { From 6d2f7a1f4d6d2138ab246a6cdc4ba6b929d9884d Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 22 Apr 2024 12:34:51 +0300 Subject: [PATCH 04/10] adding Bancomat cases to the test suite --- .../e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js | 4 ++-- .../ps8/05_mollie.ps8.PaymentTestsPaymentsAPI.js | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js b/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js index 172e99e41..85586a8c3 100755 --- a/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js +++ b/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js @@ -325,7 +325,7 @@ it('C1860460: Pay with Klarna UK Checkouting [Orders API]', () => { it('C1860461: Pay with Klarna UK Order Shipping, Refunding [Orders API]', () => { cy.OrderShippingRefundingOrdersAPI() }) -it.only('C3006613: Bancomat Checkouting [Orders API]', () => { +it('C3006613: Bancomat Checkouting [Orders API]', () => { cy.visit('/en/order-history') cy.contains('Reorder').click() cy.contains('DE').click({force:true}) @@ -340,7 +340,7 @@ it.only('C3006613: Bancomat Checkouting [Orders API]', () => { cy.get('[class="button form__button"]').click() cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') }); -it.only('C3006614: Bancomat Order Shipping, Refunding [Orders API]', () => { +it('C3006614: Bancomat Order Shipping, Refunding [Orders API]', () => { cy.OrderShippingRefundingOrdersAPI() }) }) diff --git a/cypress/e2e/ps8/05_mollie.ps8.PaymentTestsPaymentsAPI.js b/cypress/e2e/ps8/05_mollie.ps8.PaymentTestsPaymentsAPI.js index d37178d39..fd98721ef 100755 --- a/cypress/e2e/ps8/05_mollie.ps8.PaymentTestsPaymentsAPI.js +++ b/cypress/e2e/ps8/05_mollie.ps8.PaymentTestsPaymentsAPI.js @@ -236,4 +236,17 @@ it('C339401: 66 Bank Transfer Checkouting [Payments API]', () => { it.skip('C339402: 67 Bank Transfer BO Refunding, Partial Refunding [Payments API]', () => { // somehow an error in console is thrown, will check why. Temporary skipping, because Mollie block is not loaded properly cy.OrderRefundingPartialPaymentsAPI() }) +it('C3006615: Bancomat Checkouting [Payments API]', () => { + cy.navigatingToThePaymentPS8() + //Payment method choosing + cy.contains('Belfius').click({force:true}) + cy.get('.condition-label > .js-terms').click({force:true}) + cy.contains('Place order').click() + cy.get('[value="paid"]').click() + cy.get('[class="button form__button"]').click() + cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') +}); +it('C3006616: Bancomat BO Refunding, Partial Refunding [Payments API]', () => { + cy.OrderRefundingPartialPaymentsAPI() +}) }) From 919b91f8f25336bfcf40ead40af9f58aace2ce7a Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 22 Apr 2024 13:18:22 +0300 Subject: [PATCH 05/10] disabling debug --- .github/workflows/E2E_On_PR.yml | 2 +- docker-compose.8.yml | 2 +- tests/seed/database/prestashop_8.sql | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/E2E_On_PR.yml b/.github/workflows/E2E_On_PR.yml index b27674114..119cf4207 100755 --- a/.github/workflows/E2E_On_PR.yml +++ b/.github/workflows/E2E_On_PR.yml @@ -29,7 +29,7 @@ jobs: subdomain: 'demoshop8' port: '8002' yml: 'docker-compose.8.yml' - url: 'https://demoshop8debug.ngrok.io' + url: 'https://demoshop8.ngrok.io' test_spec: '**/cypress/e2e/ps8/**' TestRailID: R6470 env: diff --git a/docker-compose.8.yml b/docker-compose.8.yml index b724e53b3..8aef67ee9 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: demoshop8debug.ngrok.io + PS_DOMAIN: demoshop8.ngrok.io PS_FOLDER_INSTALL: install PS_FOLDER_ADMIN: admin1 depends_on: diff --git a/tests/seed/database/prestashop_8.sql b/tests/seed/database/prestashop_8.sql index d3a65cbe1..22e1c4b0f 100644 --- a/tests/seed/database/prestashop_8.sql +++ b/tests/seed/database/prestashop_8.sql @@ -3267,8 +3267,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', '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'), +(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'), (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'), @@ -3707,11 +3707,11 @@ CREATE TABLE `ps_connections_source` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_connections_source` (`id_connections_source`, `id_connections`, `http_referer`, `request_uri`, `keywords`, `date_add`) VALUES -(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'), -(5, 9, '', 'demoshop8debug.ngrok.io/en/', '', '2024-04-08 17:54:05'); +(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'), +(5, 9, '', 'demoshop8.ngrok.io/en/', '', '2024-04-08 17:54:05'); DROP TABLE IF EXISTS `ps_contact`; CREATE TABLE `ps_contact` ( @@ -15070,7 +15070,7 @@ CREATE TABLE `ps_shop_url` ( ) ENGINE=InnoDB 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, 'demoshop8debug.ngrok.io', 'demoshop8debug.ngrok.io', '/', '', 1, 1); +(1, 1, 'demoshop8.ngrok.io', 'demoshop8.ngrok.io', '/', '', 1, 1); DROP TABLE IF EXISTS `ps_smarty_cache`; CREATE TABLE `ps_smarty_cache` ( From 5b624743ab48b54a22b58b23dd09ebf984068d27 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 6 May 2024 09:52:14 +0300 Subject: [PATCH 06/10] temporary debug mode, cypress bump --- .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 | 16 ++++++++-------- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/E2E_On_PR.yml b/.github/workflows/E2E_On_PR.yml index 119cf4207..b27674114 100755 --- a/.github/workflows/E2E_On_PR.yml +++ b/.github/workflows/E2E_On_PR.yml @@ -29,7 +29,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 b635b9eab..a89dbdc48 100755 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@cypress/vue": "^6.0.0", "@frsource/cypress-plugin-visual-regression-diff": "^3.3.10", - "cypress": "^13.8.0", + "cypress": "^13.8.1", "cypress-fail-fast": "^7.0.3", "cypress-iframe": "^1.0.1", "cypress-shadow-dom": "^1.4.1", @@ -984,9 +984,9 @@ "peer": true }, "node_modules/cypress": { - "version": "13.8.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.8.0.tgz", - "integrity": "sha512-Qau//mtrwEGOU9cn2YjavECKyDUwBh8J2tit+y9s1wsv6C3BX+rlv6I9afmQnL8PmEEzJ6be7nppMHacFzZkTw==", + "version": "13.8.1", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.8.1.tgz", + "integrity": "sha512-Uk6ovhRbTg6FmXjeZW/TkbRM07KPtvM5gah1BIMp4Y2s+i/NMxgaLw0+PbYTOdw1+egE0FP3mWRiGcRkjjmhzA==", "dev": true, "hasInstallScript": true, "dependencies": { diff --git a/package.json b/package.json index 319b3281f..66bf1c70c 100755 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "devDependencies": { "@cypress/vue": "^6.0.0", "@frsource/cypress-plugin-visual-regression-diff": "^3.3.10", - "cypress": "^13.8.0", + "cypress": "^13.8.1", "cypress-fail-fast": "^7.0.3", "cypress-iframe": "^1.0.1", "cypress-shadow-dom": "^1.4.1", diff --git a/tests/seed/database/prestashop_8.sql b/tests/seed/database/prestashop_8.sql index 22e1c4b0f..d3a65cbe1 100644 --- a/tests/seed/database/prestashop_8.sql +++ b/tests/seed/database/prestashop_8.sql @@ -3267,8 +3267,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'), @@ -3707,11 +3707,11 @@ CREATE TABLE `ps_connections_source` ( ) ENGINE=InnoDB 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'), -(5, 9, '', 'demoshop8.ngrok.io/en/', '', '2024-04-08 17:54:05'); +(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'), +(5, 9, '', 'demoshop8debug.ngrok.io/en/', '', '2024-04-08 17:54:05'); DROP TABLE IF EXISTS `ps_contact`; CREATE TABLE `ps_contact` ( @@ -15070,7 +15070,7 @@ CREATE TABLE `ps_shop_url` ( ) ENGINE=InnoDB 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` ( From f59c46b86a97ec79f9ea7b6508a37a476c39d325 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 6 May 2024 10:32:00 +0300 Subject: [PATCH 07/10] improving test --- cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js b/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js index 97238d31e..677f086dc 100755 --- a/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js +++ b/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js @@ -45,6 +45,7 @@ it('C339339: Checking the Advanced Settings tab, verifying the Front-end compone cy.get('[href="#advanced_settings"]').click({force:true}) cy.advancedSettingsValidation() cy.reload() + cy.wait(3000) cy.matchImage(); // let's make a snapshot for visual regression testing later, if UI matches }); it('C688472: Checking the Subscriptions tab, and console errors', () => { @@ -57,6 +58,7 @@ it('C688473: Checking the Subscriptions FAQ, and console errors', () => { cy.OpeningModuleDashboardURL() cy.get('#subtab-AdminMollieSubscriptionFAQ').click() cy.subscriptionsUiCheck() + cy.wait(3000) cy.matchImage(); // let's make a snapshot for visual regression testing later, if UI matches }); }) From 52e233a7fd95863efa9afdcb4f91bb6236ccf31f Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 6 May 2024 11:47:09 +0300 Subject: [PATCH 08/10] improving test --- cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js b/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js index 677f086dc..59fa955fa 100755 --- a/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js +++ b/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js @@ -28,6 +28,7 @@ it('C339305: Connecting test API successsfully', () => { cy.log(text) // Showing and asserting the text that loaded, to ensure the BO is loaded, not crashed with PHP fatals etc. }) cy.iframe('[id^="uid_"]').find('button').click() // Cloudsync validation + cy.wait(10000) cy.get('#MOLLIE_ACCOUNT_SWITCH_on').click({force:true}) cy.get('#MOLLIE_API_KEY_TEST').type((Cypress.env('MOLLIE_TEST_API_KEY')),{delay: 0, log: false}) cy.get('#module_form_submit_btn').click() From 2e127cee8196133f40f67d6597c3fb01473a3ab3 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 6 May 2024 12:03:42 +0300 Subject: [PATCH 09/10] improving test --- cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js b/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js index 59fa955fa..fe683dc94 100755 --- a/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js +++ b/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js @@ -28,7 +28,7 @@ it('C339305: Connecting test API successsfully', () => { cy.log(text) // Showing and asserting the text that loaded, to ensure the BO is loaded, not crashed with PHP fatals etc. }) cy.iframe('[id^="uid_"]').find('button').click() // Cloudsync validation - cy.wait(10000) + cy.wait(15000) // Waiting for validation to process until the end cy.get('#MOLLIE_ACCOUNT_SWITCH_on').click({force:true}) cy.get('#MOLLIE_API_KEY_TEST').type((Cypress.env('MOLLIE_TEST_API_KEY')),{delay: 0, log: false}) cy.get('#module_form_submit_btn').click() From 092a5d141b387e8b7996f88f83c1bec68cb62f5e Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 6 May 2024 14:02:42 +0300 Subject: [PATCH 10/10] disabling debug --- .github/workflows/E2E_On_PR.yml | 2 +- docker-compose.8.yml | 2 +- tests/seed/database/prestashop_8.sql | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/E2E_On_PR.yml b/.github/workflows/E2E_On_PR.yml index b27674114..119cf4207 100755 --- a/.github/workflows/E2E_On_PR.yml +++ b/.github/workflows/E2E_On_PR.yml @@ -29,7 +29,7 @@ jobs: subdomain: 'demoshop8' port: '8002' yml: 'docker-compose.8.yml' - url: 'https://demoshop8debug.ngrok.io' + url: 'https://demoshop8.ngrok.io' test_spec: '**/cypress/e2e/ps8/**' TestRailID: R6470 env: diff --git a/docker-compose.8.yml b/docker-compose.8.yml index b724e53b3..8aef67ee9 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: demoshop8debug.ngrok.io + PS_DOMAIN: demoshop8.ngrok.io PS_FOLDER_INSTALL: install PS_FOLDER_ADMIN: admin1 depends_on: diff --git a/tests/seed/database/prestashop_8.sql b/tests/seed/database/prestashop_8.sql index d3a65cbe1..22e1c4b0f 100644 --- a/tests/seed/database/prestashop_8.sql +++ b/tests/seed/database/prestashop_8.sql @@ -3267,8 +3267,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', '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'), +(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'), (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'), @@ -3707,11 +3707,11 @@ CREATE TABLE `ps_connections_source` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_connections_source` (`id_connections_source`, `id_connections`, `http_referer`, `request_uri`, `keywords`, `date_add`) VALUES -(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'), -(5, 9, '', 'demoshop8debug.ngrok.io/en/', '', '2024-04-08 17:54:05'); +(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'), +(5, 9, '', 'demoshop8.ngrok.io/en/', '', '2024-04-08 17:54:05'); DROP TABLE IF EXISTS `ps_contact`; CREATE TABLE `ps_contact` ( @@ -15070,7 +15070,7 @@ CREATE TABLE `ps_shop_url` ( ) ENGINE=InnoDB 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, 'demoshop8debug.ngrok.io', 'demoshop8debug.ngrok.io', '/', '', 1, 1); +(1, 1, 'demoshop8.ngrok.io', 'demoshop8.ngrok.io', '/', '', 1, 1); DROP TABLE IF EXISTS `ps_smarty_cache`; CREATE TABLE `ps_smarty_cache` (