Merge remote-tracking branch 'upstream/dev/3.0.16' into private_dev/3…

….0.16
EC-CUBE · Jan 30, 2018 · 51a4d33 · 51a4d33
2 parents d98955c + 0efa529
commit 51a4d33
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tests/Eccube/Tests/Form/Type/Admin/CustomerTypeTest.php b/tests/Eccube/Tests/Form/Type/Admin/CustomerTypeTest.php
@@ -42,7 +42,7 @@ class CustomerTypeTest extends \Eccube\Tests\Form\Type\AbstractTypeTestCase
             'kana01' => 'タカハシ',
             'kana02' => 'シンイチ',
         ),
-        'company_name' => 'ロックオン',
+        'company_name' => '株式会社テストショップ',
         'zip' => array(
             'zip01' => '530',
             'zip02' => '0001',

diff --git a/tests/Eccube/Tests/Form/Type/Admin/OrderTypeTest.php b/tests/Eccube/Tests/Form/Type/Admin/OrderTypeTest.php
@@ -44,7 +44,7 @@ class OrderTypeTest extends \Eccube\Tests\Form\Type\AbstractTypeTestCase
             'kana01' => 'タカハシ',
             'kana02' => 'シンイチ',
         ),
-        'company_name' => 'ロックオン',
+        'company_name' => '株式会社テストショップ',
         'zip' => array(
             'zip01' => '530',
             'zip02' => '0001',