pointing to new ecodata branch

fixed issue with button selector
AtlasOfLivingAustralia · Nov 27, 2024 · 920ecfa · 920ecfa
1 parent 5932ea2
commit 920ecfa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 26 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -87,24 +87,27 @@ jobs:
         run: node_modules/karma/bin/karma start karma.conf.js --single-run --browsers ChromeHeadless
 
       - name: Run BioCollect functional tests
-        run: ./src/main/scripts/runFunctionalTests.sh chromeHeadless /tmp/ecodata feature/cognito
+        run: ./src/main/scripts/runFunctionalTests.sh chromeHeadless /tmp/ecodata feature/pwa2
         continue-on-error: true
         env:
           GITHUB_ACTOR: ${{env.GITHUB_ACTOR}}
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
       - name: Archive log directory
         uses: actions/upload-artifact@v4
+        if: ${{ failure() }}
         with:
           path: ./logs
 
       - name: Clean to remove clover instrumentation
         uses: gradle/[email protected]
+        if: ${{ success() }}
         with:
           arguments: clean
 
       - name: Publish the JAR to the repository
         uses: gradle/[email protected]
+        if: ${{ success() }}
         with:
           arguments: publish
         env:

diff --git a/src/integration-test/resources/wiremock/mappings/jwks.json b/src/integration-test/resources/wiremock/mappings/jwks.json
diff --git a/src/test/js/integration/pageobjects/AddBioActivityPage.js b/src/test/js/integration/pageobjects/AddBioActivityPage.js
@@ -9,7 +9,7 @@ class AddBioActivityPage extends ReloadablePage {
     get imageUploadInput() { return $("input[name=files][accept='image/*']"); }
     get imageTitleInput() { return $(".image-title-input"); }
     get saveButton() { return $("#save"); }
-    get okButtonBootBoxDialog(){ return $(".btn.btn-primary.bootbox-accept")}
+    get okButtonBootBoxDialog(){ return $(".bootbox-accept")}
     get iframe() { return $("iframe"); }
 
     async open(projectActivityId) {
@@ -63,7 +63,7 @@ class AddBioActivityPage extends ReloadablePage {
     }
 
     async dismissBootBoxDialog(){
-        await this.okButtonBootBoxDialog.waitForClickable({ timeout: 10000 });
+        await this.okButtonBootBoxDialog.waitForClickable({ timeout: 20000 });
         await this.okButtonBootBoxDialog.click();
     }
 }