diff --git a/.github/workflows/upgrading_check.yml b/.github/workflows/upgrading_check.yml index 2f31256e3..343a98384 100644 --- a/.github/workflows/upgrading_check.yml +++ b/.github/workflows/upgrading_check.yml @@ -11,10 +11,10 @@ jobs: matrix: include: - prestashop: 'PS1785' - make: 'make e2eh1785' + make: 'make VERSION=1785 e2eh1785' port: '8002' yml: 'docker-compose.1785.yml' - ModuleUpgradeTest: 'make upgrading-module-test-1785' + ModuleUpgradeTest: 'make VERSION=1785 upgrading-module-test-1785' steps: - name: Checkout uses: actions/checkout@v3.5.3 diff --git a/Makefile b/Makefile index 1a2487ae0..e1674edd1 100755 --- a/Makefile +++ b/Makefile @@ -68,16 +68,16 @@ run-e2e-tests-locally: npx cypress run # checking the module upgrading - installs older module then installs from master branch -upgrading-module-test-1785: +upgrading-module-test-$(VERSION): git fetch git checkout v5.2.0 . composer install # installing 5.2.0 module - docker exec -i prestashop-mollie-1785 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" + docker exec -i prestashop-mollie-$(VERSION) sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" # installing develop branch module git checkout -- . git checkout develop --force - docker exec -i prestashop-mollie-1785 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" + docker exec -i prestashop-mollie-$(VERSION) sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" npm-package-install: cd views/assets && npm i && npm run build diff --git a/cypress/e2e/ps8/06_mollie.ps8.Subscriptions.WIP.js b/cypress/e2e/ps8/06_mollie.ps8.Subscriptions.WIP.js index e67a78cb9..f4e779079 100644 --- a/cypress/e2e/ps8/06_mollie.ps8.Subscriptions.WIP.js +++ b/cypress/e2e/ps8/06_mollie.ps8.Subscriptions.WIP.js @@ -51,6 +51,7 @@ it.skip('C176305: Check if Subscription options added in Product BO', () => { cy.get('#save-combinations-edition').click() cy.get('#product_footer_save').click() cy.contains('Successful update').should('be.visible') + cy.wait(2000) cy.screenshot() }) // wip