Merge branch 'dev' into dependabot/npm_and_yarn/reportportal/agent-js…

…-cypress-63ef44e
dhis2 · Dec 20, 2023 · 2dc6217 · 2dc6217
2 parents bcf6a24 + 8a1ae30
commit 2dc6217
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 47 deletions.
diff --git a/.github/workflows/dhis2-verify-app.yml b/.github/workflows/dhis2-verify-app.yml
@@ -76,6 +76,9 @@ jobs:
                   REPORTPORTAL_API_KEY: ${{ secrets.REPORTPORTAL_API_KEY }}
                   REPORTPORTAL_ENDPOINT: ${{ vars.REPORTPORTAL_ENDPOINT }}
                   REPORTPORTAL_PROJECT: ${{ vars.REPORTPORTAL_PROJECT }}
+                  CI_BUILD_ID: ${{ github.sha }}-${{ github.workflow }}-${{ github.event_name }}
+                  BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+                  PR_TITLE: ${{ github.event.pull_request.title }}
 
     call-workflow-e2e-prod:
         if: "!contains(github.event.head_commit.message, '[skip ci]')"

diff --git a/cypress.config.js b/cypress.config.js
@@ -43,7 +43,7 @@ module.exports = defineConfig({
             },
             {
                 key: 'app_name',
-                value: 'maps_app',
+                value: 'maps-app',
             },
             {
                 key: 'test_level',

diff --git a/jest.config.js b/jest.config.js
@@ -1,3 +1,46 @@
+const reportPortalConfig = [
+    '@reportportal/agent-js-jest',
+    {
+        apiKey: process.env.REPORTPORTAL_API_KEY,
+        endpoint: process.env.REPORTPORTAL_ENDPOINT,
+        project: process.env.REPORTPORTAL_PROJECT,
+        launch: 'maps_app',
+        attributes: [
+            {
+                key: 'dhis2_version',
+                value: 'master',
+            },
+            {
+                key: 'app_name',
+                value: 'maps-app',
+            },
+            {
+                key: 'test_level',
+                value: 'unit/integration',
+            },
+            {
+                key: 'BRANCH_NAME',
+                value: process.env.BRANCH_NAME,
+            },
+            {
+                key: 'CI_BUILD_ID',
+                value: process.env.CI_BUILD_ID,
+            },
+            {
+                key: 'PR_TITLE',
+                value: process.env.PR_TITLE,
+            },
+        ],
+        description: '',
+        debug: true,
+    },
+]
+
+const isReportPortalSetup =
+    process.env.REPORTPORTAL_API_KEY !== undefined &&
+    process.env.REPORTPORTAL_ENDPOINT !== undefined &&
+    process.env.REPORTPORTAL_PROJECT !== undefined
+
 module.exports = {
     setupFilesAfterEnv: ['<rootDir>/config/testSetup.js'],
     collectCoverageFrom: ['src/**/*.js'],
@@ -14,30 +57,6 @@ module.exports = {
     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: 'maps_app',
-                attributes: [
-                    {
-                        key: 'version',
-                        value: 'master',
-                    },
-                    {
-                        key: 'app_name',
-                        value: 'maps_app',
-                    },
-                    {
-                        key: 'test_level',
-                        value: 'unit/integration',
-                    },
-                ],
-                description: '',
-                debug: true,
-            },
-        ],
+        ...(isReportPortalSetup ? [reportPortalConfig] : []),
     ],
 }
diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
         "postinstall": "patch-package"
     },
     "devDependencies": {
-        "@dhis2/cli-app-scripts": "^10.3.10",
+        "@dhis2/cli-app-scripts": "^10.3.11",
         "@dhis2/cli-style": "^10.5.1",
         "@dhis2/cypress-commands": "^10.0.3",
         "@dhis2/cypress-plugins": "^10.0.3",

diff --git a/yarn.lock b/yarn.lock
@@ -2036,12 +2036,12 @@
     react-beautiful-dnd "^10.1.1"
     resize-observer-polyfill "^1.5.1"
 
-"@dhis2/[email protected].10":
-  version "10.3.10"
-  resolved "https://registry.yarnpkg.com/@dhis2/app-adapter/-/app-adapter-10.3.10.tgz#31e8bc93cdb3793db412707cdaf6f2d086c06d39"
-  integrity sha512-YjFrCq3s8+jPoycMacezM9nMd63C+Lcbzf9Lnu1zlJlHMSjVUTZ8nbWEqy1WQUR6vvWIZ+0DWGw1PPzDJNViog==
+"@dhis2/[email protected].11":
+  version "10.3.11"
+  resolved "https://registry.yarnpkg.com/@dhis2/app-adapter/-/app-adapter-10.3.11.tgz#a5322deba404fb405f80925684d7a5d9cdc48c81"
+  integrity sha512-H36P1tqSuzMyu4/uxSVFsEIXrWXzqVG1NPtANY+xEJcmrOoXH7YuiKvJu/Dl4rINDkERuUM+GwWMMgfBuMmrUw==
   dependencies:
-    "@dhis2/pwa" "10.3.10"
+    "@dhis2/pwa" "10.3.11"
     moment "^2.24.0"
 
 "@dhis2/app-runtime-adapter-d2@^1.1.0":
@@ -2098,15 +2098,15 @@
   dependencies:
     lodash "^4.17.21"
 
-"@dhis2/[email protected].10":
-  version "10.3.10"
-  resolved "https://registry.yarnpkg.com/@dhis2/app-shell/-/app-shell-10.3.10.tgz#b8511fc52a97c40f0919c8f632cfda5edd664340"
-  integrity sha512-14FbdP+8Q657572LBU7zxVnTxB1cxD837k9n5ir6GKeb9Obw4KzdN2tTBA2Ll76iL83WjxcdzmAEiE6jSXCjyw==
+"@dhis2/[email protected].11":
+  version "10.3.11"
+  resolved "https://registry.yarnpkg.com/@dhis2/app-shell/-/app-shell-10.3.11.tgz#461a19159ae6938e705ab793005403327b1ad95b"
+  integrity sha512-DCEOFK5i2/oNOOz33SqQ/7J3LJN0zUYMukdS/arEQCR9zP4bs+1yHGNRXtv8XoQRiYzdlIXsimlZzOm1ZDsxTw==
   dependencies:
-    "@dhis2/app-adapter" "10.3.10"
+    "@dhis2/app-adapter" "10.3.11"
     "@dhis2/app-runtime" "^3.9.0"
     "@dhis2/d2-i18n" "^1.1.1"
-    "@dhis2/pwa" "10.3.10"
+    "@dhis2/pwa" "10.3.11"
     "@dhis2/ui" "^8.12.3"
     classnames "^2.2.6"
     moment "^2.29.1"
@@ -2119,10 +2119,10 @@
     typeface-roboto "^0.0.75"
     typescript "^3.6.3"
 
-"@dhis2/cli-app-scripts@^10.3.10":
-  version "10.3.10"
-  resolved "https://registry.yarnpkg.com/@dhis2/cli-app-scripts/-/cli-app-scripts-10.3.10.tgz#864d7ef7bcd2ba7f1f494c0b0d130edfda87360a"
-  integrity sha512-b0lZIIbV3LaiOvx5ptBLBjg+qFZCgOLJbNBvdaGLaOJAGU2QHGffcOsZvGBWYcQ6ipn+o0O1AFpuo9FFIY7EkQ==
+"@dhis2/cli-app-scripts@^10.3.11":
+  version "10.3.11"
+  resolved "https://registry.yarnpkg.com/@dhis2/cli-app-scripts/-/cli-app-scripts-10.3.11.tgz#024920726eb9a9057fa1f73d745b9a75b5d55b7e"
+  integrity sha512-j7fetbmlSSHdGz9YlGJMaKyLzfEGWnOoaKvi53UfI0e3k7EIBbc9YTLH6qoYJX4KvvXNjB9ICNjvTFEjWHeIZw==
   dependencies:
     "@babel/core" "^7.6.2"
     "@babel/plugin-proposal-class-properties" "^7.8.3"
@@ -2131,7 +2131,7 @@
     "@babel/preset-env" "^7.14.7"
     "@babel/preset-react" "^7.0.0"
     "@babel/preset-typescript" "^7.6.0"
-    "@dhis2/app-shell" "10.3.10"
+    "@dhis2/app-shell" "10.3.11"
     "@dhis2/cli-helpers-engine" "^3.2.0"
     "@jest/core" "^27.0.6"
     "@pmmmwh/react-refresh-webpack-plugin" "^0.5.4"
@@ -2282,10 +2282,10 @@
   resolved "https://registry.yarnpkg.com/@dhis2/prop-types/-/prop-types-3.1.2.tgz#65b8ad2da8cd2f72bc8b951049a6c9d1b97af3e9"
   integrity sha512-eM0jjLOWvtXWqSFp5YC4DHFpkP8Y1D2eUwGV7MBWjni+o27oesVan+oT7WHeOeLdlAd4acRJrnaaAyB4Ck1wGQ==
 
-"@dhis2/[email protected].10":
-  version "10.3.10"
-  resolved "https://registry.yarnpkg.com/@dhis2/pwa/-/pwa-10.3.10.tgz#2d00f06dbc1dac060d3d4b4096c4f5b7651fbc54"
-  integrity sha512-MBLySNo02SIXP/aHKvTvdan2/Fx3nyBhddwi3HzZFfc2LQ7/oHLLE+SvOL8JtTAet13GEu4chYyzIe3JvTzgDw==
+"@dhis2/[email protected].11":
+  version "10.3.11"
+  resolved "https://registry.yarnpkg.com/@dhis2/pwa/-/pwa-10.3.11.tgz#6eb5a692fe92a56bd6ffa56f06322617c15968dc"
+  integrity sha512-nHQhNDe0MTEG3/YcdBDcGD6NwcDoDKUyJWbtC8xErEKbHIns0HWjhIC+NPMrVu3NxEv1HZiHupK9lnfzPVJC4Q==
   dependencies:
     idb "^6.0.0"
     workbox-core "^6.1.5"