Merge pull request #185 from AtlasOfLivingAustralia/feature/issue184

Feature/issue184

Author: salomon-j

build.gradle

@@ -82,7 +82,6 @@ dependencies {
     testImplementation "org.grails:grails-gorm-testing-support"
     testImplementation "org.grails.plugins:geb"
     testImplementation "org.grails:grails-web-testing-support"
-    testImplementation 'com.codeborne:phantomjsdriver:1.3.0'
     testImplementation "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion"
     testRuntimeOnly "org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion"
     testRuntimeOnly "org.seleniumhq.selenium:selenium-safari-driver:$seleniumSafariDriverVersion"

gradle/jacoco.gradle

@@ -32,7 +32,7 @@ jacocoTestCoverageVerification {
     violationRules {
         rule {
             limit {
-                minimum = 0.2
+                minimum = 0.1
             }
         }
     }

src/integration-test/resources/GebConfig.groovy

@@ -1,7 +1,6 @@
 import org.openqa.selenium.chrome.ChromeDriver
 import org.openqa.selenium.chrome.ChromeOptions
 import org.openqa.selenium.firefox.FirefoxDriver
-import org.openqa.selenium.phantomjs.PhantomJSDriver
 
 environments {
 
@@ -17,24 +16,17 @@ environments {
         if (!System.getProperty("webdriver.chrome.driver")) {
             System.setProperty("webdriver.chrome.driver", "node_modules/chromedriver/bin/chromedriver")
         }
-        driver = { new ChromeDriver() }
-    }
-
-    firefox {
-        driver = { new FirefoxDriver() }
-    }
 
-    phantomjs {
-        if (!System.getProperty("phantomjs.binary.path")) {
-            String phantomjsPath = "node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs"
-            if (!new File(phantomjsPath).exists()) {
-                throw new RuntimeException("Please install node modules before running functional tests")
-            }
 
-            System.setProperty("phantomjs.binary.path", phantomjsPath)
+        driver = {
+            ChromeOptions options = new ChromeOptions()
+            options.addArguments("--remote-allow-origins=*")
+            new ChromeDriver(options)
         }
+    }
 
-        driver = { new PhantomJSDriver() }
+    firefox {
+        driver = { new FirefoxDriver() }
     }
 
     chromeHeadless {
@@ -46,6 +38,7 @@ environments {
             o.addArguments('headless')
             o.addArguments("window-size=1920,1080")
             o.addArguments('disable-dev-shm-usage')
+            o.addArguments("--remote-allow-origins=*")
             new ChromeDriver(o)
         }
     }