- fixed functional test

- ecodata-client-plugin:6.1.3

Author: temi

.github/workflows/build.yml

@@ -86,11 +86,11 @@ jobs:
       - name: Run javascript unit tests
         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
-#        env:
-#          GITHUB_ACTOR: ${{env.GITHUB_ACTOR}}
-#          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+      - name: Run BioCollect functional tests
+        run: ./src/main/scripts/runFunctionalTests.sh chromeHeadless /tmp/ecodata master
+        env:
+          GITHUB_ACTOR: ${{env.GITHUB_ACTOR}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
       - name: Clean to remove clover instrumentation
         uses: gradle/gradle-build-action@v2.4.2

build.gradle

@@ -154,7 +154,7 @@ dependencies {
 
     if (!Boolean.valueOf(inplace)) {
         implementation "org.grails.plugins:ala-map-plugin:3.0.1"
-        implementation "org.grails.plugins:ecodata-client-plugin:6.1.3-SNAPSHOT"
+        implementation "org.grails.plugins:ecodata-client-plugin:6.1.3"
     }
 
     testCompileOnly "org.grails:grails-test-mixins:3.3.0"

src/main/scripts/runFunctionalTests.sh

@@ -39,16 +39,17 @@ mongosh ecodata-functional-test loadAlaHub.js
 echo "Hosts file configuration"
 cat /etc/hosts
 
+cd $BIOCOLLECT_DIR
+echo "Starting wire mock"
+./gradlew startWireMock &
+
 cd $ECODATA_LOCAL_DIR
 echo "Starting ecodata from `pwd`"
 ls -la
 GRADLE_OPTS="-Xmx1g" ./gradlew bootRun "-Dorg.gradle.jvmargs=-Xmx1g" -Dgrails.env=meritfunctionaltest &
 sleep 240
 
 cd $BIOCOLLECT_DIR
-echo "Starting wire mock"
-./gradlew startWireMock
-
 echo "Starting biocollect"
 GRADLE_OPTS="-Xmx1g" ./gradlew bootRun "-Dorg.gradle.jvmargs=-Xmx1g" -Dgrails.env=test -Dgrails.server.port.http=8087 &
 sleep 200