.github/workflows/build.yml

@@ -13,7 +13,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
       - uses: actions/checkout@v3
@@ -27,10 +27,34 @@ jobs:
       - name: Install nodejs
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20
 
       - run: npm install
 
+      - name: Validate Gradle wrapper
+        uses: gradle/wrapper-validation-action@v1.0.6
+
+      - name: Install and start elasticsearch
+        run: |
+          curl https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.16.3-amd64.deb -o elasticsearch.deb
+          sudo dpkg -i --force-confnew elasticsearch.deb
+          sudo chown -R elasticsearch:elasticsearch /etc/default/elasticsearch
+          sudo sh -c 'echo ES_JAVA_OPTS=\"-Xmx1g -Xms1g\" >> /etc/default/elasticsearch'
+          sudo service elasticsearch restart
+
+      - name: Setup required MERIT folders
+        run: |
+          sudo mkdir -p /data/fieldcapture/cache
+          sudo chmod o+xw /data
+          sudo chmod o+xw /data/fieldcapture
+          sudo chmod o+xw /data/fieldcapture/cache
+
+      - name: Install and start mongodb
+        uses: supercharge/mongodb-github-action@1.7.0
+        with:
+          mongodb-version: '5.0'
+
+
       - name: Read the biocollect version from the gradle.properties file
         id: read_property
         uses: christian-draeger/read-properties@1.1.0
@@ -53,22 +77,37 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: build biocollect before running js unit test to compile dependent js templates
-        uses: gradle/gradle-build-action@0d13054264b0bb894ded474f08ebb30921341cee
+        uses: gradle/gradle-build-action@v2.4.2
         with:
-          arguments: build
+          arguments: _Events
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - 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 dev
+        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/gradle-build-action@0d13054264b0bb894ded474f08ebb30921341cee
+        uses: gradle/gradle-build-action@v2.4.2
+        if: ${{ success() }}
         with:
           arguments: clean
 
       - name: Publish the JAR to the repository
-        uses: gradle/gradle-build-action@0d13054264b0bb894ded474f08ebb30921341cee
+        uses: gradle/gradle-build-action@v2.4.2
+        if: ${{ success() }}
         with:
           arguments: publish
         env:

build.gradle

@@ -1,6 +1,7 @@
 buildscript {
     repositories {
         mavenLocal()
+        maven { url "https://plugins.gradle.org/m2/" }
         maven { url "https://repo.grails.org/grails/core" }
         maven { url "https://nexus.ala.org.au/content/groups/public/" }
     }
@@ -12,9 +13,15 @@ buildscript {
         classpath 'com.bertramlabs.plugins:sass-asset-pipeline:3.2.5'
         classpath 'com.bmuschko:gradle-clover-plugin:3.0.1'
         classpath 'org.grails.plugins:quartz:2.0.13'
+        classpath "gradle.plugin.com.github.william-hill-online:wiremock-gradle-plugin:0.4.3"
+        classpath "com.github.tomakehurst:wiremock-jre8-standalone:2.28.0"
     }
 }
 
+plugins {
+    id "com.gorylenko.gradle-git-properties" version "2.4.1"
+}
+
 
 version "$biocollectVersion"
 group "au.org.ala"
@@ -27,6 +34,7 @@ apply plugin: "org.grails.grails-web"
 apply plugin:"com.github.erdi.webdriver-binaries"
 apply plugin: "com.bertramlabs.asset-pipeline"
 apply plugin: "org.grails.grails-gsp"
+apply plugin: "com.github.william-hill-online.wiremock"
 
 if (Boolean.valueOf(enableClover)) {
     apply from: "${project.projectDir}/gradle/clover.gradle"
@@ -36,7 +44,7 @@ apply from: "${project.projectDir}/gradle/publish.gradle"
 repositories {
     mavenLocal()
     //for missing jai_core.jar
-   //maven { url "https://mvnrepository.com" }
+    //maven { url "https://mvnrepository.com" }
     maven { url "https://repo.osgeo.org/repository/release/" }
     maven { url "https://repo.grails.org/grails/core" }
     maven { url = uri("https://maven.pkg.github.com/atlasoflivingaustralia/ecodata-client-plugin")
@@ -81,6 +89,9 @@ dependencies {
     implementation "org.grails:grails-plugin-url-mappings"
     implementation "org.grails:grails-plugin-interceptors"
     implementation "org.grails.plugins:cache"
+    implementation "org.grails.plugins:cache-ehcache:3.0.0"
+    runtimeOnly "javax.xml.bind:jaxb-api:2.3.1"
+    runtimeOnly "org.glassfish.jaxb:jaxb-runtime:2.3.1"
     implementation "org.grails.plugins:async"
     implementation "org.grails:grails-async-gpars"
     implementation "org.grails.plugins:scaffolding"
@@ -104,6 +115,8 @@ dependencies {
     implementation('org.grails.plugins:http-builder-helper:1.1.0') {
         exclude group: 'org.apache.httpcomponents', module: 'httpclient'
     }
+
+    implementation 'com.opencsv:opencsv:5.7.0'
     implementation "org.apache.httpcomponents:httpclient:4.5.7"
     runtimeOnly 'org.webjars:jquery:1.12.4'
     implementation 'dk.glasius:external-config:3.0.0'
@@ -129,37 +142,43 @@ dependencies {
     implementation 'org.apache.poi:poi-ooxml-schemas:4.1.2'
 
     implementation "org.grails.plugins:ala-admin-plugin:2.3.0"
-    implementation ("org.grails.plugins:ala-auth:5.1.1")
-    implementation "org.grails.plugins:ala-ws-security-plugin:4.1.2"
-    runtimeOnly "org.grails.plugins:ala-bootstrap3:4.2.0"
+    implementation ("org.grails.plugins:ala-auth:$alaSecurityLibsVersion")
+    implementation ("org.grails.plugins:ala-ws-plugin:$alaSecurityLibsVersion")
+    implementation "org.grails.plugins:ala-ws-security-plugin:$alaSecurityLibsVersion"
+    implementation "au.org.ala:userdetails-service-client:$alaSecurityLibsVersion"
+    runtimeOnly "org.grails.plugins:ala-bootstrap3:4.4.0"
 
     //    swagger API
     implementation 'au.org.ala.plugins:openapi:1.1.0'
 
-    implementation "au.org.ala:userdetails-service-client:1.5.0"
     implementation "org.codehaus.groovy.modules.http-builder:http-builder:0.7.1"
     implementation 'au.org.ala:ala-cas-client:2.5'
     runtimeOnly("org.springframework.boot:spring-boot-properties-migrator")
     runtimeOnly 'com.bertramlabs.plugins:less-asset-pipeline:3.3.1'
     implementation 'com.bertramlabs.plugins:sass-asset-pipeline:3.2.5'
     implementation 'org.codehaus.groovy:groovy-dateutil:2.5.0'
-
+    implementation "com.nimbusds:nimbus-jose-jwt:9.25.6"
+    implementation "io.jsonwebtoken:jjwt-impl:0.11.5"
+    implementation "io.jsonwebtoken:jjwt-jackson:0.11.5"
+    implementation "io.jsonwebtoken:jjwt-api:0.11.5"
     if (!Boolean.valueOf(inplace)) {
         implementation "org.grails.plugins:ala-map-plugin:3.0.1"
-        implementation "org.grails.plugins:ecodata-client-plugin:6.0"
+        implementation "org.grails.plugins:ecodata-client-plugin:7.2-SNAPSHOT"
     }
 
     testCompileOnly "org.grails:grails-test-mixins:3.3.0"
     testImplementation "org.grails:grails-gorm-testing-support"
     testImplementation "org.mockito:mockito-core"
     testImplementation "org.grails:grails-web-testing-support"
-    testImplementation "org.grails.plugins:geb"
-    testImplementation "org.seleniumhq.selenium:selenium-remote-driver:4.0.0"
-    testImplementation "org.seleniumhq.selenium:selenium-api:4.0.0"
-    testImplementation "org.seleniumhq.selenium:selenium-support:4.0.0"
-    testRuntimeOnly "org.seleniumhq.selenium:selenium-chrome-driver:4.0.0"
-    testRuntimeOnly "org.seleniumhq.selenium:selenium-firefox-driver:4.0.0"
-    testCompileOnly "com.github.tomakehurst:wiremock-jre8-standalone:2.28.0"
+    testImplementation ("org.grails.plugins:geb") {
+        exclude module: "grails-core"
+    }
+    testImplementation "com.github.tomakehurst:wiremock-jre8-standalone:2.28.0"
+    testImplementation "org.seleniumhq.selenium:selenium-remote-driver:$seleniumVersion"
+    testImplementation "org.seleniumhq.selenium:selenium-api:$seleniumVersion"
+    testImplementation "org.seleniumhq.selenium:selenium-support:$seleniumVersion"
+    testRuntimeOnly "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion"
+    testRuntimeOnly "org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion"
     testCompileOnly "com.codeborne:phantomjsdriver:1.3.0"
 }
 
@@ -190,7 +209,8 @@ assets {
     maxThreads = 6
     minifyOptions = [
             languageMode  : 'ES6', //languageIn
-            targetLanguage: 'ES5', // languageOut
+//            targetLanguage: 'ES5', // languageOut
+            excludes: ['sw.js', '**/*.min.js']
     ]
 
     includes = []
@@ -236,29 +256,23 @@ tasks.withType(Test) {
     useJUnitPlatform()
 }
 
-webdriverBinaries {
-    if (!System.getenv().containsKey('GITHUB_ACTIONS')) {
-        chromedriver {
-            versionRegexp = '.*'
-            architecture = 'X86_64'
-            fallbackTo32Bit = true
-        }
-        geckodriver '0.30.0'
-    }
-}
-
 tasks.withType(Test) {
     systemProperty "geb.env", System.getProperty('geb.env')
     systemProperty "geb.build.reportsDir", reporting.file("geb/integrationTest")
-    if (!System.getenv().containsKey('GITHUB_ACTIONS')) {
-        systemProperty 'webdriver.chrome.driver', System.getProperty('webdriver.chrome.driver')
-        systemProperty 'webdriver.gecko.driver', System.getProperty('webdriver.gecko.driver')
-    } else {
-        systemProperty 'webdriver.chrome.driver', "${System.getenv('CHROMEWEBDRIVER')}/chromedriver"
-        systemProperty 'webdriver.gecko.driver', "${System.getenv('GECKOWEBDRIVER')}/geckodriver"
+    systemProperty 'webdriver.chrome.driver', System.getProperty('webdriver.chrome.driver')
+    systemProperty 'webdriver.gecko.driver', System.getProperty('webdriver.gecko.driver')
+    testLogging {
+        events "passed", "skipped", "failed"
+        exceptionFormat "full"
+        showStandardStreams true
     }
 }
 
+wiremock {
+    dir "${project.projectDir}/src/integration-test/resources/wiremock/"
+    params "--port=8018 --global-response-templating --local-response-templating"
+//    params "--port=8018 --global-response-templating --local-response-templating --verbose --print-all-network-traffic --record-mappings"
+}
 
 assets {
     minifyJs = true