Fixing functional test that started failing #3476

Author: chrisala

src/integration-test/groovy/au/org/ala/fieldcapture/ImportProjectsSpec.groovy

@@ -11,13 +11,14 @@ import pages.RlpProjectPage
 @Slf4j
 class ImportProjectsSpec extends StubbedCasSpec {
 
-    def setup() {
+    def setupSpec() {
         useDataSet('dataset2')
         loginAsAlaAdmin(browser)
         to AdminTools
         clearMetadata()
         to AdminClearCachePage
         clearProgramListCache()
+        at AdminClearCachePage // reset at check time
         clearServiceListCache()
     }
 

src/integration-test/groovy/au/org/ala/fieldcapture/StubbedCasSpec.groovy

@@ -201,7 +201,7 @@ class StubbedCasSpec extends FieldcaptureFunctionalTest {
     private String loggedInUser = null
 
     def login(Map userDetails, Browser browser) {
-        if (loggedInUser != userDetails.userId) {
+        if (loggedInUser && loggedInUser != userDetails.userId) {
             logout(browser)
         }
         oidcLogin(userDetails, browser)