Skip to content

Commit

Permalink
Merge pull request #807 from mollie/e2efix-failing-tests
Browse files Browse the repository at this point in the history
E2E fixing failing tests
  • Loading branch information
SimonasB88 authored Oct 3, 2023
2 parents 2de7fc9 + 514a2dd commit ae898a1
Show file tree
Hide file tree
Showing 24 changed files with 282 additions and 1,965 deletions.
44 changes: 22 additions & 22 deletions .docker/.htaccess1784 → .docker/.htaccess1785
Original file line number Diff line number Diff line change
Expand Up @@ -10,60 +10,60 @@ SetEnv HTTP_MOD_REWRITE On
RewriteEngine on


#Domain: demoshop1784.ngrok.io
#Domain: demoshop1785debug.ngrok.io
RewriteRule . - [E=REWRITEBASE:/]
RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L]

# Images
RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$
RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L]
RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$
RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L]
RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$
RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L]
RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$
RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L]
RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$
RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L]
RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$
RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L]
RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$
RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L]
RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$
RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L]
RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$
RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L]
# AlphaImageLoader for IE and fancybox
RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L]


#Domain: demoshop1784.ngrok.io
#Domain: demoshop1785debug.ngrok.io
RewriteRule . - [E=REWRITEBASE:/]
RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L]

RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$
RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
RewriteRule ^SHOP2$ /SHOP2/ [L,R]
RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$
RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
RewriteRule ^SHOP2/(.*) /$1 [L]

# Images
RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$
RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L]
RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$
RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L]
RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$
RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L]
RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$
RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L]
RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$
RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L]
RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$
RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L]
RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$
RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L]
RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$
RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L]
RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$
RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$
RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L]
# AlphaImageLoader for IE and fancybox
RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L]
Expand Down
20 changes: 10 additions & 10 deletions .docker/.htaccess8
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,29 @@ SetEnv HTTP_MOD_REWRITE On
RewriteEngine on


#Domain: demoshop8.ngrok.io
#Domain: demoshop8debug.ngrok.io
RewriteRule . - [E=REWRITEBASE:/]
RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L]
RewriteRule ^upload/.+$ %{ENV:REWRITEBASE}index.php [QSA,L]

# Images
RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$
RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$
RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L]
RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$
RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$
RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L]
RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$
RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$
RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L]
RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$
RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$
RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L]
RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$
RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$
RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L]
RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$
RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$
RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L]
RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$
RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$
RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L]
RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$
RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$
RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L]
RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$
RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$
RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L]
# AlphaImageLoader for IE and fancybox
RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L]
Expand Down
2 changes: 1 addition & 1 deletion .docker/Dockerfile.1784 → .docker/Dockerfile.1785
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM prestashop/prestashop:1.7.8.4-apache
FROM prestashop/prestashop:1.7.8.5-apache

RUN cd /usr/local/etc/php/conf.d/ && \
echo 'memory_limit = 4096M' >> /usr/local/etc/php/conf.d/docker-php-memlimit.ini
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/E2E_On_PR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,20 @@ jobs:
fail-fast: false
matrix:
include:
- prestashop: 'PS1784'
make: 'make e2eh1784'
subdomain: 'demoshop1784'
- prestashop: 'PS1785'
make: 'make e2eh1785'
subdomain: 'demoshop1785debug'
port: '8002'
yml: 'docker-compose.1784.yml'
url: 'https://demoshop1784.ngrok.io'
test_spec: '**/cypress/e2e/ps1784/**'
yml: 'docker-compose.1785.yml'
url: 'https://demoshop1785debug.ngrok.io'
test_spec: '**/cypress/e2e/ps1785/**'
TestRailID: R4954
- prestashop: 'PS8'
make: 'make e2eh8'
subdomain: 'demoshop8'
subdomain: 'demoshop8debug'
port: '8142'
yml: 'docker-compose.8.yml'
url: 'https://demoshop8.ngrok.io'
url: 'https://demoshop8debug.ngrok.io'
test_spec: '**/cypress/e2e/ps8/**'
TestRailID: R6470
env:
Expand All @@ -42,7 +42,7 @@ jobs:
shell: bash
- run: ./ngrok authtoken ${{ secrets.NGROK_TOKEN }}
shell: bash
- run: ./ngrok http -region=eu -subdomain=${{ matrix.subdomain }} ${{ matrix.port }} > ngrok.log &
- run: ./ngrok http -region=us -subdomain=${{ matrix.subdomain }} ${{ matrix.port }} > ngrok.log &
shell: bash
- name: Install composer
run: composer i
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/upgrading_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ jobs:
fail-fast: false
matrix:
include:
- prestashop: 'PS1784'
make: 'make e2eh1784'
- prestashop: 'PS1785'
make: 'make e2eh1785'
port: '8002'
yml: 'docker-compose.1784.yml'
ModuleUpgradeTest: 'make upgrading-module-test-1784'
yml: 'docker-compose.1785.yml'
ModuleUpgradeTest: 'make upgrading-module-test-1785'
steps:
- name: Checkout
uses: actions/[email protected]
Expand Down
30 changes: 15 additions & 15 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@ ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
fix-lint:
docker-compose run --rm php sh -c "vendor/bin/php-cs-fixer fix --using-cache=no"

#PS1784
e2eh1784:
#PS1785
e2eh1785:
# detaching containers
docker-compose -f docker-compose.1784.yml up -d --force-recreate
docker-compose -f docker-compose.1785.yml up -d --force-recreate
# sees what containers are running
docker-compose -f docker-compose.1784.yml ps
docker-compose -f docker-compose.1785.yml ps
# waits for mysql to load
/bin/bash .docker/wait-for-container.sh mysql-mollie-1784
/bin/bash .docker/wait-for-container.sh mysql-mollie-1785
# configuring your prestashop
docker exec -i prestashop-mollie-1784 sh -c "rm -rf /var/www/html/install"
docker exec -i prestashop-mollie-1785 sh -c "rm -rf /var/www/html/install"
# configuring base database
mysql -h 127.0.0.1 -P 9002 --protocol=tcp -u root -pprestashop prestashop < ${PWD}/tests/seed/database/prestashop_1784_2.sql
mysql -h 127.0.0.1 -P 9002 --protocol=tcp -u root -pprestashop prestashop < ${PWD}/tests/seed/database/prestashop_1785_2.sql
# installing module
docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie"
docker exec -i prestashop-mollie-1785 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie"
# uninstalling module
docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module uninstall mollie"
docker exec -i prestashop-mollie-1785 sh -c "cd /var/www/html && php bin/console prestashop:module uninstall mollie"
# installing the module again
docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie"
docker exec -i prestashop-mollie-1785 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie"
# enabling the module
docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module enable mollie"
docker exec -i prestashop-mollie-1785 sh -c "cd /var/www/html && php bin/console prestashop:module enable mollie"
# chmod all folders
docker exec -i prestashop-mollie-1784 sh -c "chmod -R 777 /var/www/html"
docker exec -i prestashop-mollie-1785 sh -c "chmod -R 777 /var/www/html"

#PS8
e2eh8:
Expand Down Expand Up @@ -59,13 +59,13 @@ run-e2e-tests-locally:
npx cypress run

# checking the module upgrading - installs older module then installs from master branch
upgrading-module-test-1784:
upgrading-module-test-1785:
git fetch
git checkout v5.2.0 .
composer install
# installing 5.2.0 module
docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie"
docker exec -i prestashop-mollie-1785 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-1784 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie"
docker exec -i prestashop-mollie-1785 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie"
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ afterEach(() => {
afterEach(function() {
if (this.currentTest.state === "failed") failEarly = true
});
describe('PS1784 Module initial configuration setup', () => {
describe('PS1785 Module initial configuration setup', () => {
beforeEach(() => {
cy.viewport(1920,1080)
login('MollieBOFOLoggingIn')
Expand Down Expand Up @@ -111,13 +111,13 @@ it('C339339: 03 Checking the Advanced Settings tab, verifying the Front-end comp
cy.get('[class="alert alert-success"]').should('be.visible') //checking if saving returns green alert
//cy.window() will check if there are no Errors in console
});
it('C688472 Checking the Subscriptions tab, and console errors', () => {
it('C688472: Checking the Subscriptions tab, and console errors', () => {
cy.visit('/admin1/')
cy.OpeningModuleDashboardURL()
cy.get('#subtab-AdminMollieSubscriptionOrders').click()
cy.get('[id="invertus_mollie_subscription_grid_panel"]').should('be.visible')
});
it('C688473 Checking the Subscriptions FAQ, and console errors', () => {
it('C688473: Checking the Subscriptions FAQ, and console errors', () => {
cy.visit('/admin1/')
cy.OpeningModuleDashboardURL()
cy.get('#subtab-AdminMollieSubscriptionFAQ').click()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ afterEach(() => {
afterEach(function() {
if (this.currentTest.state === "failed") failEarly = true
});
describe('PS1784 Enabling Payments', () => {
describe('PS1785 Enabling Payments', () => {
beforeEach(() => {
cy.viewport(1920,1080)
login('MollieBOFOLoggingIn')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,20 @@ const login = (MollieBOFOLoggingIn) => {
cy.get('#history-link > .link-item').click()
})
}
// //Checking the console for errors
// let windowConsoleError;
// Cypress.on('window:before:load', (win) => {
// windowConsoleError = cy.spy(win.console, 'error');
// })
// afterEach(() => {
// expect(windowConsoleError).to.not.be.called;
// })
describe('PS1784 Tests Suite', () => {
//Checking the console for errors
let windowConsoleError;
Cypress.on('window:before:load', (win) => {
windowConsoleError = cy.spy(win.console, 'error');
})
afterEach(() => {
expect(windowConsoleError).to.not.be.called;
})
describe('PS1785 Tests Suite', () => {
beforeEach(() => {
login('MollieBOFOLoggingIn')
cy.viewport(1920,1080)
})
it.skip('C339342: 05 Vouchers Checkouting [Orders API]', () => {
it('C339342: 05 Vouchers Checkouting [Orders API]', () => {
cy.visit('/de/index.php?controller=history')
cy.get('a').click()
cy.contains('Reorder').click()
Expand Down Expand Up @@ -91,7 +91,7 @@ it.skip('C339342: 05 Vouchers Checkouting [Orders API]', () => {
cy.get('[class="button form__button"]').click()
cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
})
it.skip('C339343: 06 Vouchers Order BO Refunding, Shipping (Paid part only) [Orders API]', () => {
it.skip('C339343: 06 Vouchers Order BO Refunding, Shipping (Paid part only) [Orders API]', () => { //skipping, because of flaky behavior of this payment, sometimes the Mollie div is shown in Orders BO, sometimes not
cy.OrderRefundingShippingOrdersAPI()
cy.get('[class="card-body"]').find('[class="alert alert-warning"]').should('exist') //additional checking if the warning alert for vouchers exist
})
Expand Down Expand Up @@ -349,7 +349,7 @@ it('C339357: 20 IN3 Checkouting [Orders API]', () => {
cy.get('[class="button form__button"]').click()
cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
})
it.skip('C339358: 21 IN3 Order BO Shipping, Refunding [Orders API]', () => { // checking why payment div is not loaded in the Orders for some reason
it('C339358: 21 IN3 Order BO Shipping, Refunding [Orders API]', () => { // checking why payment div is not loaded in the Orders for some reason
cy.OrderRefundingShippingOrdersAPI()
})
it('C339359: 22 IN3 should not be shown under 5000 EUR [Orders API]', () => {
Expand Down Expand Up @@ -1121,7 +1121,7 @@ it('C339399: 64 Belfius Checkouting [Payments API]', () => {
it('C339400: 65 Belfius BO Refunding, Partial Refunding [Payments API]', () => {
cy.OrderRefundingPartialPaymentsAPI()
});
it('C339401: 66 Bank Transfer Checkouting [Payments API]', () => {
it.skip('C339401: 66 Bank Transfer Checkouting [Payments API]', () => { // skipping temporary, bug
cy.visit('/en/index.php?controller=history')
cy.get('a').click()
//
Expand Down Expand Up @@ -1150,7 +1150,7 @@ it('C339401: 66 Bank Transfer Checkouting [Payments API]', () => {
cy.get('[class="button form__button"]').click()
cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
});
it('C339402: 67 Bank Transfer BO Refunding, Partial Refunding [Payments API]', () => { // somehow an error in console is thrown, will check why
it.skip('C339402: 67 Bank Transfer BO Refunding, Partial Refunding [Payments API]', () => { // skipping temporary, bug
cy.OrderRefundingPartialPaymentsAPI()
});
})
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ windowConsoleError = cy.spy(win.console, 'error');
afterEach(() => {
expect(windowConsoleError).to.not.be.called;
})
describe('PS1784 Subscriptions Test Suit', () => {
describe('PS1785 Subscriptions Test Suit', () => {
beforeEach(() => {
cy.viewport(1920,1080)
login('MollieBOFOLoggingIn')
})
it('C176305 Check if Subscription options added in Product BO', () => {
it('C176305: Check if Subscription options added in Product BO', () => {
cy.visit('/admin1/')
cy.get('#subtab-AdminCatalog > :nth-child(1)').click()
cy.get('#subtab-AdminProducts > .link').click()
Expand All @@ -44,7 +44,8 @@ it('C176305 Check if Subscription options added in Product BO', () => {
cy.get('[class="attribute-quantity"]').last().find('[type="text"]').clear().type('999')
cy.get('#submit').click()
cy.get('.growl-message').contains('Settings updated.')
//Check if Subscription options are in Product Page FO and then register the Subscription product by purchasing it
})
it('C1672516: Check if Subscription options are in Product Page FO and then register the Subscription product by purchasing it', () => {
cy.visit('/de/')
cy.get('[data-id-product="8"]').click()
cy.get('[aria-label="Subscription"]').should('be.visible') //asserting if there is a Subscription dropdown in product page
Expand All @@ -62,8 +63,8 @@ it('C176305 Check if Subscription options added in Product BO', () => {
cy.get('.ps-shown-by-js > .btn').click()
cy.get('[value="paid"]').click()
cy.get('[class="button form__button"]').click()
cy.get('#content-hook_order_confirmation > .card-block').should('be.visible')
//Check if Subscription options are implemented in My Account FO
});
it('C1672517: Check if Subscription options are implemented in My Account FO', () => {
cy.visit('/en/')
cy.get('[class="account"]').click()
cy.contains('Subscriptions').click()
Expand Down
File renamed without changes.
Loading

0 comments on commit ae898a1

Please sign in to comment.