Disabling functional tests for now #3368

AtlasOfLivingAustralia · Dec 4, 2024 · d54d92d · d54d92d
1 parent a240371
commit d54d92d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.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]

diff --git a/src/integration-test/groovy/au/org/ala/fieldcapture/ConfigurableMeriPlanSpec.groovy b/src/integration-test/groovy/au/org/ala/fieldcapture/ConfigurableMeriPlanSpec.groovy
@@ -9,7 +9,6 @@ import spock.lang.Stepwise
 import geb.module.FormElement
 
 @Stepwise
-@Ignore
 class ConfigurableMeriPlanSpec extends StubbedCasSpec {
 
     def setupSpec() {
@@ -39,7 +38,6 @@ class ConfigurableMeriPlanSpec extends StubbedCasSpec {
         waitFor { hasBeenReloaded() }
     }
 
-    @Ignore
     def "The MERI Plan supports linking outcomes to services and targets"() {
         setup:
         String projectId = 'outcomeMeriPlanProject'
@@ -458,7 +456,6 @@ class ConfigurableMeriPlanSpec extends StubbedCasSpec {
         }
     }
 
-    @Ignore
     def "The MERI Plan will display only sections specified in the program configuration"() {
 
         setup:
@@ -548,7 +545,6 @@ class ConfigurableMeriPlanSpec extends StubbedCasSpec {
 
     }
 
-    @Ignore
     def "The MERI Plan will display only sections specified in state intervention config for state intervention projects"() {
         setup:
         // Clear cache to ensure services are loaded correctly

diff --git a/src/integration-test/groovy/au/org/ala/fieldcapture/DatasetSpec.groovy b/src/integration-test/groovy/au/org/ala/fieldcapture/DatasetSpec.groovy
@@ -218,7 +218,6 @@ class DatasetSpec extends StubbedCasSpec{
     }
 
     /** Note that this test relies on the data set summary inserted in the previous test, as per the @Stepwise annotation */
-    @Ignore // Edit lock aquisition is failing in actions but not locally.
     def "This is a regression test for issue 2299 - MERI plan updates can clear data set summaries"() {
         setup: "We need to be a merit administrator for this test as it involves updating the project settings"
         String projectId = 'fdFundProject'