テストの修正

chihiro-adachi · Apr 15, 2024 · 15d027f · 15d027f
1 parent 4c7a40e
commit 15d027f
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/tests/Eccube/Tests/Web/Admin/Setting/Shop/MailControllerTest.php b/tests/Eccube/Tests/Web/Admin/Setting/Shop/MailControllerTest.php
@@ -80,6 +80,7 @@ public function testEdit()
         $MailTemplate = $this->createMail();
         $form = [
             '_token' => 'dummy',
+            'name' => $MailTemplate->getName(),
             'template' => $MailTemplate->getId(),
             'mail_subject' => 'Test Subject',
             'tpl_data' => 'Test TPL Data',
@@ -106,6 +107,7 @@ public function testEditHtml()
         $MailTemplate = $this->createMail();
         $form = [
             '_token' => 'dummy',
+            'name' => $MailTemplate->getName(),
             'template' => $MailTemplate->getId(),
             'mail_subject' => 'Test Subject',
             'tpl_data' => 'Test TPL Data',
@@ -133,18 +135,16 @@ public function testEditFail()
             'template' => $mid,
             'mail_subject' => 'Test Subject',
         ];
-        $this->client->request(
+        $crawler = $this->client->request(
             'POST',
             $this->generateUrl('admin_setting_shop_mail_edit', ['id' => $mid]),
             ['mail' => $form]
         );
 
-        $redirectUrl = $this->generateUrl('admin_setting_shop_mail');
-        $this->assertTrue($this->client->getResponse()->isRedirect($redirectUrl));
+        $this->assertTrue($this->client->getResponse()->isSuccessful());
 
-        $crawler = $this->client->followRedirect();
-        $this->actual = $crawler->filter('div.alert')->text();
-        $this->expected = trans('admin.common.save_error');
+        $this->actual = $crawler->filter('span.form-error-message')->text();
+        $this->expected = '選択した値は無効です。';
         $this->verify();
     }
 
@@ -158,13 +158,15 @@ public function testCreateFail()
             'template' => null,
             'mail_subject' => null,
         ];
-        $this->client->request(
+        $crawler = $this->client->request(
             'POST',
             $this->generateUrl('admin_setting_shop_mail'),
             ['mail' => $form]
         );
 
-        $redirectUrl = $this->generateUrl('admin_setting_shop_mail');
-        $this->assertTrue($this->client->getResponse()->isRedirect($redirectUrl));
+        $this->assertTrue($this->client->getResponse()->isSuccessful());
+        $this->actual = $crawler->filter('span.form-error-message')->text();
+        $this->expected = '入力されていません。';
+        $this->verify();
     }
 }