Merge pull request #32 from kurozumi/fix-test

テスト修正
kurozumi · Nov 25, 2022 · 942d1f5 · 942d1f5
2 parents ebaeffe + 2191f26
commit 942d1f5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/phpstan.yaml b/.github/workflows/phpstan.yaml
@@ -46,10 +46,10 @@ jobs:
           composer require stripe/stripe-php
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: app/Plugin/${{ env.PLUGIN_CODE }}
-          ref: ${{ env.PLUGIN_BRANCH }}
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: PHPStan
         run: |

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -56,7 +56,7 @@ jobs:
 
     steps:
       - name: Checkout EC-CUBE
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: EC-CUBE/ec-cube
           ref: ${{ matrix.eccube-versions }}
@@ -87,10 +87,10 @@ jobs:
           composer require stripe/stripe-php
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: app/Plugin/${{ env.PLUGIN_CODE }}
-          ref: ${{ env.PLUGIN_BRANCH }}
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Setup EC-CUBE
         run: |

diff --git a/Tests/Web/ShoppingControllerTest.php b/Tests/Web/ShoppingControllerTest.php
@@ -76,7 +76,7 @@ public function testお支払い方法にクレジットカード決済が表示
         // 確認画面
         $crawler = $this->scenarioConfirm();
 
-        self::assertContains('クレジットカード決済', $crawler->html());
+        self::assertStringContainsString('クレジットカード決済', $crawler->html());
     }
 
     public function testクレジットカード決済を選択したときにクレジットカード情報項目が表示されるか()
@@ -122,7 +122,7 @@ public function testクレジットカード決済を選択したときにクレ
             ],
         ]);
 
-        self::assertNotContains('クレジットカード情報', $crawler->html());
+        self::assertStringNotContainsString('クレジットカード情報', $crawler->html());
 
         // クレジットカード決済を選択
         $crawler = $this->scenarioRedirectTo($Customer, [
@@ -138,7 +138,7 @@ public function testクレジットカード決済を選択したときにクレ
             ],
         ]);
 
-        self::assertContains('クレジットカード情報', $crawler->html());
+        self::assertStringContainsString('クレジットカード情報', $crawler->html());
     }
 
     /**