Merge branch '3.1.x' into 3.2.x

Author: jameskleeh

grails-core/src/test/groovy/org/grails/config/PropertySourcesConfigSpec.groovy

@@ -2,6 +2,8 @@ package org.grails.config
 
 import org.springframework.core.env.MapPropertySource
 import org.springframework.core.env.MutablePropertySources
+import spock.lang.Ignore
+import spock.lang.Issue
 import spock.lang.Specification
 
 /*
@@ -48,4 +50,28 @@ class PropertySourcesConfigSpec extends Specification {
 
 
     }
+
+    /*
+
+      We need to settle on whether the following is a bug or not.
+      There are some tests in ConfigMapSpec that indirectly assert some
+      behavior that I think would be inconsistent with making the following
+      test pass.
+
+     */
+    @Ignore
+    @Issue('grails/grails-core#10188')
+    void 'test replacing nested property values'() {
+        given: 'a PropertySourcesConfig'
+        def cfg = new PropertySourcesConfig()
+
+        when: 'a nested property is assigned a value'
+        cfg.foo.bar = ['one': '1']
+
+        and: 'later is assigned a different value'
+        cfg.foo.bar = ['two': '2']
+
+        then: 'the second value is not merged with the first value'
+        cfg.foo.bar == ['two': '2']
+    }
 }