Merge branch 'master' of https://github.com/EC-CUBE/ec-cube into eccu…

…bevnmaster
EC-CUBE · Jul 5, 2017 · 19f5732 · 19f5732
2 parents d883e66 + b0acb89
commit 19f5732
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/src/Eccube/Resource/template/admin/Customer/edit.twig b/src/Eccube/Resource/template/admin/Customer/edit.twig
@@ -139,7 +139,7 @@
                             </div>
                         </div>
                         {# FAX番号 #}
-                        <div id="detail_box__fox" class="form-group">
+                        <div id="detail_box__fax" class="form-group">
                             {{ form_label(form.fax) }}
                             <div class="col-sm-9 col-lg-10 input_tel form-inline">
                                 {{ form_widget(form.fax.fax01) }}-{{ form_widget(form.fax.fax02) }}-{{ form_widget(form.fax.fax03) }}

diff --git a/tests/Eccube/Tests/Form/Type/Admin/OrderSearchTypeTest.php b/tests/Eccube/Tests/Form/Type/Admin/OrderSearchTypeTest.php
@@ -53,7 +53,36 @@ public function testTel_ValidData()
         $this->form->submit($formData);
         $this->assertTrue($this->form->isValid());
     }
-
+
+    public function testTelWithHyphenMiddle_ValidData()
+    {
+        $formData = array(
+            'tel' => '012-345'
+        );
+
+        $this->form->submit($formData);
+        $this->assertTrue($this->form->isValid());
+    }
+    public function testTelWithHyphenBefore_ValidData()
+    {
+        $formData = array(
+            'tel' => '-345'
+        );
+
+        $this->form->submit($formData);
+        $this->assertTrue($this->form->isValid());
+    }
+
+    public function testTelWithHyphenAfter_ValidData()
+    {
+        $formData = array(
+            'tel' => '012-'
+        );
+
+        $this->form->submit($formData);
+        $this->assertTrue($this->form->isValid());
+    }
+
     public function testTel_NotValidData()
     {
         //意味あんだか良くわからんが一応書いとく