Merge remote-tracking branch 'upstream/master'

AlexMiroshnikov · Feb 29, 2012 · 975eafd · 975eafd
2 parents 8fd6a3e + d219a01
commit 975eafd
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 31 deletions.
diff --git a/codecept.bat b/codecept.bat
@@ -1,8 +1,11 @@
-@echo off
-if "%PHPBIN%" == "" set PHPBIN=@php_bin@
-if not exist "%PHPBIN%" if "%PHP_PEAR_PHP_BIN%" neq "" goto USE_PEAR_PATH
-GOTO RUN
-:USE_PEAR_PATH
-set PHPBIN=%PHP_PEAR_PHP_BIN%
-:RUN
-"%PHPBIN%" "@bin_dir@\codecept" %*
+@echo off
+if "%PHPBIN%" == "" set PHPBIN=@php_bin@
+if exist "codecept" goto INTERNAL
+if not exist "%PHPBIN%" if "%PHP_PEAR_PHP_BIN%" neq "" goto USE_PEAR_PATH
+GOTO RUN
+:USE_PEAR_PATH
+set PHPBIN=%PHP_PEAR_PHP_BIN%
+:RUN
+"%PHPBIN%" "@bin_dir@\codecept" %*
+:INTERNAL
+"%PHPBIN%" "codecept" %*
diff --git a/src/Codeception/Module/ZF1.php b/src/Codeception/Module/ZF1.php
@@ -119,6 +119,7 @@ protected function debugResponse()
 //            $this->client->getzendrequest()->getcontrollername(),
 //            $this->client->getzendrequest()->getactionname()
 //        ));
+        $this->debugSection('Session',json_encode($_COOKIE));
         if ($this->db) {
             $profiler = $this->db->getProfiler();
             $queries = $profiler->getTotalNumQueries() - $this->queries;

diff --git a/src/Codeception/Util/Framework.php b/src/Codeception/Util/Framework.php
@@ -195,7 +195,10 @@ protected function getFormFor($node)
         $action = $this->getFormUrl($form);
 
         if (!isset($this->forms[$action])) {
-            $form->children()->addHtmlContent('<input type="submit" />'); // for forms with no submits...
+            $submit = new \DOMElement('input');
+            $submit = $form->current()->appendChild($submit);
+            $submit->setAttribute('type','submit'); // for forms with no submits
+
             $form = $form->filter('input[type=submit]')->form();
             $this->forms[$action] = $form;
         }

diff --git a/tests/data/app/db b/tests/data/app/db
@@ -1 +1 @@
-a:1:{s:13:"4f4356d6a9057";a:0:{}}
+a:0:{}
diff --git a/tests/data/app/index.php b/tests/data/app/index.php
@@ -10,7 +10,7 @@
         '/' => 'index',
         '/info' => 'info',
         '/login' => 'login',
-        '/form/(field|select|checkbox|file|textarea|hidden|complex)(#)?' => 'form'
+        '/form/(field|select|checkbox|file|textarea|hidden|complex|button|empty)(#)?' => 'form'
     );
 
     glue::stick($urls);

diff --git a/tests/data/app/view/form/button.php b/tests/data/app/view/form/button.php
@@ -0,0 +1,8 @@
+<html>
+<body>
+<form action="/form/button" method="POST">
+    <input type="hidden" name="text" value="val" />
+    <button type="submit">Submit</button>
+</form>
+</body>
+</html>
diff --git a/tests/data/app/view/form/empty.php b/tests/data/app/view/form/empty.php
@@ -0,0 +1,7 @@
+<html>
+<body>
+<form action="/form/empty" method="POST">
+    <input type="text" name="text" value="val">
+</form>
+</body>
+</html>
diff --git a/tests/log/codeception-2012-02-06.log b/tests/log/codeception-2012-02-06.log
diff --git a/tests/unit/Codeception/Module/FrameworksTest.php b/tests/unit/Codeception/Module/FrameworksTest.php
@@ -169,6 +169,20 @@ public function testSubmitForm() {
         $this->assertEquals('Davert', $form['name']);
         $this->assertEquals('kill_all', $form['action']);
     }
+
+    public function testSubmitFormWithNoSubmitButton() {
+        $this->module->amOnPage('/form/empty');
+        $this->module->submitForm('form', array('text' => 'davert'));
+        $form = data::get('form');
+        $this->assertEquals('davert', $form['text']);
+    }
+
+    public function testSubmitFormByButton() {
+        $this->module->amOnPage('/form/button');
+        $this->module->click('Submit');
+        $form = data::get('form');
+        $this->assertEquals('val', $form['text']);
+    }
 
     public function testAjax() {
         $this->module->sendAjaxGetRequest('/info', array('show' => 'author'));
@@ -213,5 +227,7 @@ public function testComplexSelectorsAndForms() {
         $this->assertEquals('miles@davis.com', $post['email']);
 
     }
+
+
 
 }