From bccb2b3f727551f0f7951d7d9b6bce464cfcb32a Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 13 May 2024 16:14:02 +0300 Subject: [PATCH 1/8] increasing Cypress version --- 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 a89dbdc48..7e7a0d830 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.1", + "cypress": "^13.9.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.8.1", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.8.1.tgz", - "integrity": "sha512-Uk6ovhRbTg6FmXjeZW/TkbRM07KPtvM5gah1BIMp4Y2s+i/NMxgaLw0+PbYTOdw1+egE0FP3mWRiGcRkjjmhzA==", + "version": "13.9.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.9.0.tgz", + "integrity": "sha512-atNjmYfHsvTuCaxTxLZr9xGoHz53LLui3266WWxXJHY7+N6OdwJdg/feEa3T+buez9dmUXHT1izCOklqG82uCQ==", "dev": true, "hasInstallScript": true, "dependencies": { diff --git a/package.json b/package.json index 66bf1c70c..d13d14a15 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.1", + "cypress": "^13.9.0", "cypress-fail-fast": "^7.0.3", "cypress-iframe": "^1.0.1", "cypress-shadow-dom": "^1.4.1", From 6a1152403f3a597938594146831ab207fdc95c01 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 13 May 2024 16:35:28 +0300 Subject: [PATCH 2/8] debug mode, adding new E2E Alma payment --- .github/workflows/E2E_On_PR.yml | 2 +- .../03_mollie.ps1785.PaymentTestsOrdersAPI.js | 18 ++++++++++++++++++ ...05_mollie.ps1785.PaymentTestsPaymentsAPI.js | 13 +++++++++++++ .../ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js | 18 ++++++++++++++++++ .../05_mollie.ps8.PaymentTestsPaymentsAPI.js | 13 +++++++++++++ docker-compose.8.yml | 2 +- tests/seed/database/prestashop_8.sql | 16 ++++++++-------- 7 files changed, 72 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/cypress/e2e/ps1785/03_mollie.ps1785.PaymentTestsOrdersAPI.js b/cypress/e2e/ps1785/03_mollie.ps1785.PaymentTestsOrdersAPI.js index 9f28a15a3..e4f524f3f 100755 --- a/cypress/e2e/ps1785/03_mollie.ps1785.PaymentTestsOrdersAPI.js +++ b/cypress/e2e/ps1785/03_mollie.ps1785.PaymentTestsOrdersAPI.js @@ -377,4 +377,22 @@ it('TWINT Checkouting [Orders API]', () => { it('TWINT Order Shipping, Refunding [Orders API]', () => { cy.OrderShippingRefundingOrdersAPI() }) +it('C3006826: Alma 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('C3006827: Alma Order Shipping, Refunding [Orders API]', () => { + cy.OrderShippingRefundingOrdersAPI() +}) }) diff --git a/cypress/e2e/ps1785/05_mollie.ps1785.PaymentTestsPaymentsAPI.js b/cypress/e2e/ps1785/05_mollie.ps1785.PaymentTestsPaymentsAPI.js index faffc9163..d004d0c78 100755 --- a/cypress/e2e/ps1785/05_mollie.ps1785.PaymentTestsPaymentsAPI.js +++ b/cypress/e2e/ps1785/05_mollie.ps1785.PaymentTestsPaymentsAPI.js @@ -291,4 +291,17 @@ it('TWINT Checkouting [Payments API]', () => { it('TWINT Order Shipping, Refunding [Payments API]', () => { cy.OrderRefundingPartialPaymentsAPI() }) +it('C3006827: Alma 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('C3006826: Alma BO Refunding, Partial Refunding [Payments API]', () => { + cy.OrderRefundingPartialPaymentsAPI() +}) }) diff --git a/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js b/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js index 85586a8c3..77a7e162f 100755 --- a/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js +++ b/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js @@ -343,4 +343,22 @@ it('C3006613: Bancomat Checkouting [Orders API]', () => { it('C3006614: Bancomat Order Shipping, Refunding [Orders API]', () => { cy.OrderShippingRefundingOrdersAPI() }) +it.only('C3006826: Alma 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('C3006827: Alma 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 fd98721ef..1eceaae87 100755 --- a/cypress/e2e/ps8/05_mollie.ps8.PaymentTestsPaymentsAPI.js +++ b/cypress/e2e/ps8/05_mollie.ps8.PaymentTestsPaymentsAPI.js @@ -249,4 +249,17 @@ it('C3006615: Bancomat Checkouting [Payments API]', () => { it('C3006616: Bancomat BO Refunding, Partial Refunding [Payments API]', () => { cy.OrderRefundingPartialPaymentsAPI() }) +it.only('C3006826: Alma 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.only('C3006827: Alma BO Refunding, Partial Refunding [Payments API]', () => { + cy.OrderRefundingPartialPaymentsAPI() +}) }) 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 8c9c8a3d3b96662d44e0139b178bf1b90d23ea9a Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 13 May 2024 16:41:27 +0300 Subject: [PATCH 3/8] alma adding in support file --- cypress/support/commands.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cypress/support/commands.js b/cypress/support/commands.js index 860faab4d..6fe9da687 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", "bancomatpay"]; + const paymentMethods = ["applepay", "ideal", "creditcard", "in3", "klarnapaylater", "klarnapaynow", "klarnasliceit", "paypal", "banktransfer", "bancontact", "eps", "giropay", "przelewy24", "kbc", "belfius", "voucher", "directdebit", "billie", "klarna", "twint", "blik", "bancomatpay", "alma"]; // 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", "bancomatpay"]; + const paymentMethods = ["giropay", "eps", "przelewy24", "kbc", "belfius", "bancontact", "creditcard", "ideal", "banktransfer", "paypal", "applepay", "twint", "blik", "bancomatpay", "alma"]; // Iterate through the paymentMethods array using forEach paymentMethods.forEach(method => { From 527d59cc793dc61473b2842b412d52146c2da1c1 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 13 May 2024 16:52:37 +0300 Subject: [PATCH 4/8] small typo --- cypress/e2e/ps1785/03_mollie.ps1785.PaymentTestsOrdersAPI.js | 2 +- cypress/e2e/ps1785/05_mollie.ps1785.PaymentTestsPaymentsAPI.js | 2 +- cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js | 2 +- cypress/e2e/ps8/05_mollie.ps8.PaymentTestsPaymentsAPI.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cypress/e2e/ps1785/03_mollie.ps1785.PaymentTestsOrdersAPI.js b/cypress/e2e/ps1785/03_mollie.ps1785.PaymentTestsOrdersAPI.js index e4f524f3f..d86884093 100755 --- a/cypress/e2e/ps1785/03_mollie.ps1785.PaymentTestsOrdersAPI.js +++ b/cypress/e2e/ps1785/03_mollie.ps1785.PaymentTestsOrdersAPI.js @@ -385,7 +385,7 @@ it('C3006826: Alma Checkouting [Orders API]', () => { cy.get('.clearfix > .btn').click() cy.get('#js-delivery > .continue').click() //Payment method choosing - cy.contains('Bancomat').click({force:true}) + cy.contains('Alma').click({force:true}) cy.get('.condition-label > .js-terms').click({force:true}) cy.contains('Place order').click() cy.get('[value="paid"]').click() diff --git a/cypress/e2e/ps1785/05_mollie.ps1785.PaymentTestsPaymentsAPI.js b/cypress/e2e/ps1785/05_mollie.ps1785.PaymentTestsPaymentsAPI.js index d004d0c78..126ece2dc 100755 --- a/cypress/e2e/ps1785/05_mollie.ps1785.PaymentTestsPaymentsAPI.js +++ b/cypress/e2e/ps1785/05_mollie.ps1785.PaymentTestsPaymentsAPI.js @@ -294,7 +294,7 @@ it('TWINT Order Shipping, Refunding [Payments API]', () => { it('C3006827: Alma Checkouting [Payments API]', () => { cy.navigatingToThePaymentPS8() //Payment method choosing - cy.contains('Belfius').click({force:true}) + cy.contains('Alma').click({force:true}) cy.get('.condition-label > .js-terms').click({force:true}) cy.contains('Place order').click() cy.get('[value="paid"]').click() diff --git a/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js b/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js index 77a7e162f..d0396e77c 100755 --- a/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js +++ b/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js @@ -351,7 +351,7 @@ it.only('C3006826: Alma Checkouting [Orders API]', () => { cy.get('.clearfix > .btn').click() cy.get('#js-delivery > .continue').click() //Payment method choosing - cy.contains('Bancomat').click({force:true}) + cy.contains('Alma').click({force:true}) cy.get('.condition-label > .js-terms').click({force:true}) cy.contains('Place order').click() cy.get('[value="paid"]').click() diff --git a/cypress/e2e/ps8/05_mollie.ps8.PaymentTestsPaymentsAPI.js b/cypress/e2e/ps8/05_mollie.ps8.PaymentTestsPaymentsAPI.js index 1eceaae87..b1f783e22 100755 --- a/cypress/e2e/ps8/05_mollie.ps8.PaymentTestsPaymentsAPI.js +++ b/cypress/e2e/ps8/05_mollie.ps8.PaymentTestsPaymentsAPI.js @@ -252,7 +252,7 @@ it('C3006616: Bancomat BO Refunding, Partial Refunding [Payments API]', () => { it.only('C3006826: Alma Checkouting [Payments API]', () => { cy.navigatingToThePaymentPS8() //Payment method choosing - cy.contains('Belfius').click({force:true}) + cy.contains('Alma').click({force:true}) cy.get('.condition-label > .js-terms').click({force:true}) cy.contains('Place order').click() cy.get('[value="paid"]').click() From 76cc7de7c442296dcff22e4a2a9e59ca99d6d065 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 13 May 2024 17:08:28 +0300 Subject: [PATCH 5/8] removing debug, removing it.only() --- .github/workflows/E2E_On_PR.yml | 2 +- .../ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js | 4 ++-- .../ps8/05_mollie.ps8.PaymentTestsPaymentsAPI.js | 4 ++-- docker-compose.8.yml | 2 +- tests/seed/database/prestashop_8.sql | 16 ++++++++-------- 5 files changed, 14 insertions(+), 14 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/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js b/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js index d0396e77c..fd49bd2b5 100755 --- a/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js +++ b/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js @@ -343,7 +343,7 @@ it('C3006613: Bancomat Checkouting [Orders API]', () => { it('C3006614: Bancomat Order Shipping, Refunding [Orders API]', () => { cy.OrderShippingRefundingOrdersAPI() }) -it.only('C3006826: Alma Checkouting [Orders API]', () => { +it('C3006826: Alma Checkouting [Orders API]', () => { cy.visit('/en/order-history') cy.contains('Reorder').click() cy.contains('DE').click({force:true}) @@ -358,7 +358,7 @@ it.only('C3006826: Alma Checkouting [Orders API]', () => { cy.get('[class="button form__button"]').click() cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') }); -it.only('C3006827: Alma Order Shipping, Refunding [Orders API]', () => { +it('C3006827: Alma 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 b1f783e22..d2672cbae 100755 --- a/cypress/e2e/ps8/05_mollie.ps8.PaymentTestsPaymentsAPI.js +++ b/cypress/e2e/ps8/05_mollie.ps8.PaymentTestsPaymentsAPI.js @@ -249,7 +249,7 @@ it('C3006615: Bancomat Checkouting [Payments API]', () => { it('C3006616: Bancomat BO Refunding, Partial Refunding [Payments API]', () => { cy.OrderRefundingPartialPaymentsAPI() }) -it.only('C3006826: Alma Checkouting [Payments API]', () => { +it('C3006826: Alma Checkouting [Payments API]', () => { cy.navigatingToThePaymentPS8() //Payment method choosing cy.contains('Alma').click({force:true}) @@ -259,7 +259,7 @@ it.only('C3006826: Alma Checkouting [Payments API]', () => { cy.get('[class="button form__button"]').click() cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') }); -it.only('C3006827: Alma BO Refunding, Partial Refunding [Payments API]', () => { +it('C3006827: Alma BO Refunding, Partial Refunding [Payments API]', () => { cy.OrderRefundingPartialPaymentsAPI() }) }) 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 7ae16b94bd3f4bcf28fe439c5a5bdb730fb596e3 Mon Sep 17 00:00:00 2001 From: Justas Vaitkus Date: Tue, 19 Nov 2024 15:23:42 +0200 Subject: [PATCH 6/8] removing cloudsync validation as it causes delay --- cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js b/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js index fe683dc94..ee139ce78 100755 --- a/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js +++ b/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js @@ -27,8 +27,8 @@ it('C339305: Connecting test API successsfully', () => { .then((text) => { 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(15000) // Waiting for validation to process until the end + // cy.iframe('[id^="uid_"]').find('button').click() // Cloudsync validation + // 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 6e01648e55d7be40e722bc2a565a523162aae5dc Mon Sep 17 00:00:00 2001 From: Justas Vaitkus Date: Fri, 29 Nov 2024 09:38:57 +0200 Subject: [PATCH 7/8] removed giropay --- cypress/support/commands.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/support/commands.js b/cypress/support/commands.js index 6fe9da687..adb509d63 100755 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -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", "bancomatpay", "alma"]; + const paymentMethods = ["eps", "przelewy24", "kbc", "belfius", "bancontact", "creditcard", "ideal", "banktransfer", "paypal", "applepay", "twint", "blik", "bancomatpay", "alma"]; // Iterate through the paymentMethods array using forEach paymentMethods.forEach(method => { From 6a5fa6a96e98b9506292093126150a92963d4f0f Mon Sep 17 00:00:00 2001 From: Justas Vaitkus Date: Fri, 29 Nov 2024 10:03:17 +0200 Subject: [PATCH 8/8] removed giropay from orders api --- cypress/support/commands.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/support/commands.js b/cypress/support/commands.js index adb509d63..83f8aa1a1 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", "bancomatpay", "alma"]; + const paymentMethods = ["applepay", "ideal", "creditcard", "in3", "klarnapaylater", "klarnapaynow", "klarnasliceit", "paypal", "banktransfer", "bancontact", "eps", "przelewy24", "kbc", "belfius", "voucher", "directdebit", "billie", "klarna", "twint", "blik", "bancomatpay", "alma"]; // Iterate through the paymentMethods array using forEach paymentMethods.forEach(method => {