Merge branch 'master' into stable

1 files changed, 17 insertions, 0 deletions

diff --git a/_test/tests/inc/form/inputelement.test.php b/_test/tests/inc/form/inputelement.test.php
index 7a5e6d2ea..3257d2a89 100644
--- a/_test/tests/inc/form/inputelement.test.php
+++ b/_test/tests/inc/form/inputelement.test.php
@@ -14,6 +14,7 @@ class form_inputelement_test extends DokuWikiTest {
         $input = $pq->find('input[name=foo]');
         $this->assertTrue($input->length == 1);
         $this->assertEquals('this is text', $input->val());
+        $this->assertEquals('text', $input->attr('type'));
 
         $label = $pq->find('label');
         $this->assertTrue($label->length == 1);
@@ -38,4 +39,20 @@ class form_inputelement_test extends DokuWikiTest {
         $this->assertEquals('a new text', $input->val());
     }
 
+    function test_password() {
+        $form = new Form\Form();
+        $form->addPasswordInput('foo', 'label text')->val('this is text');
+
+        $html = $form->toHTML();
+        $pq = phpQuery::newDocumentXHTML($html);
+
+        $input = $pq->find('input[name=foo]');
+        $this->assertTrue($input->length == 1);
+        $this->assertEquals('this is text', $input->val());
+        $this->assertEquals('password', $input->attr('type'));
+
+        $label = $pq->find('label');
+        $this->assertTrue($label->length == 1);
+        $this->assertEquals('label text', $label->find('span')->text());
+    }
 }