Fix tests for datetime support

codeconsole · codeconsole · commit 791217c45a53 · 2025-10-22T16:28:05.000-07:00
diff --git a/grails-fields/src/test/groovy/grails/plugin/formfields/DisplayWidgetSpec.groovy b/grails-fields/src/test/groovy/grails/plugin/formfields/DisplayWidgetSpec.groovy
@@ -38,12 +38,12 @@ class DisplayWidgetSpec extends AbstractFormFieldsTagLibSpec implements TagLibUn
 
 	void 'f:displayWidget without template and a date value renders the formatted date'() {
 		expect:
-		applyTemplate('<f:displayWidget bean="personInstance" property="dateOfBirth"/>', [personInstance: personInstance]) == applyTemplate('<g:formatDate date="${personInstance.dateOfBirth}"/>', [personInstance: personInstance])
+		applyTemplate('<f:displayWidget bean="personInstance" property="dateOfBirth"/>', [personInstance: personInstance]) == applyTemplate('<g:formatDate date="${personInstance.dateOfBirth}" type="DATETIME"/>', [personInstance: personInstance])
 	}
 
 	void 'f:displayWidget without template and an instant value renders the formatted date'() {
 		expect:
-		applyTemplate('<f:displayWidget bean="cyborgInstance" property="timestamp"/>', [cyborgInstance: cyborgInstance]) == applyTemplate('<g:formatDate date="${cyborgInstance.timestamp}"/>', [cyborgInstance: cyborgInstance])
+		applyTemplate('<f:displayWidget bean="cyborgInstance" property="timestamp"/>', [cyborgInstance: cyborgInstance]) == applyTemplate('<g:formatDate date="${cyborgInstance.timestamp}" type="DATETIME"/>', [cyborgInstance: cyborgInstance])
 	}
 
 	void 'f:displayWidget without template and a LocalDate value renders the formatted date'() {
diff --git a/grails-fields/src/test/groovy/grails/plugin/formfields/taglib/DisplayTagSpec.groovy b/grails-fields/src/test/groovy/grails/plugin/formfields/taglib/DisplayTagSpec.groovy
@@ -98,7 +98,7 @@ class DisplayTagSpec extends AbstractFormFieldsTagLibSpec implements TagLibUnitT
 
 	void 'renders date values using g:formatDate'() {
 		expect:
-		applyTemplate('<f:display bean="personInstance" property="dateOfBirth"/>', [personInstance: personInstance]) ==~ /1987-04-19 00:00:00 [A-Z]{3,4}/
+		applyTemplate('<f:display bean="personInstance" property="dateOfBirth"/>', [personInstance: personInstance]) == applyTemplate('<g:formatDate date="${personInstance.dateOfBirth}" type="DATETIME"/>', [personInstance: personInstance])
 	}
 
 	void 'displays using template if one is present'() {

Original file line number	Diff line number	Diff line change
`@@ -38,12 +38,12 @@ class DisplayWidgetSpec extends AbstractFormFieldsTagLibSpec implements TagLibUn`
`38`	`38`
`39`	`39`	`void 'f:displayWidget without template and a date value renders the formatted date'() {`
`40`	`40`	`expect:`
`41`		`- applyTemplate('<f:displayWidget bean="personInstance" property="dateOfBirth"/>', [personInstance: personInstance]) == applyTemplate('<g:formatDate date="${personInstance.dateOfBirth}"/>', [personInstance: personInstance])`
	`41`	`+ applyTemplate('<f:displayWidget bean="personInstance" property="dateOfBirth"/>', [personInstance: personInstance]) == applyTemplate('<g:formatDate date="${personInstance.dateOfBirth}" type="DATETIME"/>', [personInstance: personInstance])`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`void 'f:displayWidget without template and an instant value renders the formatted date'() {`
`45`	`45`	`expect:`
`46`		`- applyTemplate('<f:displayWidget bean="cyborgInstance" property="timestamp"/>', [cyborgInstance: cyborgInstance]) == applyTemplate('<g:formatDate date="${cyborgInstance.timestamp}"/>', [cyborgInstance: cyborgInstance])`
	`46`	`+ applyTemplate('<f:displayWidget bean="cyborgInstance" property="timestamp"/>', [cyborgInstance: cyborgInstance]) == applyTemplate('<g:formatDate date="${cyborgInstance.timestamp}" type="DATETIME"/>', [cyborgInstance: cyborgInstance])`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`void 'f:displayWidget without template and a LocalDate value renders the formatted date'() {`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ class DisplayTagSpec extends AbstractFormFieldsTagLibSpec implements TagLibUnitT`
`98`	`98`
`99`	`99`	`void 'renders date values using g:formatDate'() {`
`100`	`100`	`expect:`
`101`		`- applyTemplate('<f:display bean="personInstance" property="dateOfBirth"/>', [personInstance: personInstance]) ==~ /1987-04-19 00:00:00 [A-Z]{3,4}/`
	`101`	`+ applyTemplate('<f:display bean="personInstance" property="dateOfBirth"/>', [personInstance: personInstance]) == applyTemplate('<g:formatDate date="${personInstance.dateOfBirth}" type="DATETIME"/>', [personInstance: personInstance])`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`void 'displays using template if one is present'() {`