fix failing tests

Author: graemerocher

grails-core/src/main/groovy/org/grails/plugins/AbstractGrailsPlugin.java

@@ -21,24 +21,17 @@
 import grails.plugins.GrailsPluginManager;
 import grails.util.GrailsNameUtils;
 import groovy.lang.GroovyObjectSupport;
-import org.grails.config.CompositeConfig;
-import org.grails.config.PropertySourcesConfig;
 import org.grails.config.yaml.YamlPropertySourceLoader;
 import org.grails.core.AbstractGrailsClass;
 import org.grails.core.legacy.LegacyGrailsApplication;
 import org.grails.plugins.support.WatchPattern;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
-import org.springframework.core.env.MutablePropertySources;
 import org.springframework.core.env.PropertySource;
-import org.springframework.core.env.PropertySources;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.UrlResource;
 import org.springframework.util.Assert;
 
-import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;

grails-core/src/main/groovy/org/grails/plugins/DefaultGrailsPlugin.java

@@ -357,7 +357,7 @@ private void evaluateOnChangeListener() {
         }
 
         final Metadata metadata = Metadata.getCurrent();
-        final boolean warDeployed = !metadata.isDevelopmentEnvironmentAvailable();
+        final boolean warDeployed = metadata.isWarDeployed();
         final boolean reloadEnabled = Environment.getCurrent().isReloadEnabled();
 
         if (!((reloadEnabled || !warDeployed) && onChangeListener != null)) {

grails-plugin-gsp/src/main/groovy/org/grails/plugins/web/GroovyPagesGrailsPlugin.groovy

@@ -101,7 +101,7 @@ class GroovyPagesGrailsPlugin extends Plugin {
     Closure doWithSpring() {{->
         def application = grailsApplication
         Config config = application.config
-        boolean developmentMode = Metadata.getCurrent().isDevelopmentEnvironmentAvailable()
+        boolean developmentMode = isDevelopmentMode()
         Environment env = Environment.current
 
         boolean enableReload = env.isReloadEnabled() ||
@@ -270,6 +270,10 @@ class GroovyPagesGrailsPlugin extends Plugin {
         }
     }}
 
+    protected boolean isDevelopmentMode() {
+        Metadata.getCurrent().isDevelopmentEnvironmentAvailable()
+    }
+
     static String transformToValidLocation(String location) {
         if (location == '.') return location
         if (!location.endsWith(File.separator)) return "${location}${File.separator}"

grails-test-suite-uber/src/test/groovy/org/grails/plugins/web/ControllersGrailsPluginTests.groovy

@@ -104,7 +104,13 @@ class FormTagLib {
     void testBeansWhenNotWarDeployedAndDevelopmentEnv() {
         try {
             System.setProperty("grails.env", "development")
-            def plugin = new GroovyPagesGrailsPlugin()
+            def plugin = new GroovyPagesGrailsPlugin() {
+                @Override
+                protected boolean isDevelopmentMode() {
+                    return true
+                }
+            }
+
             plugin.grailsApplication = new DefaultGrailsApplication() {
                 @Override
                 boolean isWarDeployed() {