Fix tests

copy_functional_tests_to_different_grails_versions.sh

@@ -38,20 +38,18 @@ for grailsVersion in $GRAILS_VERSIONS; do
 
     sdk use grails $GRAILS_VERSION
 
-   if [ -f "$TEMPLATE_FOLDER/$grailsVersion/grailsw" ];
-   then 
-      for file in $S2_QUICKSTART_FILES; do
-          if [ -f "$TEMPLATE_FOLDER/$grailsVersion$file" ];
-          then 
-          rm $TEMPLATE_FOLDER/$grailsVersion$file
-          fi
-      done
-      cd $TEMPLATE_FOLDER/$grailsVersion
-      grails s2-quickstart com.testapp TestUser TestRole TestRequestmap --salt
-      cd ../..
-   fi
-   for file in $TEMPLATE_FILES; do
-       cp $TEMPLATE_FOLDER$file $TEMPLATE_FOLDER/$grailsVersion$file
-   done
+    for file in $S2_QUICKSTART_FILES; do
+        if [ -f "$TEMPLATE_FOLDER/$grailsVersion$file" ];
+        then
+            rm $TEMPLATE_FOLDER/$grailsVersion$file
+        fi
+    done
+    cd $TEMPLATE_FOLDER/$grailsVersion
+    grails s2-quickstart com.testapp TestUser TestRole TestRequestmap --salt
+    cd ../..
+
+    for file in $TEMPLATE_FILES; do
+        cp $TEMPLATE_FOLDER$file $TEMPLATE_FOLDER/$grailsVersion$file
+    done
 done
 

gradle.properties

@@ -1,4 +1,5 @@
 grailsVersion=3.3.0.M1
+gradleWrapperVersion=3.5
 vcsUrl=https://github.com/grails-plugins/grails-spring-security-core
 websiteUrl=https://github.com/grails-plugins/grails-spring-security-core
 issueTrackerUrl=https://github.com/grails-plugins/grails-spring-security-core/issues

integration-test-app/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Nov 27 23:09:32 CET 2015
+#Thu May 18 09:34:40 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip

run-all-tests.sh

@@ -12,4 +12,4 @@ integration-test-app/run_integration_tests.sh
 
 ./copy_functional_tests_to_different_grails_versions.sh
 
-# ./run_functional_tests.sh
+./run_functional_tests.sh