diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/AnotherController.groovy b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/AnotherController.groovy
index 93713de04a6..941e0557d3b 100644
--- a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/AnotherController.groovy
+++ b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/AnotherController.groovy
@@ -67,8 +67,8 @@ class AnotherController {
render(view:"foo")
}
- def renderTemplate = {
- render(template:"bar")
+ def renderTemplate(String template) {
+ render(template: template)
}
def renderXml = {
diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/AstEnhancedControllerUnitTestMixinTests.groovy b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/AstEnhancedControllerUnitTestMixinTests.groovy
index ec0f21ab2b8..63b3be90fd3 100644
--- a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/AstEnhancedControllerUnitTestMixinTests.groovy
+++ b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/AstEnhancedControllerUnitTestMixinTests.groovy
@@ -145,10 +145,13 @@ class AstEnhancedControllerUnitTestMixinTests extends Specification implements C
file.targetFileLocation.path == "${File.separatorChar}local${File.separatorChar}disk${File.separatorChar}myFile"
}
- void testRenderBasicTemplateNoTags() {
+ void testRenderBasicTemplateNoTags() {
+ given:
+ def templateName = 'testRenderBasicTemplateNoTags'
+
when:
- groovyPages['/another/_bar.gsp'] = 'Hello <%= 10 %>'
- controller.renderTemplate()
+ groovyPages["/another/_${templateName}.gsp" as String] = 'Hello <%= 10 %>'
+ controller.renderTemplate(templateName)
then:
response.contentAsString == "Hello 10"
@@ -156,19 +159,23 @@ class AstEnhancedControllerUnitTestMixinTests extends Specification implements C
void testRenderBasicTemplateWithTags() {
given:
- groovyPages['/another/_bar.gsp'] = 'Hello '
+ def templateName = 'testRenderBasicTemplateWithTags'
when:
- controller.renderTemplate()
+ groovyPages["/another/_${templateName}.gsp" as String] = 'Hello '
+ controller.renderTemplate(templateName)
then:
response.contentAsString == "Hello World"
}
- void testRenderBasicTemplateWithLinkTag() {
+ void testRenderBasicTemplateWithLinkTag() {
+ given:
+ def templateName = 'testRenderBasicTemplateWithLinkTag'
+
when:
- groovyPages['/another/_bar.gsp'] = 'Hello '
- controller.renderTemplate()
+ groovyPages["/another/_${templateName}.gsp" as String] = 'Hello '
+ controller.renderTemplate(templateName)
then:
response.contentAsString == "Hello /bar"
diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerUnitTestMixinTests.groovy b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerUnitTestMixinTests.groovy
index 535f424b43d..99f56f65644 100644
--- a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerUnitTestMixinTests.groovy
+++ b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerUnitTestMixinTests.groovy
@@ -179,30 +179,37 @@ class ControllerUnitTestMixinTests extends Specification implements ControllerUn
}
void testRenderBasicTemplateNoTags() {
+ given:
+ def templateName = 'testRenderBasicTemplateNoTags'
+
when:
- groovyPages['/test/_bar.gsp'] = 'Hello <%= 10 %>'
- controller.renderTemplate()
+ groovyPages["/test/_${templateName}.gsp" as String] = 'Hello <%= 10 %>'
+ controller.renderTemplate(templateName)
then:
response.contentAsString == "Hello 10"
}
void testRenderBasicTemplateWithTags() {
- messageSource.addMessage("foo.bar", request.locale, "World")
+ given:
+ def templateName = 'testRenderBasicTemplateWithTags'
when:
- groovyPages['/test/_bar.gsp'] = 'Hello '
- controller.renderTemplate()
+ messageSource.addMessage("foo.bar", request.locale, "World")
+ groovyPages["/test/_${templateName}.gsp" as String] = 'Hello '
+ controller.renderTemplate(templateName)
then:
response.contentAsString == "Hello World"
}
void testRenderBasicTemplateWithLinkTag() {
-
+ given:
+ def templateName = 'testRenderBasicTemplateWithLinkTag'
+
when:
- groovyPages['/test/_bar.gsp'] = 'Hello '
- controller.renderTemplate()
+ groovyPages["/test/_${templateName}.gsp" as String] = 'Hello '
+ controller.renderTemplate(templateName)
then:
response.contentAsString == "Hello /bar"
@@ -595,8 +602,8 @@ class TestController {
render(view:"foo")
}
- def renderTemplate = {
- render(template:"bar")
+ def renderTemplate(String template) {
+ render(template: template)
}
def renderXml = {
diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/RenderMethodTests.groovy b/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/RenderMethodTests.groovy
index 8560b533eaf..4c23735d5ea 100644
--- a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/RenderMethodTests.groovy
+++ b/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/RenderMethodTests.groovy
@@ -183,18 +183,24 @@ class RenderMethodTests extends Specification implements ControllerUnitTest'
- controller.renderTemplateWithCollection()
+ views["/render/_${templateName}.gsp" as String] = '${it.firstName} ${it.middleName}
'
+ controller.renderTemplateWithCollection(templateName)
then:
response.contentAsString == 'Jacob Ray
Zachary Scott
'
}
void testRenderTemplateWithCollectionUsingExplicitVariableName() {
+ given:
+ def templateName = 'testRenderTemplateWithCollectionUsingExplicitVariableName'
+
when:
- views['/render/_peopleTemplate.gsp'] = '${person.firstName} ${person.middleName}
'
- controller.renderTemplateWithCollectionAndExplicitVarName()
+ views["/render/_${templateName}.gsp" as String] = '${person.firstName} ${person.middleName}
'
+ controller.renderTemplateWithCollectionAndExplicitVarName(templateName)
then:
response.contentAsString == 'Jacob Ray
Zachary Scott
'
@@ -249,19 +255,19 @@ class RenderController {
def renderTemplate() {
render(template:"testTemplate", model:[hello:"world"])
}
- def renderTemplateWithCollection() {
+ def renderTemplateWithCollection(String template) {
def people = [
[firstName: 'Jacob', middleName: 'Ray'],
[firstName: 'Zachary', middleName: 'Scott']
]
- render(template:"peopleTemplate", collection: people)
+ render(template: template, collection: people)
}
- def renderTemplateWithCollectionAndExplicitVarName() {
+ def renderTemplateWithCollectionAndExplicitVarName(String template) {
def people = [
[firstName: 'Jacob', middleName: 'Ray'],
[firstName: 'Zachary', middleName: 'Scott']
]
- render(var: 'person', template:"peopleTemplate", collection: people)
+ render(var: 'person', template: template, collection: people)
}
def renderXmlTemplate() {
render(template:"xmlTemplate",contentType:"text/xml")