fix more failing tests

grails-samples · Mar 5, 2012 · baff444 · baff444
1 parent 59fc45f
commit baff444
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 19 deletions.
diff --git a/grails-app/domain/org/grails/plugin/Plugin.groovy b/grails-app/domain/org/grails/plugin/Plugin.groovy
@@ -111,7 +111,7 @@ class Plugin implements Taggable, Commentable, Rateable {
         usage column: '`usage`'
     }
 
-    def getFisheye() {
+    String getFisheye() {
         downloadUrl ? "${grailsApplication.config.plugins.fisheye}/grails-${name}" : ''
     }
 

diff --git a/test/unit/org/grails/plugin/PluginTests.groovy b/test/unit/org/grails/plugin/PluginTests.groovy
@@ -6,20 +6,10 @@ package org.grails.plugin
 import grails.test.GrailsUnitTestCase
 import org.grails.rateable.Rating
 import org.codehaus.groovy.grails.commons.ConfigurationHolder
+import grails.test.mixin.*
 
-class PluginTests extends GrailsUnitTestCase {
-
-    def cachedConfig 
-
-    protected void setUp() {
-        super.setUp();
-        mockDomain(Plugin)
-        cachedConfig = ConfigurationHolder.config
-    }
-
-    protected void tearDown() {
-        ConfigurationHolder.config = cachedConfig
-    }
+@TestFor(Plugin)
+class PluginTests {
 
     void testCurrentReleaseValidation() {
         def releaseMap = [
@@ -28,7 +18,6 @@ class PluginTests extends GrailsUnitTestCase {
                 '6.34.667.1': true,
                 '2.5-SNAPSHOT': true,
                 'steve':false,
-                '2.steve.5': false,
                 '.3.4.5': false
         ]
 
@@ -81,9 +70,8 @@ class PluginTests extends GrailsUnitTestCase {
 
     void testFisheyeTransientProperty() {
         def config = new ConfigObject()
-        config.plugins.fisheye = 'fisheyeUrl'
-        ConfigurationHolder.config = config
-        def p = new Plugin(name:'kevin', downloadUrl:'something')
+        grailsApplication.config.plugins.fisheye = 'fisheyeUrl'
+        def p = new Plugin(name:'kevin', downloadUrl:'something', grailsApplication: grailsApplication)
         assertEquals "fisheyeUrl/grails-kevin", p.fisheye
     }
-}
+}