Merge branch 'master' into DHIS2-14516/fix-time-stamps

dhis2 · Mar 1, 2023 · 70a27e7 · 70a27e7
2 parents 6a04f3f + b4e5eb2
commit 70a27e7
Show file tree

Hide file tree

Showing 49 changed files with 5,364 additions and 5,471 deletions.
diff --git a/.github/workflows/dhis2-netlify-deploy-pr.yml b/.github/workflows/dhis2-netlify-deploy-pr.yml
@@ -22,9 +22,9 @@ jobs:
         if: "!github.event.push.repository.fork && github.actor != 'dependabot[bot]'"
         steps:
             - uses: actions/checkout@v2
-            - uses: actions/setup-node@v1
+            - uses: actions/setup-node@v3
               with:
-                  node-version: 12.x
+                  node-version: 16
 
             - uses: c-hive/gha-yarn-cache@v1
             - run: yarn install --frozen-lockfile

diff --git a/.github/workflows/dhis2-netlify-deploy-production.yml b/.github/workflows/dhis2-netlify-deploy-production.yml
@@ -23,9 +23,9 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v2
-            - uses: actions/setup-node@v1
+            - uses: actions/setup-node@v3
               with:
-                  node-version: 16.x
+                  node-version: 16
 
             - uses: c-hive/gha-yarn-cache@v1
             - run: yarn install --frozen-lockfile

diff --git a/.github/workflows/dhis2-verify-app.yml b/.github/workflows/dhis2-verify-app.yml
@@ -27,9 +27,9 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v2
-            - uses: actions/setup-node@v1
+            - uses: actions/setup-node@v3
               with:
-                  node-version: 12.x
+                  node-version: 16
 
             - uses: c-hive/gha-yarn-cache@v1
             - run: yarn install --frozen-lockfile
@@ -49,9 +49,9 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v2
-            - uses: actions/setup-node@v1
+            - uses: actions/setup-node@v3
               with:
-                  node-version: 12.x
+                  node-version: 16
 
             - uses: c-hive/gha-yarn-cache@v1
             - run: yarn install --frozen-lockfile
@@ -68,9 +68,9 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v2
-            - uses: actions/setup-node@v1
+            - uses: actions/setup-node@v3
               with:
-                  node-version: 12.x
+                  node-version: 16
 
             - uses: c-hive/gha-yarn-cache@v1
             - run: yarn install --frozen-lockfile
@@ -83,52 +83,44 @@ jobs:
             - name: Test
               run: yarn d2-app-scripts test
 
-    #e2e:
-    #    runs-on: ubuntu-latest
-    #    if: "!github.event.push.repository.fork && github.actor != 'dependabot[bot]'"
-    #
-    #    strategy:
-    #        fail-fast: false
-    #        matrix:
-    #            containers: [1, 2, 3, 4]
-    #
-    #    steps:
-    #        - name: Checkout
-    #          uses: actions/checkout@v2
-    #
-    #        - uses: actions/setup-node@v1
-    #          with:
-    #              node-version: 12.x
-    #
-    #        - name: End-to-End tests
-    #          uses: cypress-io/github-action@v2
-    #          with:
-    #              # This should be a command that serves the app.
-    #              start: yarn d2-app-scripts start
-    #              wait-on: 'http://localhost:3000'
-    #              wait-on-timeout: 300
-    #              record: true
-    #              parallel: true
-    #          env:
-    #              BROWSER: none
-    #              GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    #              CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
-    #              CYPRESS_dhis2BaseUrl: https://debug.dhis2.org/dev
-    #              CYPRESS_dhis2ApiVersion: 37
-    #              CYPRESS_networkMode: stub
+    e2e:
+        runs-on: ubuntu-latest
+        strategy:
+            fail-fast: false
+            matrix:
+                containers: [1, 2, 3, 4]
+        steps:
+            - uses: actions/checkout@v2
+            - uses: actions/setup-node@v3
+              with:
+                  node-version: 16
+            - name: End-to-End tests
+              uses: cypress-io/github-action@v2
+              with:
+                  start: yarn start:nobrowser
+                  wait-on: 'http://localhost:3000'
+                  wait-on-timeout: 300
+                  record: true
+                  parallel: true
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
+                  CYPRESS_dhis2BaseUrl: http://localhost:8080
+                  CYPRESS_dhis2ApiVersion: 40
+                  CYPRESS_networkMode: stub
 
     release:
         runs-on: ubuntu-latest
-        needs: [build, lint, test] # add e2e if you use it
+        needs: [build, lint, test, e2e]
         if: "!github.event.push.repository.fork && github.actor != 'dependabot[bot]'"
         steps:
             - uses: actions/checkout@v2
               with:
                   token: ${{ secrets.DHIS2_BOT_GITHUB_TOKEN }}
 
-            - uses: actions/setup-node@v1
+            - uses: actions/setup-node@v3
               with:
-                  node-version: 12.x
+                  node-version: 16
 
             - uses: actions/download-artifact@v2
               with:

diff --git a/cypress.json b/cypress.json
@@ -6,7 +6,6 @@
     "video": false,
     "env": {
         "dhis2DataTestPrefix": "dhis2-scheduler",
-        "networkMode": "live",
-        "dhis2ApiVersion": "38"
+        "dhis2ApiVersion": "40"
     }
 }
diff --git a/cypress/fixtures/network/38/all_user_defined_jobs_should_be_listed.json b/cypress/fixtures/network/38/all_user_defined_jobs_should_be_listed.json
diff --git a/cypress/fixtures/network/38/jobs_can_be_filtered.json b/cypress/fixtures/network/38/jobs_can_be_filtered.json
diff --git a/cypress/fixtures/network/38/static_resources.json b/cypress/fixtures/network/38/static_resources.json
diff --git a/cypress/fixtures/network/38/system_job_actions.json b/cypress/fixtures/network/38/system_job_actions.json
diff --git a/cypress/fixtures/network/38/system_job_visibility_can_be_toggled.json b/cypress/fixtures/network/38/system_job_visibility_can_be_toggled.json
diff --git a/cypress/fixtures/network/38/user_job_actions.json b/cypress/fixtures/network/38/user_job_actions.json
diff --git a/cypress/fixtures/network/38/user_jobs_can_be_enabled_and_disabled.json b/cypress/fixtures/network/38/user_jobs_can_be_enabled_and_disabled.json
diff --git a/cypress/fixtures/network/38/users_should_be_able_to_create_jobs_that_take_parameters.json b/cypress/fixtures/network/38/users_should_be_able_to_create_jobs_that_take_parameters.json