Changeset 13023

Timestamp:

11/16/08 01:25:26 (8 months ago)

Author:

FabianLange

Message:

[1.2] added basic implementation of select()/deselect() support to test browser for changing selection in check and radiobuttons. Closes #4673

Files:

• branches/1.2/lib/test/sfTestFunctionalBase.class.php (modified) (1 diff)
• branches/1.2/lib/util/sfBrowserBase.class.php (modified) (1 diff)
• branches/1.2/test/unit/util/sfBrowserTest.php (modified) (3 diffs)

branches/1.2/lib/test/sfTestFunctionalBase.class.php

@@ -244 +244 @@
-
-    $this->browser->call($uri, $method, $parameters, $changeStack);
+
+    return $this;
+  }
+
+  /**
+   * Simulates deselecting a checkbox or radiobutton.
+   *
+   * @param string  $name       The checkbox or radiobutton id, name or text
+   *
+   * @return sfBrowser
+   */
+  public function deselect($name)
+  {
+    $this->browser->doSelect($name, false);
+
+    return $this;
+  }
+
+  /**
+   * Simulates selecting a checkbox or radiobutton.
+   *
+   * @param string  $name       The checkbox or radiobutton id, name or text
+   *
+   * @return sfBrowser
+   */
+  public function select($name)
+  {
+    $this->browser->doSelect($name, true);
-
-    return $this;

branches/1.2/lib/util/sfBrowserBase.class.php

@@ -540 +540 @@
-
-  /**
+   * Simulates deselecting a checkbox or radiobutton.
+   *
+   * @param string  $name       The checkbox or radiobutton id, name or text
+   *
+   * @return sfBrowser
+   *
+   * @see    doSelect()
+   */
+  public function deselect($name)
+  {
+    $this->doSelect($name, false);
+
+    return $this;
+  }
+
+  /**
+   * Simulates selecting a checkbox or radiobutton.
+   *
+   * @param string  $name       The checkbox or radiobutton id, name or text
+   *
+   * @return sfBrowser
+   *
+   * @see    doSelect()
+   */
+  public function select($name)
+  {
+    $this->doSelect($name, true);
+
+    return $this;
+  }
+
+  /**
+   * Simulates selecting a checkbox or radiobutton.
+   *
+   * This method is called internally by the select() and deselect() methods.
+   *
+   * @param string  $name       The checkbox or radiobutton id, name or text
+   * @param boolean $selected   If true the item will be selected
+   *
+   */
+  public function doSelect($name, $selected)
+  {
+    $position = 0;
+    $dom = $this->getResponseDom();
+
+    if (!$dom)
+    {
+      throw new LogicException('Cannot select because there is no current page in the browser.');
+    }
+
+    $xpath = new DomXpath($dom);
+
+    if ($element = $xpath->query(sprintf('//input[(@type="radio" or @type="checkbox") and (.="%s" or @id="%s" or @name="%s")]', $name, $name, $name))->item($position))
+    {
+      if ($selected)
+      {
+        if ($element->getAttribute('type') == 'radio')
+        {
+          //we need to deselect all other radio buttons with the same name
+          foreach ($xpath->query(sprintf('//input[@type="radio" and @name="%s"]', $element->getAttribute('name'))) as $radio)
+          {
+            $radio->removeAttribute('checked');
+          }
+        }
+        $element->setAttribute('checked', 'checked');
+      }
+      else
+      {
+        if ($element->getAttribute('type') == 'radio')
+        {
+          throw new InvalidArgumentException('Radiobutton cannot be deselected - Select another radiobutton to deselect the current.');
+        }
+        $element->removeAttribute('checked');
+      }
+    }
+    else
+    {
+      throw new InvalidArgumentException(sprintf('Cannot find the "%s" checkbox or radiobutton.', $name));
+    }
+  }
+
+  /**
-   * Simulates a click on a link or button.
-   *

branches/1.2/test/unit/util/sfBrowserTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-4
+9
-
-// ->click()
@@ -79 +79 @@
-      <input type="checkbox" name="checkbox1" value="checkboxvalue" checked="checked" />
-      <input type="checkbox" name="checkbox2" checked="checked" />
+      <input type="checkbox" name="checkbox3" />
+      <input type="radio" name="radio1" value="a" id="a-radio" />
+      <input type="radio" name="radio1" value="b" id="b-radio" />
-      <input type="button" name="mybutton" value="mybuttonvalue" />
-      <input type="submit" name="submit" value="submit" />
@@ -234 +237 @@
-$t->is($parameters['text'], 'yourothervalue', '->setField() is overriden by parameters from click call');
-
+// ->deselect()/select()
+$t->diag('->deselect()/select()');
+list($method, $uri, $parameters) = $b->
+  deselect('checkbox1')->
+  select('checkbox3')->
+  select('b-radio')->
+  click('submit')
+;
+$t->is(isset($parameters['checkbox1']), false, '->deselect() unckecks a checkbox');
+$t->is(isset($parameters['checkbox3']), true, '->select() ckecks a checkbox');
+$t->is($parameters['radio1'], 'b', '->select() selects a radiobutton');
+list($method, $uri, $parameters) = $b->
+  select('a-radio')->
+  click('submit')
+;
+$t->is($parameters['radio1'], 'a', '->select() toggles radiobuttons');
+
+try
+{
+  $b->deselect('b-radio');
+  $t->fail('->deselect() cannot deselect radiobuttons');
+}
+catch(Exception $e)
+{
+  $t->pass('->deselect() cannot deselect radiobuttons');
+}
+
-// ->call()
-$t->diag('->call()');