Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop-6.0.4 #804

Merged
merged 113 commits into from
Oct 16, 2023
Merged
Changes from 1 commit
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
b9b4823
PIPRES-113: Billie payment method (#784)
mandan2 Aug 28, 2023
2b45b31
PIPRES-316: hookActionFrontControllerAfterInit replacement on depreca…
mandan2 Aug 29, 2023
2bde6b2
Version bump and upgrade file fix (#800)
mandan2 Sep 4, 2023
d292baa
release-6.0.1.
mandan2 Jul 17, 2023
68b1840
updating the e2e on PR yml
SimonasB88 Jul 17, 2023
de5ab2b
adding Ngrok launch fix
SimonasB88 Jul 24, 2023
a43261d
small yml fix
SimonasB88 Jul 24, 2023
1a53444
fixing the module upgrade CI testing
SimonasB88 Jul 24, 2023
3897dfd
small fix
SimonasB88 Jul 24, 2023
71b827e
upgrading text fix
SimonasB88 Jul 24, 2023
15a29a3
test fixes
SimonasB88 Jul 24, 2023
ef32571
small fix
SimonasB88 Jul 24, 2023
74421a8
removing the PS8 CI upgrading test
SimonasB88 Jul 24, 2023
ec97be4
cypress upgrading
SimonasB88 Jul 31, 2023
0f3fdcb
useful E2E test spec updates
SimonasB88 Jul 31, 2023
d5ce019
adding improved Cypress terminal logs
SimonasB88 Aug 1, 2023
94b712b
debug mode enabling
SimonasB88 Aug 1, 2023
8655206
Update prestashop_1784_2.sql
SimonasB88 Aug 21, 2023
40a53b4
useful cypress updates
SimonasB88 Aug 21, 2023
c7ef7a9
useful test code updates
SimonasB88 Aug 21, 2023
e1bd867
specs updates
SimonasB88 Aug 21, 2023
2eea085
ps8 test spec updates
SimonasB88 Aug 21, 2023
fe7bbcd
Update Makefile
SimonasB88 Aug 21, 2023
d90bc30
test spec updates
SimonasB88 Aug 21, 2023
c751d65
updates for test specs
SimonasB88 Aug 21, 2023
7da8736
updates for test specs
SimonasB88 Aug 21, 2023
c0e6c63
Update 02_mollie.ps1784.EnablingPaymentsOrdersAPI.specs.js
SimonasB88 Aug 21, 2023
7c9fc8f
ps8 test code updates
SimonasB88 Aug 21, 2023
8636337
ps1784 test spec updates
SimonasB88 Aug 21, 2023
39badac
in3 payment wip
SimonasB88 Aug 21, 2023
2fc8b22
Update 03_mollie.ps8.Subscriptions.WIP.js
SimonasB88 Aug 21, 2023
1a1475e
Update .htaccess1784
SimonasB88 Aug 22, 2023
eab976d
Update prestashop_1784_2.sql
SimonasB88 Aug 22, 2023
ee798cf
ps1784 test updates
SimonasB88 Aug 22, 2023
c1b5a4e
Update 03_mollie.ps1784.PaymentTests.js
SimonasB88 Aug 22, 2023
c959d40
ps1784 test updates
SimonasB88 Aug 22, 2023
ed26c59
Update 03_mollie.ps1784.PaymentTests.js
SimonasB88 Aug 22, 2023
5e68c81
Update .gitignore
SimonasB88 Aug 22, 2023
bcbd5c0
ps1784 finalized updates
SimonasB88 Aug 22, 2023
f5eeaf3
disabling debug mode
SimonasB88 Aug 28, 2023
6b110d1
Revert "disabling debug mode"
SimonasB88 Aug 28, 2023
1f98f24
spec update
SimonasB88 Aug 28, 2023
fe2033d
spec updates
SimonasB88 Aug 28, 2023
c6fed84
spec updates (ps1784/ps8)
SimonasB88 Aug 28, 2023
a478f7d
Update 04_mollie.ps8.Subscriptions.WIP.js
SimonasB88 Aug 28, 2023
a6b71c0
Update 02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js
SimonasB88 Aug 28, 2023
cfb360b
Update Makefile
SimonasB88 Aug 28, 2023
ddc19b8
Update prestashop_8.sql
SimonasB88 Aug 28, 2023
ac1abc1
Update prestashop_8.sql
SimonasB88 Aug 28, 2023
95e5782
Update .htaccess8
SimonasB88 Aug 28, 2023
4667a3d
Update prestashop_8.sql
SimonasB88 Aug 28, 2023
3763091
Update 02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js
SimonasB88 Aug 28, 2023
ce4c534
spec updates
SimonasB88 Aug 28, 2023
bfe5951
ps8 test spec updates
SimonasB88 Aug 28, 2023
50164d3
ps8 small typo fixes
SimonasB88 Aug 28, 2023
1efbbdf
Update 03_mollie.ps8.PaymentTests.js
SimonasB88 Aug 28, 2023
be2c8d2
cypress updates
SimonasB88 Sep 4, 2023
6b654d4
Update 03_mollie.ps1784.PaymentTests.js
SimonasB88 Sep 4, 2023
98a6708
Update cypress.config.js
SimonasB88 Sep 4, 2023
8d85a20
adding ps8.0.5 docker build
SimonasB88 Sep 4, 2023
e567042
Update .htaccess8
SimonasB88 Sep 4, 2023
1604077
Update 03_mollie.ps8.PaymentTests.js
SimonasB88 Sep 4, 2023
8d2d13b
Update 03_mollie.ps8.PaymentTests.js
SimonasB88 Sep 4, 2023
1ebe297
ps1784 debug mode disabling
SimonasB88 Sep 4, 2023
0630989
ps8 debug mode disabling
SimonasB88 Sep 4, 2023
a20f688
small update
SimonasB88 Sep 4, 2023
96ea420
small typo fix
SimonasB88 Sep 4, 2023
3a380f1
Update E2E_On_PR.yml
SimonasB88 Sep 4, 2023
22e2a5e
adding random branch string ending
SimonasB88 Sep 4, 2023
3481517
Update upgrading_check.yml
SimonasB88 Sep 4, 2023
25812d3
Update cypress.config.js
SimonasB88 Sep 5, 2023
a73abb5
selector updates
SimonasB88 Sep 5, 2023
c5223a5
updating the testrail extension
SimonasB88 Sep 5, 2023
18ddcfa
temporary disabling the error checking
SimonasB88 Sep 5, 2023
3d7272f
increasing timeout for selectors
SimonasB88 Sep 5, 2023
187d0ee
Merge pull request #801 from mollie/e2efix-6.x.x
SimonasB88 Sep 5, 2023
4fb6c9a
cypress-testrail extension fix
SimonasB88 Sep 11, 2023
2323b67
Merge pull request #805 from mollie/e2efix-testrail-extension-fix
SimonasB88 Sep 11, 2023
3839a44
PIPRES-261: Mixed cart checkout for subscriptions (#803)
mandan2 Sep 11, 2023
1171d24
PIPRES-261: Payment attribute fix (#806)
mandan2 Sep 11, 2023
85d6f0d
PIPRES-306: Configuration updateValue multishop context fix (#808) (#…
mandan2 Sep 18, 2023
556480d
PIPRES-338: Mixed cart subscription listing improvements (#812)
mandan2 Sep 19, 2023
2de7fc9
PIPRES-113: Billie payment method additional check for vat number (#813)
mandan2 Sep 19, 2023
42f69c0
ps1784 debug mode
SimonasB88 Sep 11, 2023
13cfad0
updating terminal report extension
SimonasB88 Sep 11, 2023
52e920d
ps8 debug mode
SimonasB88 Sep 11, 2023
1c8b5f9
Update Dockerfile.1784
SimonasB88 Sep 11, 2023
5d90706
upgrading the build to PS1785
SimonasB88 Sep 11, 2023
62ad59b
ps1785 updates
SimonasB88 Sep 11, 2023
f8f5a0d
ps1785 updates
SimonasB88 Sep 11, 2023
7b49ac8
Update E2E_On_PR.yml
SimonasB88 Sep 11, 2023
d20e3ce
moving things to ps1785
SimonasB88 Sep 11, 2023
03cf2f0
Update E2E_On_PR.yml
SimonasB88 Sep 11, 2023
e8c2a15
Update E2E_On_PR.yml
SimonasB88 Sep 11, 2023
80ffa4e
downgrading cypress
SimonasB88 Sep 11, 2023
5f13839
some e2e fixes
SimonasB88 Oct 2, 2023
11c2341
Update 04_mollie.ps1785.Subscriptions.js
SimonasB88 Oct 2, 2023
d46be3e
Update 03_mollie.ps8.PaymentTests.js
SimonasB88 Oct 2, 2023
7b7a4d4
Update 04_mollie.ps8.Subscriptions.js
SimonasB88 Oct 2, 2023
6e53f71
adding testrail ids for CI
SimonasB88 Oct 2, 2023
f40b43b
Update 03_mollie.ps8.PaymentTests.js
SimonasB88 Oct 2, 2023
14e088a
small typo
SimonasB88 Oct 2, 2023
514a2dd
small e2e improvements
SimonasB88 Oct 2, 2023
ae898a1
Merge pull request #807 from mollie/e2efix-failing-tests
SimonasB88 Oct 3, 2023
65b3671
PIPRES-261: Separate carrier for recurring orders improvements (#821)
mandan2 Oct 3, 2023
2e2b087
url updates
SimonasB88 Oct 9, 2023
b67102c
refactoring PS17 tests
SimonasB88 Oct 9, 2023
015e5b4
ps8 tests refactored
SimonasB88 Oct 9, 2023
df9a6eb
Update 04_mollie.ps1785.EnablingPaymentsPaymentsAPI.specs.js
SimonasB88 Oct 9, 2023
b8d19b0
updating urls
SimonasB88 Oct 9, 2023
89e4d1f
small typo
SimonasB88 Oct 9, 2023
924879f
small typo
SimonasB88 Oct 9, 2023
ab19779
Merge pull request #825 from mollie/e2efix-6.0.x
SimonasB88 Oct 9, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
cypress updates
SimonasB88 committed Sep 4, 2023
commit be2c8d2513534ac70b45368f3c13085d5046c87d
12 changes: 12 additions & 0 deletions cypress.config.js
Original file line number Diff line number Diff line change
@@ -16,6 +16,18 @@ module.exports = defineConfig({
// We've imported your old cypress plugins here.
// You may want to clean this up later by importing these.
setupNodeEvents(on, config) {
on('after:spec', (spec, results) => {
if (results && results.video) {
// Do we have failures for any retry attempts?
const failures = results.tests.some((test) =>
test.attempts.some((attempt) => attempt.state === 'failed')
)
if (!failures) {
// delete the video if the spec passed and no tests retried
fs.unlinkSync(results.video)
}
}
})
require('./cypress/plugins/index.js')(on, config)
require("cypress-fail-fast/plugin")(on, config);
require('cypress-terminal-report/src/installLogsPrinter')(on);
32 changes: 16 additions & 16 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
},
"homepage": "https://github.com/mollie/PrestaShop#readme",
"devDependencies": {
"cypress": "^12.17.4",
"cypress": "^13.1.0",
"cypress-fail-fast": "^7.0.0",
"cypress-iframe": "^1.0.1",
"cypress-terminal-report": "^5.3.2",