Skip to content

Commit

Permalink
feat(chore): update Cypress reporter call with mochawesome (#614)
Browse files Browse the repository at this point in the history
- remove previous mochawesome implementation, we don't need the mocha merge/report anymore
  • Loading branch information
ghiscoding authored Oct 28, 2020
1 parent 8705aac commit 07bd99a
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
name: Running Cypress E2E tests with JUnit reporter
command: |
cd test/cypress
yarn cypress:ci:mochawesome
yarn cypress:ci
- run:
name: Build Demo Site
command: yarn run ng:build
6 changes: 3 additions & 3 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@
{
"label": "Cypress Open Tool",
"type": "shell",
"command": "yarn run cypress:open",
"command": "yarn run cypress",
"problemMatcher": []
},
{
"label": "Cypress CI (mochawesome)",
"type": "shell",
"command": "yarn run cypress:ci:mochawesome",
"command": "yarn run cypress:ci",
"problemMatcher": []
},
{
Expand Down Expand Up @@ -68,4 +68,4 @@
"problemMatcher": []
}
]
}
}
11 changes: 5 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,14 @@
"prebuild": "npm-run-all delete:dist",
"build": "npm run packagr",
"postbuild": "npm-run-all sass:build sass:copy copy:i18n copy:lib",
"build:with-e2e": "npm-run-all build cypress:ci:mochawesome",
"build:with-e2e": "npm-run-all build cypress:ci",
"build:gh-demo": "npm run build",
"postbuild:gh-demo": "npm-run-all del-demo:dist copy-demo:dist",
"build:gh-demo:with-e2e": "npm run build:gh-demo",
"postbuild:gh-demo:with-e2e": "npm run cypress:ci:mochawesome",
"postbuild:gh-demo:with-e2e": "npm run cypress:ci",
"delete:dist": "cross-env rimraf dist",
"cypress:ci:mochawesome": "cd test/cypress && npm run cypress:ci:mochawesome",
"cypress:ci:xml": "cd test/cypress && node node_modules/cypress/bin/cypress run --reporter xunit --reporter-options output=testresult.xml",
"cypress:open": "cd test/cypress && node node_modules/cypress/bin/cypress open",
"cypress": "cd test/cypress && node node_modules/cypress/bin/cypress open",
"cypress:ci": "cd test/cypress && npm run cypress:ci",
"test": "npm run test:jest",
"test:jest": "node_modules/.bin/jest --config test/jest.config.js",
"jest:clear": "node_modules/.bin/jest --clearCache",
Expand Down Expand Up @@ -179,4 +178,4 @@
"yargs": "^15.4.1",
"zone.js": "^0.8.29"
}
}
}
24 changes: 0 additions & 24 deletions test/cypress/cypress-mochawesome.js

This file was deleted.

3 changes: 2 additions & 1 deletion test/cypress/cypress.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"fixturesFolder": "fixtures",
"integrationFolder": "integration",
"pluginsFile": "plugins/index.js",
"reporter": "mochawesome",
"screenshotsFolder": "screenshots",
"supportFile": "support/index.js",
"videosFolder": "videos"
}
}
13 changes: 5 additions & 8 deletions test/cypress/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,14 @@
"description": "The Cypress integration tests.",
"main": "index.js",
"scripts": {
"cypress:ci:mochawesome": "node cypress-mochawesome.js",
"cypress:ci:xml": "node node_modules/cypress/bin/cypress run --reporter xunit --reporter-options output=testresult.xml",
"cypress:open": "node node_modules/cypress/bin/cypress open"
"cypress": "node node_modules/cypress/bin/cypress open",
"cypress:ci": "cypress run --config-file cypress.json --reporter mochawesome"
},
"author": "Ghislain B.",
"license": "MIT",
"devDependencies": {
"cypress": "^5.3.0",
"mocha": "^5.2.0",
"mochawesome": "^3.1.2",
"mochawesome-merge": "^1.0.7",
"mochawesome-report-generator": "^3.1.5"
"cypress": "^5.5.0",
"mocha": "^8.2.0",
"mochawesome": "^6.1.1"
}
}

0 comments on commit 07bd99a

Please sign in to comment.