From 85977748f012683ca04934ecc14d427f9d113c2a Mon Sep 17 00:00:00 2001 From: kurozumi Date: Fri, 25 Nov 2022 16:11:11 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tests/Web/ShoppingControllerTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tests/Web/ShoppingControllerTest.php b/Tests/Web/ShoppingControllerTest.php index ecd73c9..8520623 100644 --- 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, [ From 7db75fb5ec27f68e37f3a06630fbe56d365ae3e4 Mon Sep 17 00:00:00 2001 From: kurozumi Date: Fri, 25 Nov 2022 16:18:21 +0900 Subject: [PATCH 2/4] fix --- .github/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 197d34c..8944096 100644 --- 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,7 +87,7 @@ 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 }} From d85621747b4992b1892ab50adf4f629f35bc6f73 Mon Sep 17 00:00:00 2001 From: kurozumi Date: Fri, 25 Nov 2022 16:22:47 +0900 Subject: [PATCH 3/4] fix --- .github/workflows/phpstan.yaml | 4 ++-- .github/workflows/test.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/phpstan.yaml b/.github/workflows/phpstan.yaml index 3779837..070d8f5 100644 --- 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 index 8944096..2972fdf 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -90,7 +90,7 @@ jobs: 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: | From 2191f26f4f7c8df98c3489dd4b23234b83382eb6 Mon Sep 17 00:00:00 2001 From: kurozumi Date: Fri, 25 Nov 2022 16:27:49 +0900 Subject: [PATCH 4/4] fix --- Tests/Web/ShoppingControllerTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/Web/ShoppingControllerTest.php b/Tests/Web/ShoppingControllerTest.php index 8520623..75ccc0a 100644 --- a/Tests/Web/ShoppingControllerTest.php +++ b/Tests/Web/ShoppingControllerTest.php @@ -138,7 +138,7 @@ public function testクレジットカード決済を選択したときにクレ ], ]); - self::assertContains('クレジットカード情報', $crawler->html()); + self::assertStringContainsString('クレジットカード情報', $crawler->html()); } /**