improved cypress e2e reporting

frontend/integration-tests/protractor.conf.ts

@@ -33,7 +33,7 @@ const htmlReporter = new HtmlScreenshotReporter({
  dest: `./${screenshotsDir}`,
  inlineImages: true,
  captureOnlyFailedSpecs: true,
- filename: 'test-gui-report.html',
+ filename: 'protractor-report.html',
 });
 const junitReporter = new JUnitXmlReporter({
  savePath: `./${screenshotsDir}`,

frontend/package.json

@@ -28,6 +28,9 @@
  "test-suite": "ts-node -O '{\"module\":\"commonjs\"}' ./node_modules/.bin/protractor integration-tests/protractor.conf.ts",
  "test-cypress": "cd packages/integration-tests-cypress && cypress open --env openshift=true",
  "test-cypress-headless": "cd packages/integration-tests-cypress && node --max-old-space-size=4096 ../../node_modules/.bin/cypress run --env openshift=true --browser chrome --headless",
+ "cypress-merge": "mochawesome-merge ./gui_test_screenshots/cypress_report*.json > ./gui_test_screenshots/cypress.json",
+ "cypress-generate": "marge -o ./gui_test_screenshots/ -f cypress-report -t 'OpenShift Console Cypress Test Results' -p 'OpenShift Cypress Test Results' --showPassed false --assetsDir ./gui_test_screenshots/cypress/assets ./gui_test_screenshots/cypress.json",
+ "cypress-postreport": "yarn run cypress-merge && yarn run cypress-generate && rm -f ./gui_test_screenshots/cypress*.json",
  "debug-test-suite": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' node -r ts-node/register --inspect-brk ./node_modules/.bin/protractor integration-tests/protractor.conf.ts",
  "analyze": "NODE_ENV=production NODE_OPTIONS=--max-old-space-size=4096 ts-node -O '{\"module\":\"commonjs\"}' ./node_modules/.bin/webpack --mode=production --profile --json | awk '{if(NR>2)print}' > public/dist/stats.json && ts-node -O '{\"module\":\"commonjs\"}' ./node_modules/.bin/webpack-bundle-analyzer --mode static -r public/dist/report.html public/dist/stats.json",
  "prettier-all": "prettier --write '**/*.{js,jsx,ts,tsx,json}'",
@@ -165,12 +168,12 @@
  },
  "devDependencies": {
  "@babel/core": "^7.10.3",
+ "@cypress/webpack-preprocessor": "^4.1.3",
  "@graphql-codegen/cli": "^1.15.1",
  "@graphql-codegen/typescript": "^1.15.1",
  "@graphql-codegen/typescript-graphql-files-modules": "^1.15.1",
  "@graphql-codegen/typescript-operations": "^1.15.1",
  "@pmmmwh/react-refresh-webpack-plugin": "^0.4.1",
- "@cypress/webpack-preprocessor": "^4.1.3",
  "@types/classnames": "^2.2.7",
  "@types/enzyme": "3.10.x",
  "@types/glob": "7.x",
@@ -203,8 +206,8 @@
  "cypress-multi-reporters": "^1.4.0",
  "enzyme": "3.10.x",
  "enzyme-adapter-react-16": "1.15.2",
- "eslint-plugin-graphql": "^4.0.0",
  "eslint-plugin-cypress": "^2.10.3",
+ "eslint-plugin-graphql": "^4.0.0",
  "file-loader": "1.x",
  "find-up": "4.x",
  "fork-ts-checker-webpack-plugin": "0.x",
@@ -222,8 +225,11 @@
  "jest-transform-graphql": "^2.1.0",
  "lint-staged": "^10.2.2",
  "mini-css-extract-plugin": "0.4.x",
- "mock-socket": "^9.0.3",
  "mocha-junit-reporter": "^1.23.3",
+ "mochawesome": "^6.1.1",
+ "mochawesome-merge": "^4.1.0",
+ "mochawesome-report-generator": "^5.1.0",
+ "mock-socket": "^9.0.3",
  "moment": "2.22.x",
  "monaco-editor-core": "0.20.0",
  "monaco-editor-webpack-plugin": "^1.9.0",

frontend/packages/integration-tests-cypress/reporter-config.json

@@ -1,7 +1,14 @@
 {
- "reporterEnabled": "spec, mocha-junit-reporter",
+ "reporterEnabled": "mocha-junit-reporter, mochawesome",
  "mochaJunitReporterReporterOptions": {
  "mochaFile": "../../gui_test_screenshots/junit_cypress-[hash].xml",
  "toConsole": false
+ },
+ "mochawesomeReporterOptions": {
+ "reportDir": "../../gui_test_screenshots/",
+ "reportFilename": "cypress_report",
+ "overwrite": false,
+ "html": false,
+ "json": true
  }
 }

frontend/yarn.lock

@@ -6030,6 +6030,11 @@ date-now@^0.1.4:
  version "0.1.4"
  resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
 
+dateformat@^3.0.2:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
+ integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
+
 de-indent@^1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
@@ -6283,6 +6288,11 @@ diff@^3.1.0, diff@^3.2.0:
  version "3.5.0"
  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
 
+diff@^4.0.1:
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
+ integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
+
 diffie-hellman@^5.0.0:
  version "5.0.3"
  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
@@ -6827,7 +6837,7 @@ escalade@^3.0.1:
  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.0.2.tgz#6a580d70edb87880f22b4c91d0d56078df6962c4"
  integrity sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ==
 
-escape-html@~1.0.3:
+escape-html@^1.0.3, escape-html@~1.0.3:
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
 
@@ -8016,7 +8026,7 @@ fs-extra@^4.0.2:
  jsonfile "^4.0.0"
  universalify "^0.1.0"
 
-fs-extra@^7.0.0:
+fs-extra@^7.0.0, fs-extra@^7.0.1:
  version "7.0.1"
  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
@@ -8089,6 +8099,11 @@ fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
  mkdirp ">=0.5 0"
  rimraf "2"
 
+fsu@^1.0.2:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/fsu/-/fsu-1.1.1.tgz#bd36d3579907c59d85b257a75b836aa9e0c31834"
+ integrity sha512-xQVsnjJ/5pQtcKh+KjUoZGzVWn4uNkchxTF6Lwjr4Gf7nQr8fmUfhKJ62zE77+xQg9xnxi5KUps7XGs+VC986A==
+
 function-bind@^1.0.2, function-bind@^1.1.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -10971,12 +10986,17 @@ lodash.isboolean@^3.0.3:
  resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
  integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=
 
+lodash.isempty@^4.4.0:
+ version "4.4.0"
+ resolved "https://registry.yarnpkg.com/lodash.isempty/-/lodash.isempty-4.4.0.tgz#6f86cbedd8be4ec987be9aaf33c9684db1b31e7e"
+ integrity sha1-b4bL7di+TsmHvpqvM8loTbGzHn4=
+
 lodash.isequal@^4.5.0:
  version "4.5.0"
  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
 
-lodash.isfunction@^3.0.8:
+lodash.isfunction@^3.0.8, lodash.isfunction@^3.0.9:
  version "3.0.9"
  resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz#06de25df4db327ac931981d1bdb067e5af68d051"
 
@@ -10990,6 +11010,11 @@ lodash.isnumber@^3.0.3:
  resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc"
  integrity sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w=
 
+lodash.isobject@^3.0.2:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-3.0.2.tgz#3c8fb8d5b5bf4bf90ae06e14f2a530a4ed935e1d"
+ integrity sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0=
+
 lodash.isplainobject@^4.0.6:
  version "4.0.6"
  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
@@ -11570,6 +11595,50 @@ mocha-junit-reporter@^1.23.3:
  strip-ansi "^4.0.0"
  xml "^1.0.0"
 
+mochawesome-merge@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/mochawesome-merge/-/mochawesome-merge-4.1.0.tgz#25a514460c6e106e2c8399daaec2d085b6e89b56"
+ integrity sha512-cDMzSmYu1dRKcr+ZrjjUEuXSiirU8LTG6R8hrAPlZ7zy1EeL7LLpi+a156obxzqh8quTWmYxKtUbTF2PQt0l7A==
+ dependencies:
+ fs-extra "^7.0.1"
+ glob "^7.1.6"
+ uuid "^3.3.2"
+ yargs "^15.3.1"
+
+mochawesome-report-generator@^5.1.0:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/mochawesome-report-generator/-/mochawesome-report-generator-5.1.0.tgz#b8809e7661ac31732fa7ae7210380f704f7c68f6"
+ integrity sha512-5cI4Jh+sD+jIxc7q94961vnm/6VKDI7TFUPt9dps6oAc4y4WMpEeeOlmgKKM81q2eGaviNUYw+acFalGK6EJ9g==
+ dependencies:
+ chalk "^2.4.2"
+ dateformat "^3.0.2"
+ escape-html "^1.0.3"
+ fs-extra "^7.0.0"
+ fsu "^1.0.2"
+ lodash.isfunction "^3.0.8"
+ opener "^1.4.2"
+ prop-types "^15.7.2"
+ tcomb "^3.2.17"
+ tcomb-validation "^3.3.0"
+ validator "^10.11.0"
+ yargs "^13.2.2"
+
+mochawesome@^6.1.1:
+ version "6.1.1"
+ resolved "https://registry.yarnpkg.com/mochawesome/-/mochawesome-6.1.1.tgz#9155ac13edb42c9eb17a7adbbcbbb5c6ecefb972"
+ integrity sha512-fRGZkSJI+u4ODRQCFg3JqI4pqZGzOpfZqlEjvUoZ78l2JnBWwepPu7dMTAcyAEUsZbTSx7S4eVnsi+/Zh1Qq6A==
+ dependencies:
+ chalk "^4.0.0"
+ diff "^4.0.1"
+ json-stringify-safe "^5.0.1"
+ lodash.isempty "^4.4.0"
+ lodash.isfunction "^3.0.9"
+ lodash.isobject "^3.0.2"
+ lodash.isstring "^4.0.1"
+ mochawesome-report-generator "^5.1.0"
+ strip-ansi "^6.0.0"
+ uuid "^7.0.3"
+
 mock-socket@^9.0.3:
  version "9.0.3"
  resolved "https://registry.yarnpkg.com/mock-socket/-/mock-socket-9.0.3.tgz#4bc6d2aea33191e4fed5ec71f039e2bbeb95e414"
@@ -12315,7 +12384,7 @@ opencollective-postinstall@^2.0.2:
  resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz#5657f1bede69b6e33a45939b061eb53d3c6c3a89"
  integrity sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw==
 
-opener@^1.5.1:
+opener@^1.4.2, opener@^1.5.1:
  version "1.5.1"
  resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz#6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed"
  integrity sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==
@@ -16027,6 +16096,18 @@ tar@^2.0.0, tar@^2.2.1:
  fstream "^1.0.2"
  inherits "2"
 
+tcomb-validation@^3.3.0:
+ version "3.4.1"
+ resolved "https://registry.yarnpkg.com/tcomb-validation/-/tcomb-validation-3.4.1.tgz#a7696ec176ce56a081d9e019f8b732a5a8894b65"
+ integrity sha512-urVVMQOma4RXwiVCa2nM2eqrAomHROHvWPuj6UkDGz/eb5kcy0x6P0dVt6kzpUZtYMNoAqJLWmz1BPtxrtjtrA==
+ dependencies:
+ tcomb "^3.0.0"
+
+tcomb@^3.0.0, tcomb@^3.2.17:
+ version "3.2.29"
+ resolved "https://registry.yarnpkg.com/tcomb/-/tcomb-3.2.29.tgz#32404fe9456d90c2cf4798682d37439f1ccc386c"
+ integrity sha512-di2Hd1DB2Zfw6StGv861JoAF5h/uQVu/QJp2g8KVbtfKnoHdBQl5M32YWq6mnSYBQ1vFFrns5B1haWJL7rKaOQ==
+
 tcp-port-used@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/tcp-port-used/-/tcp-port-used-1.0.1.tgz#46061078e2d38c73979a2c2c12b5a674e6689d70"
@@ -16811,6 +16892,11 @@ validate-npm-package-license@^3.0.1:
  spdx-correct "^3.0.0"
  spdx-expression-parse "^3.0.0"
 
+validator@^10.11.0:
+ version "10.11.0"
+ resolved "https://registry.yarnpkg.com/validator/-/validator-10.11.0.tgz#003108ea6e9a9874d31ccc9e5006856ccd76b228"
+ integrity sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw==
+
 value-equal@^0.4.0:
  version "0.4.0"
  resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.4.0.tgz#c5bdd2f54ee093c04839d71ce2e4758a6890abc7"
@@ -17938,7 +18024,7 @@ yargs-parser@^15.0.1:
  camelcase "^5.0.0"
  decamelize "^1.2.0"
 
-yargs-parser@^18.1.1:
+yargs-parser@^18.1.1, yargs-parser@^18.1.2:
  version "18.1.3"
  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
@@ -18015,7 +18101,7 @@ yargs@^10.0.3:
  y18n "^3.2.1"
  yargs-parser "^8.1.0"
 
-yargs@^13.3.2:
+yargs@^13.2.2, yargs@^13.3.2:
  version "13.3.2"
  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
@@ -18048,6 +18134,23 @@ yargs@^14.2.0:
  y18n "^4.0.0"
  yargs-parser "^15.0.1"
 
+yargs@^15.3.1:
+ version "15.4.1"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
+ integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
+ dependencies:
+ cliui "^6.0.0"
+ decamelize "^1.2.0"
+ find-up "^4.1.0"
+ get-caller-file "^2.0.1"
+ require-directory "^2.1.1"
+ require-main-filename "^2.0.0"
+ set-blocking "^2.0.0"
+ string-width "^4.2.0"
+ which-module "^2.0.0"
+ y18n "^4.0.0"
+ yargs-parser "^18.1.2"
+
 yargs@^7.0.0:
  version "7.1.0"
  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"

test-cypress.sh

@@ -2,4 +2,10 @@
 set -exuo pipefail
 cd frontend
 yarn install
+
+function generateReport {
+ yarn run cypress-postreport
+}
+trap generateReport EXIT
+
 yarn run test-cypress-headless