[Simpletest-devel] SF.net SVN: simpletest:[2013] simpletest/trunk

[<pp...@us...>]

Revision: 2013
          http://simpletest.svn.sourceforge.net/simpletest/?rev=2013&view=rev
Author:   pp11
Date:     2011-04-29 09:29:45 +0000 (Fri, 29 Apr 2011)

Log Message:
-----------
Patch 2896044 : browser/submitFormById additional form parameters support - submitted by Vasyl Pasternak ( vasylp )

Modified Paths:
--------------
    simpletest/trunk/browser.php
    simpletest/trunk/form.php
    simpletest/trunk/test/acceptance_test.php
    simpletest/trunk/test/site/network_confirm.php
    simpletest/trunk/test/site/page_request.php
    simpletest/trunk/web_tester.php

Modified: simpletest/trunk/browser.php
===================================================================
--- simpletest/trunk/browser.php	2011-04-29 08:57:00 UTC (rev 2012)
+++ simpletest/trunk/browser.php	2011-04-29 09:29:45 UTC (rev 2013)
@@ -1039,13 +1039,13 @@
      *    @return string/boolean  Page on success.
      *    @access public
      */
-    function submitFormById($id) {
+    function submitFormById($id, $additional = false) {
         if (! ($form = $this->page->getFormById($id))) {
             return false;
         }
         $success = $this->load(
                 $form->getAction(),
-                $form->submit());
+                $form->submit($additional));
         return ($success ? $this->getContent() : $success);
     }
 

Modified: simpletest/trunk/form.php
===================================================================
--- simpletest/trunk/form.php	2011-04-29 08:57:00 UTC (rev 2012)
+++ simpletest/trunk/form.php	2011-04-29 09:29:45 UTC (rev 2013)
@@ -350,8 +350,12 @@
      *    @return hash           Submitted values.
      *    @access public
      */
-    function submit() {
-        return $this->encode();
+    function submit($additional = false) {
+        $encoding = $this->encode();
+        if ($additional) {
+            $encoding->merge($additional);
+        }
+        return $encoding;
     }
 }
 ?>
\ No newline at end of file

Modified: simpletest/trunk/test/acceptance_test.php
===================================================================
--- simpletest/trunk/test/acceptance_test.php	2011-04-29 08:57:00 UTC (rev 2012)
+++ simpletest/trunk/test/acceptance_test.php	2011-04-29 09:29:45 UTC (rev 2013)
@@ -780,6 +780,12 @@
         $this->assertText('go=[Go!]');
     }
 
+    function testFormSubmissionWithIdsAndAdditionnalData() {
+        $this->get($this->samples() . 'form.html');
+        $this->assertTrue($this->clickSubmitById(99, array('additionnal' => "data")));
+        $this->assertText('additionnal=[data]');
+    }
+
     function testFormSubmissionWithLabels() {
         $this->get($this->samples() . 'form.html');
         $this->assertField('Text A', '');

Modified: simpletest/trunk/test/site/network_confirm.php
===================================================================
--- simpletest/trunk/test/site/network_confirm.php	2011-04-29 08:57:00 UTC (rev 2012)
+++ simpletest/trunk/test/site/network_confirm.php	2011-04-29 09:29:45 UTC (rev 2013)
@@ -1,11 +1,11 @@
 <?php
-    if (count($HTTP_COOKIE_VARS) > 0) {
+    if (isset($HTTP_COOKIE_VARS) and count($HTTP_COOKIE_VARS) > 0) {
         $_COOKIE = $HTTP_COOKIE_VARS;
     }
-    if (count($HTTP_GET_VARS) > 0) {
+    if (isset($HTTP_GET_VARS) and count($HTTP_GET_VARS) > 0) {
         $_GET = $HTTP_GET_VARS;
     }
-    if (count($HTTP_POST_VARS) > 0) {
+    if (isset($HTTP_POST_VARS) and count($HTTP_POST_VARS) > 0) {
         $_POST = $HTTP_POST_VARS;
     }
     if (! isset($_SERVER)) {

Modified: simpletest/trunk/test/site/page_request.php
===================================================================
--- simpletest/trunk/test/site/page_request.php	2011-04-29 08:57:00 UTC (rev 2012)
+++ simpletest/trunk/test/site/page_request.php	2011-04-29 09:29:45 UTC (rev 2013)
@@ -47,13 +47,13 @@
     }
     
     function get() {
-        $request = &new PageRequest($_SERVER['QUERY_STRING']);
+        $request = new PageRequest($_SERVER['QUERY_STRING']);
         return $request->getAll();
     }
     
     function post() {
         global $HTTP_RAW_POST_DATA;
-        $request = &new PageRequest($HTTP_RAW_POST_DATA);
+        $request = new PageRequest($HTTP_RAW_POST_DATA);
         return $request->getAll();
     }
 }

Modified: simpletest/trunk/web_tester.php
===================================================================
--- simpletest/trunk/web_tester.php	2011-04-29 08:57:00 UTC (rev 2012)
+++ simpletest/trunk/web_tester.php	2011-04-29 09:29:45 UTC (rev 2013)
@@ -1012,8 +1012,8 @@
      *    @return boolean/string  Page on success.
      *    @access public
      */
-    function submitFormById($id) {
-        return $this->failOnError($this->browser->submitFormById($id));
+    function submitFormById($id, $additional = false) {
+        return $this->failOnError($this->browser->submitFormById($id, $additional));
     }
 
     /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.