Changeset 6340

Timestamp:

12/06/07 17:00:57 (7 months ago)

Author:

fabien

Message:

refactored the date time widget + fixed unit tests + added unit tests for empty_values and can_be_empty

Files:

• trunk/lib/widget/sfWidgetFormDateTime.class.php (modified) (2 diffs)
• trunk/test/unit/widget/sfWidgetFormDateTest.php (modified) (3 diffs)
• trunk/test/unit/widget/sfWidgetFormDateTimeTest.php (modified) (1 diff)
• trunk/test/unit/widget/sfWidgetFormTimeTest.php (modified) (3 diffs)

trunk/lib/widget/sfWidgetFormDateTime.class.php

@@ -65 +65 @@
-  {
-    // date
-new sfWidgetFormDate($this->getOptionsFor('date'), $this->getAttributesFor('date')
+$this->getDateWidget()->render($name, $value
-
-    if (!$this->getOption('with_time'))
-    {
-->render($name, $value)
+
-    }
-
-
-
-
-
-
-
-
-
+
+
+
+
-  }
-
+  /**
+   * Returns the date widget
+   *
+   * @return sfWidgetForm A Widget representing the date
+   */
+  protected function getDateWidget()
+  {
+    return new sfWidgetFormDate($this->getOptionsFor('date'), $this->getAttributesFor('date'));
+  }
+
+  /**
+   * Returns the time widget
+   *
+   * @return sfWidgetForm A Widget representing the time
+   */
+  protected function getTimeWidget()
+  {
+    return new sfWidgetFormTime($this->getOptionsFor('time'), $this->getAttributesFor('time'));
+  }
+
+  /**
+   * Returns an array of options for the given type
+   *
+   * @param  string The type (date or time)
+   *
+   * @return array  An array of options
+   */
-  protected function getOptionsFor($type)
-  {
@@ -93 +116 @@
-  }
-
+  /**
+   * Returns an array of HTML attributes for the given type
+   *
+   * @param  string The type (date or time)
+   *
+   * @return array  An array of HTML attributes
+   */
-  protected function getAttributesFor($type)
-  {

trunk/test/unit/widget/sfWidgetFormDateTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-2
+9
-
-$w = new sfWidgetFormDate();
@@ -49 +49 @@
-
-// number of options in each select
+$t->is(count($css->matchAll('#foo_year option')->getNodes()), 12, '->render() renders a select tag for the 10 years around the current one');
+$t->is(count($css->matchAll('#foo_month option')->getNodes()), 13, '->render() renders a select tag for the 12 months in a year');
+$t->is(count($css->matchAll('#foo_day option')->getNodes()), 32, '->render() renders a select tag for the 31 days in a month');
+
+// can_be_empty option
+$t->diag('can_be_empty option');
+$w->setOption('can_be_empty', false);
+$dom->loadHTML($w->render('foo', '2005-10-15'));
+$css = new sfDomCssSelector($dom);
-$t->is(count($css->matchAll('#foo_year option')->getNodes()), 11, '->render() renders a select tag for the 10 years around the current one');
-$t->is(count($css->matchAll('#foo_month option')->getNodes()), 12, '->render() renders a select tag for the 12 months in a year');
-$t->is(count($css->matchAll('#foo_day option')->getNodes()), 31, '->render() renders a select tag for the 31 days in a month');
+$w->setOption('can_be_empty', true);
+
+// empty_values
+$t->diag('empty_values option');
+$w->setOption('empty_values', array('year' => 'YEAR', 'month' => 'MONTH', 'day' => 'DAY'));
+$dom->loadHTML($w->render('foo', '2005-10-15'));
+$css = new sfDomCssSelector($dom);
+$t->is($css->matchSingle('#foo_year option')->getNode()->nodeValue, 'YEAR', '->configure() can change the empty values');
+$t->is($css->matchSingle('#foo_month option')->getNode()->nodeValue, 'MONTH', '->configure() can change the empty values');
+$t->is($css->matchSingle('#foo_day option')->getNode()->nodeValue, 'DAY', '->configure() can change the empty values');
+$w->setOption('empty_values', array('year' => '', 'month' => '', 'day' => ''));
-
-// format option
@@ -76 +96 @@
-$dom->loadHTML($w->render('foo', '2005-10-15'));
-$css = new sfDomCssSelector($dom);
-4
-3
-2
+5
+4
+3

trunk/test/unit/widget/sfWidgetFormDateTimeTest.php

@@ -55 +55 @@
-
-// number of options in each select
-1
-2
-1
-4
-0
-0
+2
+3
+2
+5
+1
+1
-
-// date and time format option

trunk/test/unit/widget/sfWidgetFormTimeTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-3
+9
-
-$w = new sfWidgetFormTime(array('with_seconds' => true));
@@ -48 +48 @@
-
-// number of options in each select
-
+
+
+
+
+
+
+
+
+
+
-$t->is(count($css->matchAll('#foo_minute option')->getNodes()), 60, '->render() renders a select tag for the 60 minutes in an hour');
-$t->is(count($css->matchAll('#foo_second option')->getNodes()), 60, '->render() renders a select tag for the 60 seconds in a minute');
+$w->setOption('can_be_empty', true);
+
+// empty_values
+$t->diag('empty_values option');
+$w->setOption('empty_values', array('hour' => 'HOUR', 'minute' => 'MINUTE', 'second' => 'SECOND'));
+$dom->loadHTML($w->render('foo', '2005-10-15'));
+$css = new sfDomCssSelector($dom);
+$t->is($css->matchSingle('#foo_hour option')->getNode()->nodeValue, 'HOUR', '->configure() can change the empty values');
+$t->is($css->matchSingle('#foo_minute option')->getNode()->nodeValue, 'MINUTE', '->configure() can change the empty values');
+$t->is($css->matchSingle('#foo_second option')->getNode()->nodeValue, 'SECOND', '->configure() can change the empty values');
+$w->setOption('empty_values', array('hour' => '', 'minute' => '', 'second' => ''));
-
-// format option
@@ -75 +95 @@
-$dom->loadHTML($w->render('foo', '12:30:35'));
-$css = new sfDomCssSelector($dom);
-4
-2
-3
+5
+3
+4
-
-// with_seconds option