diff --git a/lib/Cake/Test/Case/View/Helper/FormHelperTest.php b/lib/Cake/Test/Case/View/Helper/FormHelperTest.php index b95f21ce5..4988cd39f 100644 --- a/lib/Cake/Test/Case/View/Helper/FormHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/FormHelperTest.php @@ -2276,6 +2276,33 @@ class FormHelperTest extends CakeTestCase { $this->assertContains('<option value="00" selected="selected">00</option>', $result); } +/** + * Test interval & timeFormat = 12 + * + * @return void + */ + public function testInputTimeWithIntervalAnd12HourFormat() { + $result = $this->Form->input('Model.start_time', array( + 'type' => 'time', + 'timeFormat' => 12, + 'interval' => 5, + 'selected' => array('hour' => '4', 'min' => '30', 'meridian' => 'pm') + )); + $this->assertContains('<option value="04" selected="selected">4</option>', $result); + $this->assertContains('<option value="30" selected="selected">30</option>', $result); + $this->assertContains('<option value="pm" selected="selected">pm</option>', $result); + + $result = $this->Form->input('Model.start_time', array( + 'type' => 'time', + 'timeFormat' => '12', + 'interval' => 5, + 'selected' => '2013-04-19 16:30:00' + )); + $this->assertContains('<option value="04" selected="selected">4</option>', $result); + $this->assertContains('<option value="30" selected="selected">30</option>', $result); + $this->assertContains('<option value="pm" selected="selected">pm</option>', $result); + } + /** * test form->input() with datetime, date and time types *