- getting functional tests running again

AtlasOfLivingAustralia · Nov 23, 2023 · 2c07bdf · 2c07bdf
1 parent 7f503ce
commit 2c07bdf
Show file tree

Hide file tree

Showing 16 changed files with 871 additions and 584 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -34,15 +34,10 @@ jobs:
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
 
-      - name: run _Events target
+      - name: Run tests and jacoco coverage report with Gradle
         uses: gradle/gradle-build-action@v2.4.2
         with:
-          arguments: _Events
-
-#      - name: Run tests and jacoco coverage report with Gradle
-#        uses: gradle/gradle-build-action@v2.4.2
-#        with:
-#          arguments: -PenableJacoco=true check
+          arguments: -PenableJacoco=true check
 
       - name: Run javascript unit tests
         run: node_modules/karma/bin/karma start karma.conf.js --single-run --browsers ChromeHeadless

diff --git a/grails-app/conf/application.yml b/grails-app/conf/application.yml
@@ -89,4 +89,13 @@ grails:
                 staticparts: none
 
 userProfile:
-    userIdAttribute: "username"
+    userIdAttribute: "username"
+
+---
+environments:
+    test:
+        server:
+            port: "8087"
+        spring:
+            autoconfigure:
+                exclude: "au.org.ala.ws.security.AlaWsSecurityConfiguration"
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/integration-test/groovy/au/org/ala/ecodata/forms/ComputedValuesSpec.groovy b/src/integration-test/groovy/au/org/ala/ecodata/forms/ComputedValuesSpec.groovy
@@ -2,8 +2,10 @@ package au.org.ala.ecodata.forms
 
 import geb.spock.GebReportingSpec
 import grails.testing.mixin.integration.Integration
+import org.springframework.boot.test.context.SpringBootTest
 import pages.PreviewPage
 @Integration
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 class ComputedValuesSpec extends GebReportingSpec {
 
     def "computed values are evaluated correctly"() {

diff --git a/src/integration-test/groovy/au/org/ala/ecodata/forms/ConstraintsSpec.groovy b/src/integration-test/groovy/au/org/ala/ecodata/forms/ConstraintsSpec.groovy
@@ -4,9 +4,11 @@ import geb.module.Checkbox
 import geb.module.Select
 import geb.spock.GebReportingSpec
 import grails.testing.mixin.integration.Integration
+import org.springframework.boot.test.context.SpringBootTest
 import pages.PreviewPage
 
 @Integration
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 class ConstraintsSpec extends GebReportingSpec {
 
     def "Constraints can be specified such that each constraint may be selected only once on a form"() {

diff --git a/src/integration-test/groovy/au/org/ala/ecodata/forms/DateSpec.groovy b/src/integration-test/groovy/au/org/ala/ecodata/forms/DateSpec.groovy
@@ -2,9 +2,11 @@ package au.org.ala.ecodata.forms
 
 import geb.spock.GebReportingSpec
 import grails.testing.mixin.integration.Integration
+import org.springframework.boot.test.context.SpringBootTest
 import pages.PreviewPage
 
 @Integration
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 class DateSpec extends GebReportingSpec {
 
     def "We can enter dates via the date or simpleDate view types"() {

diff --git a/src/integration-test/groovy/au/org/ala/ecodata/forms/FeatureMapSpec.groovy b/src/integration-test/groovy/au/org/ala/ecodata/forms/FeatureMapSpec.groovy
@@ -2,9 +2,11 @@ package au.org.ala.ecodata.forms
 
 import geb.spock.GebReportingSpec
 import grails.testing.mixin.integration.Integration
+import org.springframework.boot.test.context.SpringBootTest
 import pages.PreviewPage
 
 @Integration
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 class FeatureMapSpec extends GebReportingSpec {
 
 

diff --git a/src/integration-test/groovy/au/org/ala/ecodata/forms/GeoMapSpec.groovy b/src/integration-test/groovy/au/org/ala/ecodata/forms/GeoMapSpec.groovy
@@ -2,6 +2,7 @@ package au.org.ala.ecodata.forms
 
 import geb.spock.GebReportingSpec
 import grails.testing.mixin.integration.Integration
+import org.springframework.boot.test.context.SpringBootTest
 import pages.PreviewPage
 
 /*
@@ -22,6 +23,7 @@ import pages.PreviewPage
  */
 
 @Integration
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 class GeoMapSpec extends GebReportingSpec {
     def "GeoMap smoke test" () {
         when:

diff --git a/src/integration-test/groovy/au/org/ala/ecodata/forms/ImageTypeSpec.groovy b/src/integration-test/groovy/au/org/ala/ecodata/forms/ImageTypeSpec.groovy
@@ -1,8 +1,11 @@
 package au.org.ala.ecodata.forms
 
 import geb.spock.GebReportingSpec
+import grails.testing.mixin.integration.Integration
+import org.springframework.boot.test.context.SpringBootTest
 import pages.PreviewPage
-
+@Integration
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 class ImageTypeSpec extends GebReportingSpec {
 
     def "The default behaviour of the view mode of the image view type is to show metadata on hover"() {

diff --git a/src/integration-test/groovy/au/org/ala/ecodata/forms/MultiInputSpec.groovy b/src/integration-test/groovy/au/org/ala/ecodata/forms/MultiInputSpec.groovy
@@ -2,6 +2,7 @@ package au.org.ala.ecodata.forms
 
 import geb.spock.GebReportingSpec
 import grails.testing.mixin.integration.Integration
+import org.springframework.boot.test.context.SpringBootTest
 import pages.PreviewPage
 
 /*
@@ -21,6 +22,7 @@ import pages.PreviewPage
  * Created by Temi on 26/11/19.
  */
 @Integration
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 class MultiInputSpec extends GebReportingSpec{
     def "multi input tests"() {
         when:

diff --git a/src/integration-test/groovy/au/org/ala/ecodata/forms/Select2Spec.groovy b/src/integration-test/groovy/au/org/ala/ecodata/forms/Select2Spec.groovy
@@ -2,9 +2,11 @@ package au.org.ala.ecodata.forms
 
 import geb.spock.GebReportingSpec
 import grails.testing.mixin.integration.Integration
+import org.springframework.boot.test.context.SpringBootTest
 import pages.PreviewPage
 
 @Integration
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 class Select2Spec extends GebReportingSpec {
 
     def "We can enter data into select2 dropdowns"() {

diff --git a/src/integration-test/groovy/au/org/ala/ecodata/forms/SelectOneSpec.groovy b/src/integration-test/groovy/au/org/ala/ecodata/forms/SelectOneSpec.groovy
@@ -3,9 +3,11 @@ package au.org.ala.ecodata.forms
 import geb.module.Select
 import geb.spock.GebReportingSpec
 import grails.testing.mixin.integration.Integration
+import org.springframework.boot.test.context.SpringBootTest
 import pages.PreviewPage
 
 @Integration
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 class SelectOneSpec extends GebReportingSpec {
 
     def "We can enter data in selectOne widgets"() {

diff --git a/src/integration-test/groovy/au/org/ala/ecodata/forms/TableFooterSpec.groovy b/src/integration-test/groovy/au/org/ala/ecodata/forms/TableFooterSpec.groovy
@@ -2,9 +2,11 @@ package au.org.ala.ecodata.forms
 
 import geb.spock.GebReportingSpec
 import grails.testing.mixin.integration.Integration
+import org.springframework.boot.test.context.SpringBootTest
 import pages.PreviewPage
 
 @Integration
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 class TableFooterSpec extends GebReportingSpec {
 
     def "Table footers can be displayed"() {

diff --git a/src/integration-test/groovy/au/org/ala/ecodata/forms/TableSpec.groovy b/src/integration-test/groovy/au/org/ala/ecodata/forms/TableSpec.groovy
@@ -2,9 +2,11 @@ package au.org.ala.ecodata.forms
 
 import geb.spock.GebReportingSpec
 import grails.testing.mixin.integration.Integration
+import org.springframework.boot.test.context.SpringBootTest
 import pages.PreviewPage
 
 @Integration
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 class TableSpec extends GebReportingSpec {
 
     def "Tables can be displayed correctly in edit mode"() {

diff --git a/src/integration-test/groovy/au/org/ala/ecodata/forms/TestSpec.groovy b/src/integration-test/groovy/au/org/ala/ecodata/forms/TestSpec.groovy
@@ -2,10 +2,12 @@ package au.org.ala.ecodata.forms
 
 import geb.spock.GebReportingSpec
 import grails.testing.mixin.integration.Integration
+import org.springframework.boot.test.context.SpringBootTest
 import pages.PreviewPage
 
 
 @Integration
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 class TestSpec extends GebReportingSpec {
 
     def grailsApplication

diff --git a/src/integration-test/resources/GebConfig.groovy b/src/integration-test/resources/GebConfig.groovy
@@ -6,7 +6,7 @@ if (!System.getProperty("webdriver.chrome.driver")) {
     System.setProperty("webdriver.chrome.driver", "node_modules/chromedriver/bin/chromedriver")
 }
 driver = { new ChromeDriver() }
-baseUrl = 'http://devt.ala.org.au:8087/'
+baseUrl = 'http://localhost:8087/'
 atCheckWaiting = true
 waiting {
     timeout = 20