fixed submit options

slywalker · Nov 13, 2012 · 8014a20 · 8014a20
1 parent ea34939
commit 8014a20
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Test/Case/View/Helper/BootstrapFormHelperTest.php b/Test/Case/View/Helper/BootstrapFormHelperTest.php
@@ -49,9 +49,9 @@ public function testCreate() {
  * @return void
  */
 	public function testSubmit() {
-		$form = $this->BootstrapForm->submit();
+		$form = $this->BootstrapForm->submit('Submit');
 		$expected = '<div class="form-actions">' .
-			'<button type="submit" class="btn" div="form-actions"></button></div>';
+			'<button type="submit" class="btn">Submit</button></div>';
 		$this->assertSame($expected, $form);
 	}
 

diff --git a/View/Helper/BootstrapFormHelper.php b/View/Helper/BootstrapFormHelper.php
@@ -176,6 +176,7 @@ public function submit($caption = null, $options = array()) {
 			unset($options['icon']);
 		}
 		$div = $this->_extractOption('div', $options);
+		unset($options['div']);
 		$out = $this->button($caption, $options);
 		return (false === $div) ? $out : $this->Html->div($div, $out);
 	}