fix failing tests

mfatihercik · Mar 4, 2015 · 8e012d1 · 8e012d1
1 parent 1898739
commit 8e012d1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/...test-suite-uber/src/test/groovy/org/grails/web/errors/GrailsExceptionResolverTests.groovy b/...test-suite-uber/src/test/groovy/org/grails/web/errors/GrailsExceptionResolverTests.groovy
@@ -117,7 +117,7 @@ class GrailsExceptionResolverTests extends GroovyTestCase {
         assertNotNull "should have returned a ModelAndView", modelAndView
         assertTrue modelAndView.empty
 
-        assertEquals "/grails/foo/bar.dispatch",response.getForwardedUrl()
+        assertEquals "/foo/bar",response.getForwardedUrl()
     }
 
     void testResolveExceptionToControllerWhenResponseCommitted() {

diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/metaclass/ForwardMethodTests.groovy b/grails-test-suite-uber/src/test/groovy/org/grails/web/metaclass/ForwardMethodTests.groovy
@@ -19,9 +19,9 @@ class ForwardMethodTests extends AbstractGrailsControllerTests {
         def testController = new ForwardingController()
 
         webRequest.controllerName = "fowarding"
-        assertEquals "/grails/fowarding/two.dispatch",testController.one()
-        assertEquals "/grails/next/go.dispatch",testController.three()
-        assertEquals "/grails/next/go.dispatch?id=10",testController.four()
+        assertEquals "/fowarding/two",testController.one()
+        assertEquals "/next/go",testController.three()
+        assertEquals "/next/go?id=10",testController.four()
         assertEquals "bar", request.foo
     }
 }

diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/metaclass/ForwardMethodspec.groovy b/grails-test-suite-uber/src/test/groovy/org/grails/web/metaclass/ForwardMethodspec.groovy
@@ -61,7 +61,7 @@ class ForwardMethodSpec extends Specification {
         when:
             def forwardUri = forwardMethod.forward(params)
         then:
-            forwardUri == '/grails/foo/foobar.dispatch'     
+            forwardUri == '/foo/foobar'
     }
 
     def 'Test forward request with controller and action params and url converter in app context'() {
@@ -72,7 +72,7 @@ class ForwardMethodSpec extends Specification {
         when:
             def forwardUri = forwardMethod.forward(params)
         then:
-            forwardUri == '/grails/foo/foobar.dispatch'
+            forwardUri == '/foo/foobar'
     }
 
     def 'Test forward request with controller and action params without an url converter'() {
@@ -83,7 +83,7 @@ class ForwardMethodSpec extends Specification {
         when:
             def forwardUri = forwardMethod.forward(params)
         then:
-            forwardUri == '/grails/foo/fooBar.dispatch'
+            forwardUri == '/foo/fooBar'
     }   
 }
 class ForwardMethodTest implements Controller {}