From 716cdcd1b57fa596dcbc58cb31f20ae97c1bfe67 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Tue, 12 Dec 2023 12:17:00 +0200 Subject: [PATCH 01/13] trying another vr testing tool --- cypress.config.js | 2 + cypress/support/e2e.js | 6 + package-lock.json | 460 +++++++++++++++++++++++++++++++++++++++++ package.json | 1 + 4 files changed, 469 insertions(+) diff --git a/cypress.config.js b/cypress.config.js index afa624410..6a7a8b86f 100755 --- a/cypress.config.js +++ b/cypress.config.js @@ -1,4 +1,5 @@ const { defineConfig } = require('cypress') +import { initPlugin } from "@frsource/cypress-plugin-visual-regression-diff/plugins"; module.exports = defineConfig({ chromeWebSecurity: false, @@ -30,6 +31,7 @@ module.exports = defineConfig({ require('./cypress/plugins/index.js')(on, config) require("cypress-fail-fast/plugin")(on, config); require('cypress-terminal-report/src/installLogsPrinter')(on); + initPlugin(on, config); return config; }, // setupNodeEvents(on, config) { diff --git a/cypress/support/e2e.js b/cypress/support/e2e.js index 36cef3f29..2b41fb7a6 100644 --- a/cypress/support/e2e.js +++ b/cypress/support/e2e.js @@ -52,3 +52,9 @@ Cypress.Keyboard.defaults({ keystrokeDelay: 0, }) import "cypress-fail-fast"; + +// typescript / ES6 +import "@frsource/cypress-plugin-visual-regression-diff"; + +// javascript +require("@frsource/cypress-plugin-visual-regression-diff"); diff --git a/package-lock.json b/package-lock.json index 1d0dfb966..de8c7db6d 100755 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "1.0.0", "license": "ISC", "devDependencies": { + "@frsource/cypress-plugin-visual-regression-diff": "^3.3.10", "cypress": "^13.6.1", "cypress-fail-fast": "^7.0.3", "cypress-iframe": "^1.0.1", @@ -75,6 +76,73 @@ "ms": "^2.1.1" } }, + "node_modules/@frsource/base64": { + "version": "1.0.17", + "resolved": "https://registry.npmjs.org/@frsource/base64/-/base64-1.0.17.tgz", + "integrity": "sha512-QyMv52jCRIMUIlDM6ysSVPc6Cp3KCTu6/YeLUyJpTEhleXssYB3CT5PqmQijGGwu4819qvan8Eu4PWJRAW5Akg==", + "dev": true + }, + "node_modules/@frsource/cypress-plugin-visual-regression-diff": { + "version": "3.3.10", + "resolved": "https://registry.npmjs.org/@frsource/cypress-plugin-visual-regression-diff/-/cypress-plugin-visual-regression-diff-3.3.10.tgz", + "integrity": "sha512-ZjfOpdmXUgNRfLpsbrYiDujUzNEgLx+3dMtvMJHO3d+Yri0wniMB3mukf5+58QUMXuw8mr1cLoBkeWr1UxCOpA==", + "dev": true, + "dependencies": { + "@frsource/base64": "1.0.17", + "glob": "8.1.0", + "meta-png": "1.0.6", + "move-file": "2.1.0", + "pixelmatch": "5.3.0", + "pngjs": "7.0.0", + "sharp": "0.32.1" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "cypress": ">=4.5.0" + } + }, + "node_modules/@frsource/cypress-plugin-visual-regression-diff/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/@frsource/cypress-plugin-visual-regression-diff/node_modules/glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@frsource/cypress-plugin-visual-regression-diff/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@types/cypress": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/@types/cypress/-/cypress-1.1.3.tgz", @@ -326,6 +394,17 @@ "tweetnacl": "^0.14.3" } }, + "node_modules/bl": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "dev": true, + "dependencies": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, "node_modules/blob-util": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/blob-util/-/blob-util-2.0.2.tgz", @@ -446,6 +525,12 @@ "node": ">= 0.8.0" } }, + "node_modules/chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "dev": true + }, "node_modules/ci-info": { "version": "3.8.0", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz", @@ -631,6 +716,19 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/color": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz", + "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1", + "color-string": "^1.9.0" + }, + "engines": { + "node": ">=12.5.0" + } + }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -649,6 +747,16 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/color-string": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", + "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", + "dev": true, + "dependencies": { + "color-name": "^1.0.0", + "simple-swizzle": "^0.2.2" + } + }, "node_modules/colorette": { "version": "2.0.20", "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", @@ -890,6 +998,30 @@ } } }, + "node_modules/decompress-response": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", + "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", + "dev": true, + "dependencies": { + "mimic-response": "^3.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/deep-extend": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", + "dev": true, + "engines": { + "node": ">=4.0.0" + } + }, "node_modules/delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -899,6 +1031,15 @@ "node": ">=0.4.0" } }, + "node_modules/detect-libc": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.2.tgz", + "integrity": "sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/ecc-jsbn": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", @@ -996,6 +1137,15 @@ "node": ">=4" } }, + "node_modules/expand-template": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", + "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, "node_modules/extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", @@ -1098,6 +1248,12 @@ "node": ">= 0.12" } }, + "node_modules/fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "dev": true + }, "node_modules/fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -1173,6 +1329,12 @@ "assert-plus": "^1.0.0" } }, + "node_modules/github-from-package": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", + "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==", + "dev": true + }, "node_modules/glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -1336,6 +1498,12 @@ "node": ">=10" } }, + "node_modules/is-arrayish": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", + "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==", + "dev": true + }, "node_modules/is-ci": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz", @@ -1600,6 +1768,12 @@ "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", "dev": true }, + "node_modules/meta-png": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/meta-png/-/meta-png-1.0.6.tgz", + "integrity": "sha512-eQtEi5E9axqwqA/sDK1dyhX9kYHCUe2m+45aQ3JHrozjGPs+/ab+hdhPp7A3GUNW+ZAbavrsg5xQ4r5jkGDX+A==", + "dev": true + }, "node_modules/mime-db": { "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", @@ -1630,6 +1804,18 @@ "node": ">=6" } }, + "node_modules/mimic-response": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", + "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -1651,12 +1837,57 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/mkdirp-classic": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", + "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", + "dev": true + }, + "node_modules/move-file": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/move-file/-/move-file-2.1.0.tgz", + "integrity": "sha512-i9qLW6gqboJ5Ht8bauZi7KlTnQ3QFpBCvMvFfEcHADKgHGeJ9BZMO7SFCTwHPV9Qa0du9DYY1Yx3oqlGt30nXA==", + "dev": true, + "dependencies": { + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10.17" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, + "node_modules/napi-build-utils": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz", + "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==", + "dev": true + }, + "node_modules/node-abi": { + "version": "3.52.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.52.0.tgz", + "integrity": "sha512-JJ98b02z16ILv7859irtXn4oUaFWADtvkzy2c0IAatNVX2Mc9Yoh8z6hZInn3QwvMEYhHuQloYi+TTQy67SIdQ==", + "dev": true, + "dependencies": { + "semver": "^7.3.5" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/node-addon-api": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz", + "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==", + "dev": true + }, "node_modules/npm-run-path": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", @@ -1723,6 +1954,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", @@ -1762,6 +2002,62 @@ "node": ">=0.10.0" } }, + "node_modules/pixelmatch": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/pixelmatch/-/pixelmatch-5.3.0.tgz", + "integrity": "sha512-o8mkY4E/+LNUf6LzX96ht6k6CEDi65k9G2rjMtBe9Oo+VPKSvl+0GKHuH/AlG+GA5LPG/i5hrekkxUc3s2HU+Q==", + "dev": true, + "dependencies": { + "pngjs": "^6.0.0" + }, + "bin": { + "pixelmatch": "bin/pixelmatch" + } + }, + "node_modules/pixelmatch/node_modules/pngjs": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-6.0.0.tgz", + "integrity": "sha512-TRzzuFRRmEoSW/p1KVAmiOgPco2Irlah+bGFCeNfJXxxYGwSw7YwAOAcd7X28K/m5bjBWKsC29KyoMfHbypayg==", + "dev": true, + "engines": { + "node": ">=12.13.0" + } + }, + "node_modules/pngjs": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-7.0.0.tgz", + "integrity": "sha512-LKWqWJRhstyYo9pGvgor/ivk2w94eSjE3RGVuzLGlr3NmD8bf7RcYGze1mNdEHRP6TRP6rMuDHk5t44hnTRyow==", + "dev": true, + "engines": { + "node": ">=14.19.0" + } + }, + "node_modules/prebuild-install": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz", + "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==", + "dev": true, + "dependencies": { + "detect-libc": "^2.0.0", + "expand-template": "^2.0.3", + "github-from-package": "0.0.0", + "minimist": "^1.2.3", + "mkdirp-classic": "^0.5.3", + "napi-build-utils": "^1.0.1", + "node-abi": "^3.3.0", + "pump": "^3.0.0", + "rc": "^1.2.7", + "simple-get": "^4.0.0", + "tar-fs": "^2.0.0", + "tunnel-agent": "^0.6.0" + }, + "bin": { + "prebuild-install": "bin.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/pretty-bytes": { "version": "5.6.0", "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz", @@ -1835,6 +2131,41 @@ "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", "dev": true }, + "node_modules/rc": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", + "dev": true, + "dependencies": { + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" + }, + "bin": { + "rc": "cli.js" + } + }, + "node_modules/rc/node_modules/ini": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", + "dev": true + }, + "node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/request-progress": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-3.0.0.tgz", @@ -1940,6 +2271,29 @@ "node": ">=10" } }, + "node_modules/sharp": { + "version": "0.32.1", + "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.32.1.tgz", + "integrity": "sha512-kQTFtj7ldpUqSe8kDxoGLZc1rnMFU0AO2pqbX6pLy3b7Oj8ivJIdoKNwxHVQG2HN6XpHPJqCSM2nsma2gOXvOg==", + "dev": true, + "hasInstallScript": true, + "dependencies": { + "color": "^4.2.3", + "detect-libc": "^2.0.1", + "node-addon-api": "^6.1.0", + "prebuild-install": "^7.1.1", + "semver": "^7.5.0", + "simple-get": "^4.0.1", + "tar-fs": "^2.1.1", + "tunnel-agent": "^0.6.0" + }, + "engines": { + "node": ">=14.15.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + } + }, "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -1981,6 +2335,60 @@ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", "dev": true }, + "node_modules/simple-concat": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz", + "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/simple-get": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz", + "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "decompress-response": "^6.0.0", + "once": "^1.3.1", + "simple-concat": "^1.0.0" + } + }, + "node_modules/simple-swizzle": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", + "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==", + "dev": true, + "dependencies": { + "is-arrayish": "^0.3.1" + } + }, "node_modules/slice-ansi": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", @@ -2020,6 +2428,15 @@ "node": ">=0.10.0" } }, + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "dev": true, + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, "node_modules/string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", @@ -2055,6 +2472,15 @@ "node": ">=6" } }, + "node_modules/strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", @@ -2070,6 +2496,34 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/tar-fs": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", + "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", + "dev": true, + "dependencies": { + "chownr": "^1.1.1", + "mkdirp-classic": "^0.5.2", + "pump": "^3.0.0", + "tar-stream": "^2.1.4" + } + }, + "node_modules/tar-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "dev": true, + "dependencies": { + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/throttleit": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz", @@ -2191,6 +2645,12 @@ "requires-port": "^1.0.0" } }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "dev": true + }, "node_modules/uuid": { "version": "8.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", diff --git a/package.json b/package.json index 3e5f36b26..186463a1e 100755 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ }, "homepage": "https://github.com/mollie/PrestaShop#readme", "devDependencies": { + "@frsource/cypress-plugin-visual-regression-diff": "^3.3.10", "cypress": "^13.6.1", "cypress-fail-fast": "^7.0.3", "cypress-iframe": "^1.0.1", From 987077e79e048c5b3b1212afc45214219bd43c63 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Tue, 12 Dec 2023 14:31:31 +0200 Subject: [PATCH 02/13] visual regression testing updates --- cypress.config.js | 8 +++- .../07_mollie.ps8.VisualRegressionTests.cy.js | 45 +++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100755 cypress/e2e/ps8/07_mollie.ps8.VisualRegressionTests.cy.js diff --git a/cypress.config.js b/cypress.config.js index 6a7a8b86f..a8832cc1b 100755 --- a/cypress.config.js +++ b/cypress.config.js @@ -1,7 +1,13 @@ const { defineConfig } = require('cypress') -import { initPlugin } from "@frsource/cypress-plugin-visual-regression-diff/plugins"; +const { initPlugin } = require("@frsource/cypress-plugin-visual-regression-diff/plugins"); module.exports = defineConfig({ + env: { + pluginVisualRegressionDiffConfig: { threshold: 0.001 }, + pluginVisualRegressionMaxDiffThreshold: 0.001, + pluginVisualRegressionUpdateImages: false, + pluginVisualRegressionImagesPath: 'cypress/screenshots', + }, chromeWebSecurity: false, experimentalMemoryManagement: true, experimentalSourceRewriting: true, diff --git a/cypress/e2e/ps8/07_mollie.ps8.VisualRegressionTests.cy.js b/cypress/e2e/ps8/07_mollie.ps8.VisualRegressionTests.cy.js new file mode 100755 index 000000000..dfff367b6 --- /dev/null +++ b/cypress/e2e/ps8/07_mollie.ps8.VisualRegressionTests.cy.js @@ -0,0 +1,45 @@ +/// +//Caching the BO and FO session +const login = (MollieBOFOLoggingIn) => { + cy.session(MollieBOFOLoggingIn,() => { + cy.visit('/admin1/') + cy.url().should('contain', 'https').as('Check if HTTPS exists') + cy.get('#email').type('demo@prestashop.com',{delay: 0, log: false}) + cy.get('#passwd').type('prestashop_demo',{delay: 0, log: false}) + cy.get('#submit_login').click().wait(1000).as('Connection successsful') + cy.visit('/en/my-account') + cy.get('#login-form [name="email"]').eq(0).type('demo@prestashop.com') + cy.get('#login-form [name="password"]').eq(0).type('prestashop_demo') + cy.get('#login-form [type="submit"]').eq(0).click({force:true}) + cy.get('#history-link > .link-item').click() + }) + } + +describe('PS8 Visual Regression tests suite', { + retries: { + runMode: 0, + openMode: 0, + }, +},() => { + +it.only('PS8 - Testing the visual regression of General Settings page', () => { + login('MollieBOFOLoggingIn') + cy.visit('/admin1/') + cy.get('.mi-mollie').click({fore:true}) + cy.get('#subtab-AdminMollieModule').click() + cy.matchImage(); +}); +it('PS8 - Testing the visual regression of Advanced Settings page', () => { + cy.visit('/admin1/') + cy.get('.mi-mollie').click({fore:true}) + cy.get('#subtab-AdminMollieModule').click() + cy.matchImage(); +}); +it('PS8 - Testing the visual regression of Payments in the Checkout', () => { + cy.visit('/admin1/') + cy.get('.mi-mollie').click({fore:true}) + cy.get('#subtab-AdminMollieModule').click() + cy.matchImage(); +}); + +}) From a379eebb8fc08054104f063fb3726480253c609a Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 18 Dec 2023 10:17:38 +0200 Subject: [PATCH 03/13] Update 07_mollie.ps8.VisualRegressionTests.cy.js --- .../e2e/ps8/07_mollie.ps8.VisualRegressionTests.cy.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cypress/e2e/ps8/07_mollie.ps8.VisualRegressionTests.cy.js b/cypress/e2e/ps8/07_mollie.ps8.VisualRegressionTests.cy.js index dfff367b6..d4d1cf27b 100755 --- a/cypress/e2e/ps8/07_mollie.ps8.VisualRegressionTests.cy.js +++ b/cypress/e2e/ps8/07_mollie.ps8.VisualRegressionTests.cy.js @@ -21,18 +21,21 @@ describe('PS8 Visual Regression tests suite', { openMode: 0, }, },() => { - -it.only('PS8 - Testing the visual regression of General Settings page', () => { + beforeEach(() => { + login('MollieBOFOLoggingIn') +}) +it('PS8 - Testing the visual regression of General Settings page', () => { login('MollieBOFOLoggingIn') cy.visit('/admin1/') cy.get('.mi-mollie').click({fore:true}) cy.get('#subtab-AdminMollieModule').click() cy.matchImage(); }); -it('PS8 - Testing the visual regression of Advanced Settings page', () => { +it.only('PS8 - Testing the visual regression of Advanced Settings page', () => { cy.visit('/admin1/') cy.get('.mi-mollie').click({fore:true}) cy.get('#subtab-AdminMollieModule').click() + cy.contains('Advanced settings').click() cy.matchImage(); }); it('PS8 - Testing the visual regression of Payments in the Checkout', () => { From e9143396d5e54405390432a389c9f49abd93e4bd Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 18 Dec 2023 13:44:20 +0200 Subject: [PATCH 04/13] updates --- cypress.config.js | 2 + .../03_mollie.ps8.PaymentTestsOrdersAPI.js | 125 +++--------------- .../07_mollie.ps8.VisualRegressionTests.cy.js | 12 +- 3 files changed, 30 insertions(+), 109 deletions(-) diff --git a/cypress.config.js b/cypress.config.js index a8832cc1b..d3774502a 100755 --- a/cypress.config.js +++ b/cypress.config.js @@ -7,6 +7,8 @@ module.exports = defineConfig({ pluginVisualRegressionMaxDiffThreshold: 0.001, pluginVisualRegressionUpdateImages: false, pluginVisualRegressionImagesPath: 'cypress/screenshots', + pluginVisualRegressionScreenshotConfig: { scale: true, capture: 'fullPage' }, + pluginVisualRegressionUpdateImages: true, }, chromeWebSecurity: false, experimentalMemoryManagement: true, diff --git a/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js b/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js index 70f24e903..078834901 100755 --- a/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js +++ b/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js @@ -25,12 +25,7 @@ describe('PS8 Tests Suite [Orders API]', { login('MollieBOFOLoggingIn') }) it.skip('C339342: 05 Vouchers Checkouting [Orders API]', () => { //temporary skip, possible bug containing PS8 version - cy.visit('/de/index.php?controller=history') - cy.contains('Reorder').click() - cy.contains('DE').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() + cy.navigatingToThePaymentPS8() //Payment method choosing cy.contains('Voucher').click({force:true}) cy.get('.condition-label > .js-terms').click({force:true}) @@ -48,12 +43,7 @@ it.skip('C339343: 06 Vouchers Order BO Refunding, Shipping (Paid part only) [Ord cy.get('[class="card-body"]').find('[class="alert alert-warning"]').should('exist') //additional checking if the warning alert for vouchers exist }) it('C339344: 07 Bancontact Checkouting [Orders API]', () => { - cy.visit('/de/index.php?controller=history') - cy.contains('Reorder').click() - cy.contains('DE').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() + cy.navigatingToThePaymentPS8() //Payment method choosing cy.contains('Bancontact').click({force:true}) cy.get('.condition-label > .js-terms').click({force:true}) @@ -66,11 +56,7 @@ it('C339345: 08 Bancontact Order BO Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) it('C339346: 09 iDEAL Checkouting [Orders API]', () => { - cy.visit('/de/index.php?controller=history') - cy.contains('Reorder').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() + cy.navigatingToThePaymentPS8() //Payment method choosing cy.contains('iDEAL').click({force:true}) cy.get('.condition-label > .js-terms').click({force:true}) @@ -84,12 +70,7 @@ it('C339347: 10 iDEAL Order BO Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) it('C339348: 11 Klarna Slice It Checkouting [Orders API]', () => { - cy.visit('/de/index.php?controller=history') - cy.contains('Reorder').click() - //Billing country LT, DE etc. - cy.contains('DE').click() - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() + cy.navigatingToThePaymentPS8() //Payment method choosing cy.contains('Ratenkauf.').click({force:true}) cy.get('.condition-label > .js-terms').click({force:true}) @@ -102,13 +83,7 @@ it('C339349: 12 Klarna Slice It Order BO Shipping, Refunding [Orders API]', () = cy.OrderShippingRefundingOrdersAPI() }) it('C339350: 13 Klarna Pay Later Checkouting [Orders API]', () => { - cy.visit('/de/index.php?controller=history') - // - cy.contains('Reorder').click() - //Billing country LT, DE etc. - cy.contains('DE').click() - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() + cy.navigatingToThePaymentPS8() //Payment method choosing cy.contains('Rechnung.').click({force:true}) cy.get('.condition-label > .js-terms').click({force:true}) @@ -121,13 +96,7 @@ it('C339351: 14 Klarna Pay Later Order BO Shipping, Refunding [Orders API]', () cy.OrderShippingRefundingOrdersAPI() }) it('C339352: 15 Klarna Pay Now Checkouting [Orders API]', () => { - cy.visit('/de/index.php?controller=history') - // - cy.contains('Reorder').click() - //Billing country LT, DE etc. - cy.contains('DE').click() - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() + cy.navigatingToThePaymentPS8() //Payment method choosing cy.contains('Pay now.').click({force:true}) cy.get('.condition-label > .js-terms').click({force:true}) @@ -146,11 +115,7 @@ it('C339354: 17 Credit Card Checkouting [Orders API]', () => { cy.get('#MOLLIE_SANDBOX_SINGLE_CLICK_PAYMENT_on').click({force:true}) cy.get('[type="submit"]').first().click({force:true}) cy.get('[class="alert alert-success"]').should('be.visible') - cy.visit('/en/index.php?controller=history') - cy.contains('Reorder').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() + cy.navigatingToThePaymentPS8() //Payment method choosing cy.contains('Card').click({force:true}) //Credit card inputing @@ -162,11 +127,7 @@ it('C339354: 17 Credit Card Checkouting [Orders API]', () => { cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') }) it('C339355: 18 Check if customerId is passed during the 2nd payment using Single Click Payment [Orders API]', () => { - cy.visit('/en/index.php?controller=history') - cy.contains('Reorder').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() + cy.navigatingToThePaymentPS8() //Payment method choosing cy.contains('Card').click({force:true}) cy.get('.condition-label > .js-terms').click({force:true}) @@ -182,12 +143,7 @@ it('C339356: 19 Credit Card Order BO Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) it('C339357: 20 IN3 Checkouting [Orders API]', () => { // wip - cy.visit('/de/index.php?controller=history') - cy.contains('Reorder').click() - cy.contains('NL').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() + cy.navigatingToThePaymentPS8() //Payment method choosing // waiting for enabling IN3 payment cy.contains('in3').click({force:true}) @@ -237,12 +193,7 @@ it('C339360: 23 IN3 Checking that IN3 logo exists OK [Orders API]', () => { cy.get('[class="alert alert-success"]').should('be.visible') }) it('C339361: 24 Paypal Checkouting [Orders API]', () => { - cy.visit('/de/index.php?controller=history') - cy.contains('Reorder').click() - cy.contains('NL').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() + cy.navigatingToThePaymentPS8() //Payment method choosing cy.contains('PayPal').click({force:true}) cy.get('.condition-label > .js-terms').click({force:true}) @@ -255,12 +206,7 @@ it('C339362: 25 Paypal Order Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) it('C339363: 26 SOFORT Checkouting [Orders API]', () => { - cy.visit('/de/index.php?controller=history') - cy.contains('Reorder').click() - cy.contains('NL').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() + cy.navigatingToThePaymentPS8() //Payment method choosing cy.contains('SOFORT').click({force:true}) cy.get('.condition-label > .js-terms').click({force:true}) @@ -285,12 +231,7 @@ it('C339364: 27 SOFORT Order Shipping, Refunding [Orders API]', () => { //Refunding not possible because "We haven't received the payment on our bank accounts yet" message from Mollie Dashboard }) it('C339365: 28 Przelewy24 Checkouting [Orders API]', () => { - cy.visit('/de/index.php?controller=history') - cy.contains('Reorder').click() - cy.contains('NL').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() + cy.navigatingToThePaymentPS8() //Payment method choosing cy.contains('Przelewy24').click({force:true}) cy.get('.condition-label > .js-terms').click({force:true}) @@ -303,12 +244,7 @@ it('C339366: 29 Przelewy24 Order Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) it('C339367: 30 Giropay Checkouting [Orders API]', () => { - cy.visit('/de/index.php?controller=history') - cy.contains('Reorder').click() - cy.contains('NL').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() + cy.navigatingToThePaymentPS8() //Payment method choosing cy.contains('giropay').click({force:true}) cy.get('.condition-label > .js-terms').click({force:true}) @@ -321,12 +257,7 @@ it('C339368: 31 Giropay Order Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) it('C339369: 32 EPS Checkouting [Orders API]', () => { - cy.visit('/de/index.php?controller=history') - cy.contains('Reorder').click() - cy.contains('NL').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() + cy.navigatingToThePaymentPS8() //Payment method choosing cy.contains('eps').click({force:true}) cy.get('.condition-label > .js-terms').click({force:true}) @@ -339,12 +270,7 @@ it('C339370: 33 EPS Order Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) it('C339371: 34 KBC/CBC Checkouting [Orders API]', () => { - cy.visit('/de/index.php?controller=history') - cy.contains('Reorder').click() - cy.contains('NL').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() + cy.navigatingToThePaymentPS8() //Payment method choosing cy.contains('KBC/CBC').click({force:true}) cy.get('.condition-label > .js-terms').click({force:true}) @@ -358,12 +284,7 @@ it('C339372: 35 KBC/CBC Order Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) it('C339373: 36 Belfius Checkouting [Orders API]', () => { - cy.visit('/de/index.php?controller=history') - cy.contains('Reorder').click() - cy.contains('NL').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() + cy.navigatingToThePaymentPS8() //Payment method choosing cy.contains('Belfius').click({force:true}) cy.get('.condition-label > .js-terms').click({force:true}) @@ -376,12 +297,7 @@ it('C339374: 37 Belfius Order Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) it('C339375: 38 Bank Transfer Checkouting [Orders API]', () => { - cy.visit('/en/index.php?controller=history') - cy.contains('Reorder').click() - cy.contains('NL').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() + cy.navigatingToThePaymentPS8() //Payment method choosing cy.contains('Bank transfer').click({force:true}) cy.get('.condition-label > .js-terms').click({force:true}) @@ -396,12 +312,7 @@ it('C339376: 39 Bank Transfer Order Shipping, Refunding [Orders API]', () => { }) // Temporary disabled, Payment Method disables automatically in My Mollie Dashboard, because of the fake testing account... it.skip('40 Gift Card Checkouting [Orders API]', () => { - cy.visit('/en/index.php?controller=history') - cy.contains('Reorder').click() - cy.contains('NL').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() + cy.navigatingToThePaymentPS8() //Payment method choosing cy.contains('Gift cards').click({force:true}) cy.get('.condition-label > .js-terms').click({force:true}) diff --git a/cypress/e2e/ps8/07_mollie.ps8.VisualRegressionTests.cy.js b/cypress/e2e/ps8/07_mollie.ps8.VisualRegressionTests.cy.js index d4d1cf27b..dcfd3f35f 100755 --- a/cypress/e2e/ps8/07_mollie.ps8.VisualRegressionTests.cy.js +++ b/cypress/e2e/ps8/07_mollie.ps8.VisualRegressionTests.cy.js @@ -20,6 +20,9 @@ describe('PS8 Visual Regression tests suite', { runMode: 0, openMode: 0, }, + failFast: { + enabled: false, + } },() => { beforeEach(() => { login('MollieBOFOLoggingIn') @@ -31,17 +34,22 @@ it('PS8 - Testing the visual regression of General Settings page', () => { cy.get('#subtab-AdminMollieModule').click() cy.matchImage(); }); -it.only('PS8 - Testing the visual regression of Advanced Settings page', () => { +it('PS8 - Testing the visual regression of Advanced Settings page', () => { cy.visit('/admin1/') cy.get('.mi-mollie').click({fore:true}) cy.get('#subtab-AdminMollieModule').click() cy.contains('Advanced settings').click() cy.matchImage(); }); -it('PS8 - Testing the visual regression of Payments in the Checkout', () => { +it('PS8 - Testing the visual regression of Subscriptions FAQ', () => { cy.visit('/admin1/') cy.get('.mi-mollie').click({fore:true}) cy.get('#subtab-AdminMollieModule').click() + cy.get('#subtab-AdminMollieSubscriptionFAQ').click() + cy.matchImage(); +}); +it('PS8 - Testing the visual regression of Payments in the Checkout', () => { + cy.navigatingToThePaymentPS8() cy.matchImage(); }); From 8bd65ba583f40de0ccf1fe9e32e9aad0a18f0527 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 18 Dec 2023 14:28:42 +0200 Subject: [PATCH 05/13] test code updates for PS17 also --- cypress.config.js | 8 +-- ..._mollie.ps1785.VisualRegressionTests.cy.js | 56 +++++++++++++++++++ 2 files changed, 60 insertions(+), 4 deletions(-) create mode 100755 cypress/e2e/ps1785/07_mollie.ps1785.VisualRegressionTests.cy.js diff --git a/cypress.config.js b/cypress.config.js index d3774502a..08d446ec7 100755 --- a/cypress.config.js +++ b/cypress.config.js @@ -3,12 +3,12 @@ const { initPlugin } = require("@frsource/cypress-plugin-visual-regression-diff/ module.exports = defineConfig({ env: { - pluginVisualRegressionDiffConfig: { threshold: 0.001 }, - pluginVisualRegressionMaxDiffThreshold: 0.001, + pluginVisualRegressionDiffConfig: { threshold: 0.01 }, + pluginVisualRegressionMaxDiffThreshold: 0.01, pluginVisualRegressionUpdateImages: false, pluginVisualRegressionImagesPath: 'cypress/screenshots', - pluginVisualRegressionScreenshotConfig: { scale: true, capture: 'fullPage' }, - pluginVisualRegressionUpdateImages: true, + pluginVisualRegressionScreenshotConfig: { scale: false, capture: 'fullPage' }, + pluginVisualRegressionUpdateImages: false, // for updating of not updating the diff image automatically }, chromeWebSecurity: false, experimentalMemoryManagement: true, diff --git a/cypress/e2e/ps1785/07_mollie.ps1785.VisualRegressionTests.cy.js b/cypress/e2e/ps1785/07_mollie.ps1785.VisualRegressionTests.cy.js new file mode 100755 index 000000000..ac0eed05d --- /dev/null +++ b/cypress/e2e/ps1785/07_mollie.ps1785.VisualRegressionTests.cy.js @@ -0,0 +1,56 @@ +/// +//Caching the BO and FO session +const login = (MollieBOFOLoggingIn) => { + cy.session(MollieBOFOLoggingIn,() => { + cy.visit('/admin1/') + cy.url().should('contain', 'https').as('Check if HTTPS exists') + cy.get('#email').type('demo@prestashop.com',{delay: 0, log: false}) + cy.get('#passwd').type('prestashop_demo',{delay: 0, log: false}) + cy.get('#submit_login').click().wait(1000).as('Connection successsful') + cy.visit('/en/my-account') + cy.get('#login-form [name="email"]').eq(0).type('demo@prestashop.com') + cy.get('#login-form [name="password"]').eq(0).type('prestashop_demo') + cy.get('#login-form [type="submit"]').eq(0).click({force:true}) + cy.get('#history-link > .link-item').click() + }) + } + +describe('PS1785 Visual Regression tests suite', { + retries: { + runMode: 0, + openMode: 0, + }, + failFast: { + enabled: false, + } +},() => { + beforeEach(() => { + login('MollieBOFOLoggingIn') +}) +it('PS1785 - Testing the visual regression of General Settings page', () => { + login('MollieBOFOLoggingIn') + cy.visit('/admin1/') + cy.get('.mi-mollie').click({fore:true}) + cy.get('#subtab-AdminMollieModule').click() + cy.matchImage(); +}); +it('PS1785 - Testing the visual regression of Advanced Settings page', () => { + cy.visit('/admin1/') + cy.get('.mi-mollie').click({fore:true}) + cy.get('#subtab-AdminMollieModule').click() + cy.contains('Advanced settings').click() + cy.matchImage(); +}); +it('PS1785 - Testing the visual regression of Subscriptions FAQ', () => { + cy.visit('/admin1/') + cy.get('.mi-mollie').click({fore:true}) + cy.get('#subtab-AdminMollieModule').click() + cy.get('#subtab-AdminMollieSubscriptionFAQ').click() + cy.matchImage(); +}); +it('PS1785 - Testing the visual regression of Payments in the Checkout', () => { + cy.navigatingToThePayment() + cy.matchImage(); +}); + +}) From 9f3108b8eb324cb6ede9a2400a59b5c93e97f284 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 18 Dec 2023 15:50:36 +0200 Subject: [PATCH 06/13] test code improvements --- cypress.config.js | 4 ++-- .../ps1785/07_mollie.ps1785.VisualRegressionTests.cy.js | 9 ++++----- .../e2e/ps8/07_mollie.ps8.VisualRegressionTests.cy.js | 1 - 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/cypress.config.js b/cypress.config.js index 08d446ec7..be4655e4b 100755 --- a/cypress.config.js +++ b/cypress.config.js @@ -5,10 +5,10 @@ module.exports = defineConfig({ env: { pluginVisualRegressionDiffConfig: { threshold: 0.01 }, pluginVisualRegressionMaxDiffThreshold: 0.01, - pluginVisualRegressionUpdateImages: false, + pluginVisualRegressionUpdateImages: true, // for updating or not updating the diff image automatically pluginVisualRegressionImagesPath: 'cypress/screenshots', pluginVisualRegressionScreenshotConfig: { scale: false, capture: 'fullPage' }, - pluginVisualRegressionUpdateImages: false, // for updating of not updating the diff image automatically + pluginVisualRegressionCreateMissingImages: true, }, chromeWebSecurity: false, experimentalMemoryManagement: true, diff --git a/cypress/e2e/ps1785/07_mollie.ps1785.VisualRegressionTests.cy.js b/cypress/e2e/ps1785/07_mollie.ps1785.VisualRegressionTests.cy.js index ac0eed05d..81e73b4e7 100755 --- a/cypress/e2e/ps1785/07_mollie.ps1785.VisualRegressionTests.cy.js +++ b/cypress/e2e/ps1785/07_mollie.ps1785.VisualRegressionTests.cy.js @@ -4,12 +4,12 @@ const login = (MollieBOFOLoggingIn) => { cy.session(MollieBOFOLoggingIn,() => { cy.visit('/admin1/') cy.url().should('contain', 'https').as('Check if HTTPS exists') - cy.get('#email').type('demo@prestashop.com',{delay: 0, log: false}) - cy.get('#passwd').type('prestashop_demo',{delay: 0, log: false}) + cy.get('#email').type('demo@demo.com',{delay: 0, log: false}) + cy.get('#passwd').type('demodemo',{delay: 0, log: false}) cy.get('#submit_login').click().wait(1000).as('Connection successsful') cy.visit('/en/my-account') - cy.get('#login-form [name="email"]').eq(0).type('demo@prestashop.com') - cy.get('#login-form [name="password"]').eq(0).type('prestashop_demo') + cy.get('#login-form [name="email"]').eq(0).type('demo@demo.com') + cy.get('#login-form [name="password"]').eq(0).type('demodemo') cy.get('#login-form [type="submit"]').eq(0).click({force:true}) cy.get('#history-link > .link-item').click() }) @@ -28,7 +28,6 @@ describe('PS1785 Visual Regression tests suite', { login('MollieBOFOLoggingIn') }) it('PS1785 - Testing the visual regression of General Settings page', () => { - login('MollieBOFOLoggingIn') cy.visit('/admin1/') cy.get('.mi-mollie').click({fore:true}) cy.get('#subtab-AdminMollieModule').click() diff --git a/cypress/e2e/ps8/07_mollie.ps8.VisualRegressionTests.cy.js b/cypress/e2e/ps8/07_mollie.ps8.VisualRegressionTests.cy.js index dcfd3f35f..f355e9c08 100755 --- a/cypress/e2e/ps8/07_mollie.ps8.VisualRegressionTests.cy.js +++ b/cypress/e2e/ps8/07_mollie.ps8.VisualRegressionTests.cy.js @@ -28,7 +28,6 @@ describe('PS8 Visual Regression tests suite', { login('MollieBOFOLoggingIn') }) it('PS8 - Testing the visual regression of General Settings page', () => { - login('MollieBOFOLoggingIn') cy.visit('/admin1/') cy.get('.mi-mollie').click({fore:true}) cy.get('#subtab-AdminMollieModule').click() From 1b695214c78eb04a63cc2853427f54d38efe896f Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 18 Dec 2023 15:53:03 +0200 Subject: [PATCH 07/13] Update cypress.config.js --- cypress.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cypress.config.js b/cypress.config.js index be4655e4b..04ce56abb 100755 --- a/cypress.config.js +++ b/cypress.config.js @@ -7,8 +7,8 @@ module.exports = defineConfig({ pluginVisualRegressionMaxDiffThreshold: 0.01, pluginVisualRegressionUpdateImages: true, // for updating or not updating the diff image automatically pluginVisualRegressionImagesPath: 'cypress/screenshots', - pluginVisualRegressionScreenshotConfig: { scale: false, capture: 'fullPage' }, - pluginVisualRegressionCreateMissingImages: true, + pluginVisualRegressionScreenshotConfig: { scale: true, capture: 'fullPage' }, + pluginVisualRegressionCreateMissingImages: true, // baseline images updating }, chromeWebSecurity: false, experimentalMemoryManagement: true, From 7f9249f2b912f9e79366e27787e1b1aa2821db33 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 18 Dec 2023 16:11:59 +0200 Subject: [PATCH 08/13] Update 03_mollie.ps8.PaymentTestsOrdersAPI.js --- cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js b/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js index 078834901..6b942b892 100755 --- a/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js +++ b/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js @@ -117,7 +117,7 @@ it('C339354: 17 Credit Card Checkouting [Orders API]', () => { cy.get('[class="alert alert-success"]').should('be.visible') cy.navigatingToThePaymentPS8() //Payment method choosing - cy.contains('Card').click({force:true}) + cy.contains('Karte').click({force:true}) //Credit card inputing cy.CreditCardFillingIframe() cy.get('.condition-label > .js-terms').click({force:true}) @@ -129,7 +129,7 @@ it('C339354: 17 Credit Card Checkouting [Orders API]', () => { it('C339355: 18 Check if customerId is passed during the 2nd payment using Single Click Payment [Orders API]', () => { cy.navigatingToThePaymentPS8() //Payment method choosing - cy.contains('Card').click({force:true}) + cy.contains('Karte').click({force:true}) cy.get('.condition-label > .js-terms').click({force:true}) cy.get('.ps-shown-by-js > .btn').click({force: true}) cy.visit('/admin1/') @@ -299,7 +299,7 @@ it('C339374: 37 Belfius Order Shipping, Refunding [Orders API]', () => { it('C339375: 38 Bank Transfer Checkouting [Orders API]', () => { cy.navigatingToThePaymentPS8() //Payment method choosing - cy.contains('Bank transfer').click({force:true}) + cy.contains('Überweisung').click({force:true}) cy.get('.condition-label > .js-terms').click({force:true}) cy.contains('Place order').click() cy.get('[value="paid"]').click() From f8964a8b3a1dd78bbba5ef0ded937a2281400f8e Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 18 Dec 2023 17:29:46 +0200 Subject: [PATCH 09/13] Update commands.js --- 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 4aeec506b..987e7923b 100755 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -255,7 +255,7 @@ const login = (MollieBOFOLoggingIn) => { } login('MollieBOFOLoggingIn') }) -Cypress.Commands.add("CachingBOFOPS8", () => { +Cypress.Commands.add("CachingBOFOPS8", {cacheAcrossSpecs: true}, () => { //Caching the BO and FO session const login = (MollieBOFOLoggingIn) => { cy.session(MollieBOFOLoggingIn,() => { From f66f87c57cb64e6ef394eedeef4d43999806a4dd Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 18 Dec 2023 17:53:48 +0200 Subject: [PATCH 10/13] visual regression approach updates --- .../e2e/ps1785/01_mollie.ps1785.ModuleConfiguration.specs.js | 3 +++ .../02_mollie.ps1785.EnablingPaymentsOrdersAPI.specs.js | 2 ++ cypress/e2e/ps1785/03_mollie.ps1785.PaymentTestsOrdersAPI.js | 1 + cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js | 4 ++++ .../e2e/ps8/02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js | 2 ++ cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js | 1 + 6 files changed, 13 insertions(+) diff --git a/cypress/e2e/ps1785/01_mollie.ps1785.ModuleConfiguration.specs.js b/cypress/e2e/ps1785/01_mollie.ps1785.ModuleConfiguration.specs.js index ecbee88fc..a0f5aa582 100755 --- a/cypress/e2e/ps1785/01_mollie.ps1785.ModuleConfiguration.specs.js +++ b/cypress/e2e/ps1785/01_mollie.ps1785.ModuleConfiguration.specs.js @@ -81,6 +81,8 @@ it('C339339: 03 Checking the Advanced Settings tab, verifying the Front-end comp cy.get('[name="MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID"]').select('My carrier') cy.get('#module_form_submit_btn').click({force:true}) //checking the saving cy.get('[class="alert alert-success"]').should('be.visible') //checking if saving returns green alert + cy.reload() + cy.matchImage(); // let's make a snapshot for visual regression testing later, if UI matches //cy.window() will check if there are no Errors in console }); it('C688472: Checking the Subscriptions tab, and console errors', () => { @@ -97,5 +99,6 @@ it('C688473: Checking the Subscriptions FAQ, and console errors', () => { cy.get(':nth-child(3) > .col-lg-12 > .card').should('be.visible') cy.get(':nth-child(4) > .col-lg-12 > .card').should('be.visible') cy.get(':nth-child(5) > .col-lg-12 > .card').should('be.visible') + cy.matchImage(); // let's make a snapshot for visual regression testing later, if UI matches }); }) diff --git a/cypress/e2e/ps1785/02_mollie.ps1785.EnablingPaymentsOrdersAPI.specs.js b/cypress/e2e/ps1785/02_mollie.ps1785.EnablingPaymentsOrdersAPI.specs.js index 4ec3a0bb8..af3dc397e 100755 --- a/cypress/e2e/ps1785/02_mollie.ps1785.EnablingPaymentsOrdersAPI.specs.js +++ b/cypress/e2e/ps1785/02_mollie.ps1785.EnablingPaymentsOrdersAPI.specs.js @@ -33,5 +33,7 @@ it('C339341: 04 Enabling All payments in Module BO [Orders API]', () => { cy.ConfOrdersAPI1784() cy.get('[type="submit"]').first().click({force:true}) cy.get('[class="alert alert-success"]').should('be.visible') + cy.reload() + cy.matchImage(); // let's make a snapshot for visual regression testing later, if UI matches }) }) diff --git a/cypress/e2e/ps1785/03_mollie.ps1785.PaymentTestsOrdersAPI.js b/cypress/e2e/ps1785/03_mollie.ps1785.PaymentTestsOrdersAPI.js index 9b03991ff..e2c532cfb 100755 --- a/cypress/e2e/ps1785/03_mollie.ps1785.PaymentTestsOrdersAPI.js +++ b/cypress/e2e/ps1785/03_mollie.ps1785.PaymentTestsOrdersAPI.js @@ -51,6 +51,7 @@ it.skip('C339343: 06 Vouchers Order BO Refunding, Shipping (Paid part only) [Ord }) it('C339344: 07 Bancontact Checkouting [Orders API]', () => { cy.navigatingToThePayment() + cy.matchImage(); // let's make a snapshot for visual regression testing later, if UI matches //Payment method choosing cy.contains('Bancontact').click({force:true}) cy.get('.condition-label > .js-terms').click({force:true}) diff --git a/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js b/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js index b04ed7571..6a555cc61 100755 --- a/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js +++ b/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js @@ -83,6 +83,8 @@ it('C339339: Checking the Advanced Settings tab, verifying the Front-end compone cy.get('[name="MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID"]').select('Click and collect') cy.get('#module_form_submit_btn').click({force:true}) //checking the saving cy.get('[class="alert alert-success"]').should('be.visible') //checking if saving returns green alert + cy.reload() + cy.matchImage(); // let's make a snapshot for visual regression testing later, if UI matches //cy.window() will check if there are no Errors in console }); it('C688472: Checking the Subscriptions tab, and console errors', () => { @@ -101,5 +103,7 @@ it('C688473: Checking the Subscriptions FAQ, and console errors', () => { cy.get(':nth-child(4) > .col-lg-12 > .card').should('be.visible') cy.get(':nth-child(5) > .col-lg-12 > .card').should('be.visible') cy.get(':nth-child(6) > .col-lg-12 > .card').should('be.visible') + cy.matchImage(); // let's make a snapshot for visual regression testing later, if UI matches + }); }) diff --git a/cypress/e2e/ps8/02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js b/cypress/e2e/ps8/02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js index 47926e18e..6d6e09ab7 100755 --- a/cypress/e2e/ps8/02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js +++ b/cypress/e2e/ps8/02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js @@ -38,5 +38,7 @@ it('C339341: 04 Enabling All payments in Module BO [Orders API]', () => { cy.ConfOrdersAPI1784() cy.get('[type="submit"]').first().click({force:true}) cy.get('[class="alert alert-success"]').should('be.visible') + cy.reload() + cy.matchImage(); // let's make a snapshot for visual regression testing later, if UI matches }) }) diff --git a/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js b/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js index 6b942b892..e21adfdb8 100755 --- a/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js +++ b/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js @@ -44,6 +44,7 @@ it.skip('C339343: 06 Vouchers Order BO Refunding, Shipping (Paid part only) [Ord }) it('C339344: 07 Bancontact Checkouting [Orders API]', () => { cy.navigatingToThePaymentPS8() + cy.matchImage(); // let's make a snapshot for visual regression testing later, if UI matches //Payment method choosing cy.contains('Bancontact').click({force:true}) cy.get('.condition-label > .js-terms').click({force:true}) From e01d824a3f288901706e98ceaa583f89d7c83ea4 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Tue, 19 Dec 2023 09:34:47 +0200 Subject: [PATCH 11/13] Update cypress.config.js --- cypress.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress.config.js b/cypress.config.js index 04ce56abb..79648586c 100755 --- a/cypress.config.js +++ b/cypress.config.js @@ -5,7 +5,7 @@ module.exports = defineConfig({ env: { pluginVisualRegressionDiffConfig: { threshold: 0.01 }, pluginVisualRegressionMaxDiffThreshold: 0.01, - pluginVisualRegressionUpdateImages: true, // for updating or not updating the diff image automatically + pluginVisualRegressionUpdateImages: false, // for updating or not updating the diff image automatically pluginVisualRegressionImagesPath: 'cypress/screenshots', pluginVisualRegressionScreenshotConfig: { scale: true, capture: 'fullPage' }, pluginVisualRegressionCreateMissingImages: true, // baseline images updating From 38cdbcc5e1a72ce0d4e1020a4082ca1f8ba37ed2 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Tue, 19 Dec 2023 10:16:37 +0200 Subject: [PATCH 12/13] small additional useful updates for docker --- .docker/wait-loader.sh | 29 +++++++++++++++++++++++++---- Makefile | 2 +- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/.docker/wait-loader.sh b/.docker/wait-loader.sh index 6fd3c295a..28f16b4bd 100755 --- a/.docker/wait-loader.sh +++ b/.docker/wait-loader.sh @@ -17,16 +17,37 @@ spinner() { # Function to display loader with a message show_loader() { local message=$1 - shift + local port=$2 + shift 2 echo -n "$message" ( "$@" ) & local loader_pid=$! + local success=false while ps a | awk '{print $1}' | grep -q $loader_pid; do sleep 0.5 echo -n "■" + + # Check if Docker container host returns a 302 (replace with your actual check) + http_status=$(curl -s -o /dev/null -w "%{http_code}" "http://localhost:$port") + if [ "$http_status" -eq 302 ]; then + success=true + break + fi done - echo " Done." + + if [ "$success" = true ]; then + echo " Done." + else + echo " Failed: Docker container host did not return a 302." + # Optionally, you can add cleanup or error handling code here. + fi } -# Usage example -show_loader "Building app containers. Please wait " sleep 60 +# Usage example with port as a parameter +if [ "$#" -lt 1 ]; then + echo "Usage: $0 " + exit 1 +fi + +port=$1 +show_loader "Building app containers. Please wait " "$port" sleep 60 diff --git a/Makefile b/Makefile index eee10e4d3..5383494f9 100755 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ e2eh8_local: # sees what containers are running docker-compose -f docker-compose.8.yml ps # waiting for app containers to build up - /bin/bash .docker/wait-loader.sh + /bin/bash .docker/wait-loader.sh 8142 # seeding the customized settings for PS mysql -h 127.0.0.1 -P 9459 --protocol=tcp -u root -pprestashop prestashop < ${PWD}/tests/seed/database/prestashop_8.sql # installing module From eee9f16edda846941cccd740a63e6d28947e1708 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Tue, 19 Dec 2023 11:31:34 +0200 Subject: [PATCH 13/13] Update Makefile --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5383494f9..0e9f37a69 100755 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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" -#PS1785 +#PS1785 without PS autoinstall, both CI and local e2eh1785: # detaching containers docker-compose -f docker-compose.1785.yml up -d --force-recreate @@ -27,7 +27,7 @@ e2eh1785: # chmod all folders docker exec -i prestashop-mollie-1785 sh -c "chmod -R 777 /var/www/html" -#PS8 +#PS8 for local machine docker build with PS autoinstall e2eh8_local: # detaching containers docker-compose -f docker-compose.8.yml up -d --force-recreate @@ -48,6 +48,7 @@ e2eh8_local: # chmod all folders docker exec -i prestashop-mollie-8 sh -c "chmod -R 777 /var/www/html" +#PS8 for CI build with PS autoinstall e2eh8: # detaching containers docker-compose -f docker-compose.8.yml up -d --force-recreate