Merge branch 'master' into feat/tracked-entity-input

dhis2 · Dec 12, 2023 · 20ec39b · 20ec39b
2 parents c9206b5 + d033cca
commit 20ec39b
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 26 deletions.
diff --git a/cypress.config.js b/cypress.config.js
@@ -39,7 +39,7 @@ module.exports = defineConfig({
             },
             {
                 key: 'app_name',
-                value: 'line_listing_app',
+                value: 'line-listing-app',
             },
             {
                 key: 'test_level',

diff --git a/jest.config.js b/jest.config.js
@@ -1,3 +1,34 @@
+const reportPortalConfig = [
+    '@reportportal/agent-js-jest',
+    {
+        apiKey: process.env.REPORTPORTAL_API_KEY,
+        endpoint: process.env.REPORTPORTAL_ENDPOINT,
+        project: process.env.REPORTPORTAL_PROJECT,
+        launch: 'line_listing_app',
+        attributes: [
+            {
+                key: 'dhis2_version',
+                value: 'master',
+            },
+            {
+                key: 'app_name',
+                value: 'line-listing-app',
+            },
+            {
+                key: 'test_level',
+                value: 'unit/integration',
+            },
+        ],
+        description: '',
+        debug: true,
+    },
+]
+
+const isReportPortalSetup =
+    process.env.REPORTPORTAL_API_KEY !== undefined &&
+    process.env.REPORTPORTAL_ENDPOINT !== undefined &&
+    process.env.REPORTPORTAL_PROJECT !== undefined
+
 module.exports = {
     transformIgnorePatterns: [
         'node_modules/(?!(lodash-es|@dhis2/d2-ui-[a-z-]+)/)',
@@ -10,30 +41,6 @@ module.exports = {
     testRegex: ['/src/modules/__tests__/.*.spec.js?$'],
     reporters: [
         'default',
-        [
-            '@reportportal/agent-js-jest',
-            {
-                apiKey: process.env.REPORTPORTAL_API_KEY,
-                endpoint: process.env.REPORTPORTAL_ENDPOINT,
-                project: process.env.REPORTPORTAL_PROJECT,
-                launch: 'line_listing_app',
-                attributes: [
-                    {
-                        key: 'dhis2_version',
-                        value: 'master',
-                    },
-                    {
-                        key: 'app_name',
-                        value: 'line_listing_app',
-                    },
-                    {
-                        key: 'test_level',
-                        value: 'unit/integration',
-                    },
-                ],
-                description: '',
-                debug: true,
-            },
-        ],
+        ...(isReportPortalSetup ? [reportPortalConfig] : []),
     ],
 }