Merge pull request #6291 from nanasess/fix-codeception

ChromeDriver 128 よりポート番号が変更になったため、明示的に指定する
EC-CUBE · Oct 9, 2024 · 16f7157 · 16f7157
2 parents 8dfeee5 + fb7569f
commit 16f7157
Show file tree

Hide file tree

Showing 10 changed files with 182 additions and 219 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -156,14 +156,11 @@ jobs:
 
       - name: setup-chromedriver
         uses: nanasess/setup-chromedriver@master
-        with:
-          # ChromeDriverのバージョンを指定
-          chromedriver-version: '127.0.6533.119'  # 特定のバージョンを指定
 
       - name: Run chromedriver
         run: |
           export DISPLAY=:99
-          chromedriver --url-base=/wd/hub &
+          chromedriver --url-base=/wd/hub --port=9515 &
           echo ">>> Started chrome-driver"
           sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
           echo ">>> Started xvfb"

diff --git a/.github/workflows/deny-test.yml b/.github/workflows/deny-test.yml
@@ -97,14 +97,11 @@ jobs:
 
       - name: setup-chromedriver
         uses: nanasess/setup-chromedriver@master
-        with:
-          # ChromeDriverのバージョンを指定
-          chromedriver-version: '127.0.6533.119'  # 特定のバージョンを指定
 
       - name: Prepare test
         run: |
           export DISPLAY=:99
-          chromedriver --url-base=/wd/hub &
+          chromedriver --url-base=/wd/hub --port=9515 &
           echo ">>> Started chrome-driver"
           sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
           echo ">>> Started xvfb"

diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml
@@ -100,14 +100,11 @@ jobs:
 
       - name: setup-chromedriver
         uses: nanasess/setup-chromedriver@master
-        with:
-          # ChromeDriverのバージョンを指定
-          chromedriver-version: '127.0.6533.119'  # 特定のバージョンを指定
 
       - name: Run chromedriver
         run: |
           export DISPLAY=:99
-          chromedriver --url-base=/wd/hub &
+          chromedriver --url-base=/wd/hub --port=9515 &
           echo ">>> Started chrome-driver"
           sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
           echo ">>> Started xvfb"

diff --git a/.github/workflows/e2e-test-throttling.yml b/.github/workflows/e2e-test-throttling.yml
@@ -111,17 +111,14 @@ jobs:
 
       - name: setup-chromedriver
         uses: nanasess/setup-chromedriver@master
-        with:
-          # ChromeDriverのバージョンを指定
-          chromedriver-version: '127.0.6533.119'  # 特定のバージョンを指定
 
       - name: Install fonts
         run: sudo apt install fonts-ipafont fonts-ipaexfont
 
       - name: Run chromedriver
         run: |
           export DISPLAY=:99
-          chromedriver --url-base=/wd/hub &
+          chromedriver --url-base=/wd/hub --port=9515 &
           echo ">>> Started chrome-driver"
           sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
           echo ">>> Started xvfb"

diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -86,17 +86,14 @@ jobs:
 
       - name: setup-chromedriver
         uses: nanasess/setup-chromedriver@master
-        with:
-          # ChromeDriverのバージョンを指定
-          chromedriver-version: '127.0.6533.119'  # 特定のバージョンを指定
 
       - name: Install fonts
         run: sudo apt install fonts-ipafont fonts-ipaexfont
 
       - name: Run chromedriver
         run: |
           export DISPLAY=:99
-          chromedriver --url-base=/wd/hub &
+          chromedriver --url-base=/wd/hub --port=9515 &
           echo ">>> Started chrome-driver"
           sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
           echo ">>> Started xvfb"

diff --git a/.github/workflows/plugin-test.yml b/.github/workflows/plugin-test.yml
@@ -102,14 +102,11 @@ jobs:
 
       - name: setup-chromedriver
         uses: nanasess/setup-chromedriver@master
-        with:
-          # ChromeDriverのバージョンを指定
-          chromedriver-version: '127.0.6533.119'  # 特定のバージョンを指定
 
       - name: Run chromedriver
         run: |
           export DISPLAY=:99
-          chromedriver --url-base=/wd/hub &
+          chromedriver --url-base=/wd/hub --port=9515 &
           echo ">>> Started chrome-driver"
           sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
           echo ">>> Started xvfb"
@@ -254,14 +251,11 @@ jobs:
 
       - name: setup-chromedriver
         uses: nanasess/setup-chromedriver@master
-        with:
-          # ChromeDriverのバージョンを指定
-          chromedriver-version: '127.0.6533.119'  # 特定のバージョンを指定
 
       - name: Run chromedriver
         run: |
           export DISPLAY=:99
-          chromedriver --url-base=/wd/hub &
+          chromedriver --url-base=/wd/hub --port=9515 &
           echo ">>> Started chrome-driver"
           sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
           echo ">>> Started xvfb"
@@ -406,14 +400,11 @@ jobs:
 
       - name: setup-chromedriver
         uses: nanasess/setup-chromedriver@master
-        with:
-          # ChromeDriverのバージョンを指定
-          chromedriver-version: '127.0.6533.119'  # 特定のバージョンを指定
 
       - name: Run chromedriver
         run: |
           export DISPLAY=:99
-          chromedriver --url-base=/wd/hub &
+          chromedriver --url-base=/wd/hub --port=9515 &
           echo ">>> Started chrome-driver"
           sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
           echo ">>> Started xvfb"
@@ -561,14 +552,11 @@ jobs:
 
       - name: setup-chromedriver
         uses: nanasess/setup-chromedriver@master
-        with:
-          # ChromeDriverのバージョンを指定
-          chromedriver-version: '127.0.6533.119'  # 特定のバージョンを指定
 
       - name: Run chromedriver
         run: |
           export DISPLAY=:99
-          chromedriver --url-base=/wd/hub &
+          chromedriver --url-base=/wd/hub --port=9515 &
           echo ">>> Started chrome-driver"
           sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
           echo ">>> Started xvfb"

diff --git a/.github/workflows/vaddy-1.yml b/.github/workflows/vaddy-1.yml
@@ -45,9 +45,6 @@ jobs:
 
       - name: setup-chromedriver
         uses: nanasess/setup-chromedriver@master
-        with:
-          # ChromeDriverのバージョンを指定
-          chromedriver-version: '127.0.6533.119'  # 特定のバージョンを指定
 
       - name: "VAddy: install"
         working-directory: /tmp
@@ -134,7 +131,7 @@ jobs:
         run: |
           echo "APP_ENV=codeception" > .env
           export DISPLAY=:99
-          chromedriver --url-base=/wd/hub &
+          chromedriver --url-base=/wd/hub --port=9515 &
           echo ">>> Started chrome-driver"
           sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
           echo ">>> Started xvfb"

diff --git a/.github/workflows/vaddy-2.yml b/.github/workflows/vaddy-2.yml
@@ -46,9 +46,6 @@ jobs:
 
       - name: setup-chromedriver
         uses: nanasess/setup-chromedriver@master
-        with:
-          # ChromeDriverのバージョンを指定
-          chromedriver-version: '127.0.6533.119'  # 特定のバージョンを指定
 
       - name: "VAddy: install"
         working-directory: /tmp
@@ -135,7 +132,7 @@ jobs:
         run: |
           echo "APP_ENV=codeception" > .env
           export DISPLAY=:99
-          chromedriver --url-base=/wd/hub &
+          chromedriver --url-base=/wd/hub --port=9515 &
           echo ">>> Started chrome-driver"
           sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
           echo ">>> Started xvfb"

diff --git a/.github/workflows/vaddy/prepare/action.yml b/.github/workflows/vaddy/prepare/action.yml
@@ -31,10 +31,6 @@ runs:
 
     - name: setup-chromedriver
       uses: nanasess/setup-chromedriver@master
-      with:
-        # ChromeDriverのバージョンを指定
-        chromedriver-version: '127.0.6533.119'  # 特定のバージョンを指定
-
 
     - name: Install fonts
       shell: bash
@@ -142,7 +138,7 @@ runs:
       run: |
         echo "APP_ENV=codeception" > .env
         export DISPLAY=:99
-        chromedriver --url-base=/wd/hub &
+        chromedriver --url-base=/wd/hub --port=9515 &
         echo ">>> Started chrome-driver"
         sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
         echo ">>> Started xvfb"