Merge pull request #3407 from AtlasOfLivingAustralia/feature/issue3401

Feature/issue3401

Author: temi

.github/workflows/build.yml

@@ -80,11 +80,11 @@ jobs:
       - name: Run javascript unit tests
         run: node_modules/karma/bin/karma start karma.conf.js --single-run --browsers ChromeHeadless
 
-#      - name: Run MERIT functional tests
-#        run: ./src/main/scripts/runFunctionalTests.sh
-#        env:
-#          GPR_USER: ${{env.GITHUB_ACTOR}}
-#          GPR_TOKEN: ${{secrets.GITHUB_TOKEN}}
+      - name: Run MERIT functional tests
+        run: ./src/main/scripts/runFunctionalTests.sh
+        env:
+          GPR_USER: ${{env.GITHUB_ACTOR}}
+          GPR_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
       - name: Clean to remove clover instrumentation
         uses: gradle/[email protected]

src/integration-test/groovy/au/org/ala/fieldcapture/CreateOrEditOrganisationSpec.groovy

@@ -47,7 +47,7 @@ class CreateOrEditOrganisationSpec extends StubbedCasSpec {
         openAboutTab()
 
         then:
-        orgName.text() == "THE TRUSTEE FOR PSS FUND Test"
+        orgName.text() == "The Trustee for Pss Fund Test"
         waitFor {orgDescription.displayed }
         orgDescription.text() == "Test Organisation Description test"
         waitFor {orgAbn.displayed }

src/integration-test/resources/wiremock/mappings/jwtIdUserdetailslookup.json

@@ -0,0 +1,17 @@
+{
+
+  "priority": 1,
+  "request": {
+    "urlPath": "/userdetails/userDetails/getUserDetails",
+    "method": "ANY",
+    "queryParameters": {
+      "userName": {
+        "equalTo": "jwtId"
+      }
+    }
+  },
+  "response": {
+    "transformers": ["response-template"],
+    "status": 404
+  }
+}

src/integration-test/resources/wiremock/mappings/lookupUserDetailsByEmailAddress.json

@@ -1,4 +1,5 @@
 {
+  "priority": 3,
   "request": {
     "urlPath": "/userdetails/userDetails/userDetails/getUserDetails",
     "method": "ANY"

src/integration-test/resources/wiremock/mappings/lookupjwtIdUserDetails.json

@@ -0,0 +1,20 @@
+{
+  "priority": 2,
+  "request": {
+    "urlPath": "/userdetails/userDetails/userDetails/getUserDetails",
+    "method": "ANY",
+    "queryParameters": {
+      "userName": {
+        "equalTo": "jwtId"
+      }
+    }
+  },
+  "response": {
+    "transformers": ["response-template"],
+    "status": 404,
+    "headers": {
+      "Content-Type": "application/json"
+    },
+    "body": null
+  }
+}

src/integration-test/resources/wiremock/mappings/userdetailslookup.json

@@ -1,4 +1,5 @@
 {
+  "priority": 4,
   "request": {
     "urlPath": "/userdetails/userDetails/getUserDetails",
     "method": "ANY"