Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: dhis2/aggregate-data-entry-app
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 38b8b1fff01ed1e254409b1538da9140abf89438
Choose a base ref
..
head repository: dhis2/aggregate-data-entry-app
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b34e4aed8986e4d2a6bdaf64068d454688617964
Choose a head ref
Showing with 59 additions and 11 deletions.
  1. +6 −0 .github/workflows/dhis2-verify-app.yml
  2. +6 −2 cypress.config.js
  3. +29 −0 jest.config.js
  4. +1 −0 package.json
  5. +17 −9 yarn.lock
6 changes: 6 additions & 0 deletions .github/workflows/dhis2-verify-app.yml
Original file line number Diff line number Diff line change
@@ -82,6 +82,10 @@ jobs:

- name: Test
run: yarn d2-app-scripts test
env:
REPORTPORTAL_API_KEY: ${{ secrets.REPORTPORTAL_API_KEY }}
REPORTPORTAL_ENDPOINT: ${{ vars.REPORTPORTAL_ENDPOINT }}
REPORTPORTAL_PROJECT: ${{ vars.REPORTPORTAL_PROJECT }}

e2e:
runs-on: ubuntu-latest
@@ -120,6 +124,8 @@ jobs:
CYPRESS_dhis2ApiVersion: 40
CYPRESS_networkMode: stub
REPORTPORTAL_API_KEY: ${{ secrets.REPORTPORTAL_API_KEY }}
REPORTPORTAL_ENDPOINT: ${{ vars.REPORTPORTAL_ENDPOINT }}
REPORTPORTAL_PROJECT: ${{ vars.REPORTPORTAL_PROJECT }}

release:
runs-on: ubuntu-latest
8 changes: 6 additions & 2 deletions cypress.config.js
Original file line number Diff line number Diff line change
@@ -22,10 +22,10 @@ module.exports = defineConfig({
defaultCommandTimeout: 30000,
reporter: '@reportportal/agent-js-cypress',
reporterOptions: {
endpoint: 'https://test.tools.dhis2.org/reportportal/api/v1',
endpoint: process.env.REPORTPORTAL_ENDPOINT,
apiKey: process.env.REPORTPORTAL_API_KEY,
launch: 'aggregate_data_entry_app_master',
project: 'dhis2_auto',
project: process.env.REPORTPORTAL_PROJECT,
description: '',
autoMerge: true,
parallel: true,
@@ -42,6 +42,10 @@ module.exports = defineConfig({
key: 'app_name',
value: 'aggregate_data_entry_app',
},
{
key: 'test_level',
value: 'e2e',
},
],
},
e2e: {
29 changes: 29 additions & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -9,4 +9,33 @@ module.exports = {
moduleNameMapper: {
'\\.css$': 'identity-obj-proxy',
},
testRunner: 'jest-circus/runner',
reporters: [
'default',
[
'@reportportal/agent-js-jest',
{
apiKey: process.env.REPORTPORTAL_API_KEY,
endpoint: process.env.REPORTPORTAL_ENDPOINT,
project: process.env.REPORTPORTAL_PROJECT,
launch: 'aggregate_data_entry_app_master',
attributes: [
{
key: 'version',
value: 'master',
},
{
key: 'app_name',
value: 'aggregate_data_entry_app',
},
{
key: 'test_level',
value: 'unit/integration',
},
],
description: '',
debug: true,
},
],
],
}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -35,6 +35,7 @@
"@dhis2/cypress-commands": "^10.0.1",
"@dhis2/cypress-plugins": "^10.0.1",
"@reportportal/agent-js-cypress": "^5.1.3",
"@reportportal/agent-js-jest": "^5.0.6",
"@testing-library/jest-dom": "5.16.5",
"@testing-library/react": "12.1.5",
"@testing-library/react-hooks": "7.0.2",
26 changes: 17 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
@@ -3392,6 +3392,14 @@
mocha "^10.2.0"
node-ipc "9.1.1"

"@reportportal/agent-js-jest@^5.0.6":
version "5.0.6"
resolved "https://registry.yarnpkg.com/@reportportal/agent-js-jest/-/agent-js-jest-5.0.6.tgz#336ed06c3c80d70bd8e50824bc3c883cb5d2548e"
integrity sha512-Gt2oOZ/k5HxZ2J3Hb6X43y6XZmvpldt3yM2wPdrU5CPhXb9hxdiZUl+e2MfI3y0aB+d6T/AkKcUyT7f91sZaYw==
dependencies:
"@reportportal/client-javascript" "^5.0.12"
strip-ansi "^6.0.1"

"@reportportal/client-javascript@^5.0.12":
version "5.0.12"
resolved "https://registry.yarnpkg.com/@reportportal/client-javascript/-/client-javascript-5.0.12.tgz#b6d9254014545ca56599c05105854ea814561f1e"
@@ -3901,9 +3909,9 @@
integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==

"@types/lodash@^4.14.175":
version "4.14.196"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.196.tgz#a7c3d6fc52d8d71328b764e28e080b4169ec7a95"
integrity sha512-22y3o88f4a94mKljsZcanlNWPzO0uBsBdzLAngf2tp533LzZcQzb6+eZPJ+vCTt+bqF2XnvT9gejTLsAcJAJyQ==
version "4.14.197"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.197.tgz#e95c5ddcc814ec3e84c891910a01e0c8a378c54b"
integrity sha512-BMVOiWs0uNxHVlHBgzTIqJYmj+PgCo4euloGF+5m4okL3rEYzM2EEv78mw8zWSMM57dM7kVIgJ2QDvwHSoCI5g==

"@types/mime@*":
version "3.0.1"
@@ -10899,9 +10907,9 @@ lru-cache@^6.0.0:
yallist "^4.0.0"

"lru-cache@^9.1.1 || ^10.0.0":
version "10.0.0"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.0.tgz#b9e2a6a72a129d81ab317202d93c7691df727e61"
integrity sha512-svTf/fzsKHffP42sujkO/Rjs37BCIsQVRCeNYIm9WN8rgT7ffoUnRtZCqU+6BqcSBdv8gwJeTz8knJpgACeQMw==
version "10.0.1"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.1.tgz#0a3be479df549cca0e5d693ac402ff19537a6b7a"
integrity sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==

luxon@3.2.1:
version "3.2.1"
@@ -11182,9 +11190,9 @@ minipass@^4.2.4:
integrity sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==

"minipass@^5.0.0 || ^6.0.2 || ^7.0.0":
version "7.0.2"
resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.2.tgz#58a82b7d81c7010da5bd4b2c0c85ac4b4ec5131e"
integrity sha512-eL79dXrE1q9dBbDCLg7xfn/vl7MS4F1gvJAgjJrQli/jbQWdUttuVawphqpffoIYfRdq78LHx6GP4bU/EQ2ATA==
version "7.0.3"
resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.3.tgz#05ea638da44e475037ed94d1c7efcc76a25e1974"
integrity sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==

minizlib@^1.3.3:
version "1.3.3"