Merge branch 'master' of github.com:grails/grails-core

grails · Mar 25, 2014 · 65c8c1d · 65c8c1d
2 parents 6c5088d + a2c7b21
commit 65c8c1d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...strap/src/test/groovy/org/codehaus/groovy/grails/resolve/IvyDependencyManagerTests.groovy b/...strap/src/test/groovy/org/codehaus/groovy/grails/resolve/IvyDependencyManagerTests.groovy
@@ -679,7 +679,7 @@ class IvyDependencyManagerTests extends GroovyTestCase {
         assertTrue("all default dependencies should be inherited", manager.dependencyDescriptors.every { it.inherited == true })
         assertEquals 10, manager.dependencyDescriptors.findAll { it.scope == 'compile'}.size()
         assertEquals 3, manager.dependencyDescriptors.findAll { it.scope == 'runtime'}.size()
-        assertEquals 3, manager.dependencyDescriptors.findAll { it.scope == 'test'}.size()
+        assertEquals 2, manager.dependencyDescriptors.findAll { it.scope == 'test'}.size()
         assertEquals 4, manager.dependencyDescriptors.findAll { it.scope == 'build'}.size()
         assertEquals 1, manager.dependencyDescriptors.findAll { it.scope == 'provided'}.size()
         assertEquals 1, manager.dependencyDescriptors.findAll { it.scope == 'docs'}.size()
@@ -702,7 +702,7 @@ class IvyDependencyManagerTests extends GroovyTestCase {
 
         assertEquals 0, manager.dependencyDescriptors.findAll { it.scope == 'compile'}.size()
         assertEquals 0, manager.dependencyDescriptors.findAll { it.scope == 'runtime'}.size()
-        assertEquals 2, manager.dependencyDescriptors.findAll { it.scope == 'test'}.size()
+        assertEquals 1, manager.dependencyDescriptors.findAll { it.scope == 'test'}.size()
         assertEquals 4, manager.dependencyDescriptors.findAll { it.scope == 'build'}.size()
         assertEquals 14, manager.dependencyDescriptors.findAll { it.scope == 'provided'}.size()
         assertEquals 1, manager.dependencyDescriptors.findAll { it.scope == 'docs'}.size()
@@ -717,7 +717,7 @@ class IvyDependencyManagerTests extends GroovyTestCase {
 
         assertEquals 10, manager.dependencyDescriptors.findAll { it.scope == 'compile'}.size()
         assertEquals 3, manager.dependencyDescriptors.findAll { it.scope == 'runtime'}.size()
-        assertEquals 2, manager.dependencyDescriptors.findAll { it.scope == 'test'}.size()
+        assertEquals 1, manager.dependencyDescriptors.findAll { it.scope == 'test'}.size()
         assertEquals 4, manager.dependencyDescriptors.findAll { it.scope == 'build'}.size()
         assertEquals 1, manager.dependencyDescriptors.findAll { it.scope == 'provided'}.size()
         assertEquals 1, manager.dependencyDescriptors.findAll { it.scope == 'docs'}.size()