Fixed defaultAction in controllers to be url converter aware. Removed addViewPrefix that was not url converter aware

Author: jameskleeh

grails-core/src/main/groovy/org/grails/core/DefaultGrailsControllerClass.java

@@ -169,6 +169,7 @@ public void registerUrlConverter(UrlConverter urlConverter) {
             actionUriToViewName.put(urlConverter.toUrlElement(actionName), actionName);
             actions.put( urlConverter.toUrlElement(actionName), actions.remove(actionName));
         }
+        defaultActionName = urlConverter.toUrlElement(defaultActionName);
     }
 
     /**

grails-test-suite-web/src/test/groovy/org/grails/web/taglib/CoreTagsTests.groovy

@@ -13,6 +13,11 @@ class CoreTagsTests extends AbstractGrailsTagTests {
 
     @Override
     protected void onSetUp() {
+        System.setProperty(Environment.KEY, "dev")
+    }
+
+    @Override
+    protected void onDestroy() {
         System.setProperty(Environment.KEY, "")
     }
 

grails-web-gsp/src/main/groovy/org/grails/web/servlet/view/GroovyPageViewResolver.java

@@ -82,11 +82,6 @@ public GroovyPageViewResolver(GroovyPagesTemplateEngine templateEngine,
     public void setGroovyPageLocator(GrailsConventionGroovyPageLocator groovyPageLocator) {
         this.groovyPageLocator = groovyPageLocator;
     }
-    
-    @Override
-    public View resolveViewName(String viewName, Locale locale) throws Exception {
-        return super.resolveViewName(WebUtils.addViewPrefix(viewName), locale);
-    }
 
     @Override
     protected View loadView(String viewName, Locale locale) throws Exception {

grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/mvc/UrlMappingsHandlerMappingSpec.groovy

@@ -160,9 +160,41 @@ class UrlMappingsHandlerMappingSpec extends AbstractUrlMappingsSpec {
         then:"The model and view is correct"
         result.viewName == 'fooBar'
         !result.model
+    }
+
+    void "Test that a matched URL returns a URLMappingInfo with controller with defaultAction"() {
+
+        given:
+        def grailsApplication = new DefaultGrailsApplication(FooController)
+        grailsApplication.initialise()
+        def holder = getUrlMappingsHolder {
+            "/foo"(controller:"foo")
+        }
+        def urlConverter = new HyphenatedUrlConverter()
+        holder = new GrailsControllerUrlMappings(grailsApplication, holder, urlConverter)
+        def handler = new UrlMappingsHandlerMapping(holder)
+
+        when:"A URI is matched"
 
+        def webRequest = GrailsWebMockUtil.bindMockWebRequest()
+        webRequest.renderView = true
+        def request = webRequest.request
+        request.setRequestURI("/foo")
+        def handlerChain = handler.getHandler(request)
+
+        then:"A handlerChain is created"
+        handlerChain != null
+
+        when:"A HandlerAdapter is used with a hyphenated url converter"
+        def handlerAdapter = new UrlMappingsInfoHandlerAdapter()
+        def result = handlerAdapter.handle(request, webRequest.response, handlerChain.handler)
+
+        then:"The model and view is correct"
+        result.viewName == 'fooBar'
+        !result.model
     }
 
+
     void "test modelAndView is returned for URI"() {
         given:
         def grailsApplication = new DefaultGrailsApplication(FooController)
@@ -186,6 +218,9 @@ class UrlMappingsHandlerMappingSpec extends AbstractUrlMappingsSpec {
 
 @Artefact('Controller')
 class FooController  {
+
+    static defaultAction = 'fooBar'
+
     @Action
     def bar() {
         [foo:"bar"]