From 09cee5a5dfa300397e298e12b0bf88d96b98efb2 Mon Sep 17 00:00:00 2001
From: Dmitry Khomutov <poisoncorpsee@gmail.com>
Date: Fri, 16 Feb 2018 16:59:36 +0700
Subject: [PATCH] Added more tests for the forms.

---
 src/B8Framework/Form/Input.php | 40 +++++++++++++++++-----------------
 tests/B8Framework/FormTest.php | 26 ++++++++++++++++++++++
 2 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/src/B8Framework/Form/Input.php b/src/B8Framework/Form/Input.php
index 90e62645..b3763710 100644
--- a/src/B8Framework/Form/Input.php
+++ b/src/B8Framework/Form/Input.php
@@ -9,17 +9,17 @@ class Input extends Element
     /**
      * @var boolean
      */
-    protected $_required = false;
+    protected $required = false;
 
     /**
      * @var string
      */
-    protected $_pattern;
+    protected $pattern;
 
     /**
      * @var callable
      */
-    protected $_validator;
+    protected $validator;
 
     /**
      * @var mixed
@@ -29,12 +29,12 @@ class Input extends Element
     /**
      * @var string
      */
-    protected $_error;
+    protected $error;
 
     /**
      * @var boolean
      */
-    protected $_customError = false;
+    protected $customError = false;
 
     /**
      * @param string  $name
@@ -78,7 +78,7 @@ class Input extends Element
      */
     public function getRequired()
     {
-        return $this->_required;
+        return $this->required;
     }
 
     /**
@@ -88,7 +88,7 @@ class Input extends Element
      */
     public function setRequired($required)
     {
-        $this->_required = (bool)$required;
+        $this->required = (bool)$required;
 
         return $this;
     }
@@ -98,7 +98,7 @@ class Input extends Element
      */
     public function getValidator()
     {
-        return $this->_validator;
+        return $this->validator;
     }
 
     /**
@@ -109,7 +109,7 @@ class Input extends Element
     public function setValidator($validator)
     {
         if (is_callable($validator) || $validator instanceof \Closure) {
-            $this->_validator = $validator;
+            $this->validator = $validator;
         }
 
         return $this;
@@ -120,7 +120,7 @@ class Input extends Element
      */
     public function getPattern()
     {
-        return $this->_pattern;
+        return $this->pattern;
     }
 
     /**
@@ -130,7 +130,7 @@ class Input extends Element
      */
     public function setPattern($pattern)
     {
-        $this->_pattern = $pattern;
+        $this->pattern = $pattern;
 
         return $this;
     }
@@ -141,12 +141,12 @@ class Input extends Element
     public function validate()
     {
         if ($this->getRequired() && empty($this->value)) {
-            $this->_error = $this->getLabel() . ' is required.';
+            $this->error = $this->getLabel() . ' is required.';
             return false;
         }
 
         if ($this->getPattern() && !preg_match('/' . $this->getPattern() . '/', $this->value)) {
-            $this->_error = 'Invalid value entered.';
+            $this->error = 'Invalid value entered.';
 
             return false;
         }
@@ -157,13 +157,13 @@ class Input extends Element
             try {
                 call_user_func_array($validator, [$this->value]);
             } catch (\Exception $ex) {
-                $this->_error = $ex->getMessage();
+                $this->error = $ex->getMessage();
 
                 return false;
             }
         }
 
-        if ($this->_customError) {
+        if ($this->customError) {
             return false;
         }
 
@@ -177,8 +177,8 @@ class Input extends Element
      */
     public function setError($message)
     {
-        $this->_customError = true;
-        $this->_error       = $message;
+        $this->customError = true;
+        $this->error       = $message;
 
         return $this;
     }
@@ -189,8 +189,8 @@ class Input extends Element
     protected function onPreRender(View &$view)
     {
         $view->value    = $this->getValue();
-        $view->error    = $this->_error;
-        $view->pattern  = $this->_pattern;
-        $view->required = $this->_required;
+        $view->error    = $this->error;
+        $view->pattern  = $this->pattern;
+        $view->required = $this->required;
     }
 }
diff --git a/tests/B8Framework/FormTest.php b/tests/B8Framework/FormTest.php
index fbca322b..dcb58e41 100755
--- a/tests/B8Framework/FormTest.php
+++ b/tests/B8Framework/FormTest.php
@@ -68,6 +68,19 @@ class FormTest extends TestCase
         self::assertTrue(is_callable($f->getValidator()));
     }
 
+    public function testInputCreate()
+    {
+        $text = Form\Element\Text::create(
+            'input-name',
+            'input-label',
+            true
+        );
+
+        self::assertEquals('input-name', $text->getName());
+        self::assertEquals('input-label', $text->getLabel());
+        self::assertTrue($text->getRequired());
+    }
+
     public function testInputValidation()
     {
         $f = new Form\Element\Text();
@@ -98,6 +111,16 @@ class FormTest extends TestCase
         self::assertFalse($f->validate());
     }
 
+    public function testInputValidationWithCustomError()
+    {
+        $f = new Form\Element\Text();
+        $f->setRequired(true);
+        $f->setValue('input-value');
+        $f->setError('Error!');
+
+        self::assertFalse($f->validate());
+    }
+
     public function testFieldSetBasics()
     {
         $f = new Form\FieldSet();
@@ -188,5 +211,8 @@ class FormTest extends TestCase
 
         $e = new Form\Element\Url();
         self::assertTrue(strpos($e->render(), 'url') !== false);
+
+        $e = new Form\Element\Password();
+        self::assertTrue(strpos($e->render(), 'password') !== false);
     }
 }