From 11fcbefff879c2bf35e534ad730c5119720b5233 Mon Sep 17 00:00:00 2001 From: Alexandre Dias Date: Mon, 5 Aug 2024 21:38:13 +0100 Subject: [PATCH] Add BROWSER_NAME_ALIAS_MAP and revert some changes. --- .github/workflows/ci.yml | 5 +---- composer.json | 2 +- docker-compose.yml | 4 +++- src/WebdriverClassicDriver.php | 1 + 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d5fb502..363b3bf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,7 +40,7 @@ jobs: strategy: matrix: php: [ '7.4', '8.0', '8.1', '8.2' ] - browser: [ 'firefox', 'chrome'] + browser: [ 'firefox', 'chrome' ] selenium: [ '2.53.1', '3', '4' ] include: - php: '7.4' @@ -82,9 +82,6 @@ jobs: WEB_FIXTURES_BROWSER: ${{ matrix.browser }} DRIVER_MACHINE_BASE_PATH: /fixtures/ run: | - if [ "${{ matrix.browser }}" = "chromium" ]; then - WEB_FIXTURES_BROWSER="chrome" - fi vendor/bin/phpunit -v --coverage-clover=coverage.xml --colors=always --testdox - name: Upload coverage diff --git a/composer.json b/composer.json index 488cef7..e8f1a03 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "php": ">=7.4", "ext-json": "*", "behat/mink": "^1.11@dev", - "php-webdriver/webdriver": "dev-main" + "php-webdriver/webdriver": "^1.14" }, "require-dev": { "mink/driver-testsuite": "dev-master", diff --git a/docker-compose.yml b/docker-compose.yml index 783e85a..809f14a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,8 @@ +version: "3" + services: selenium: - image: ${SELENIUM_IMAGE:-selenium/standalone-chromium:4} + image: ${SELENIUM_IMAGE:-selenium/standalone-chrome:4} hostname: selenium shm_size: 4g environment: diff --git a/src/WebdriverClassicDriver.php b/src/WebdriverClassicDriver.php index 07c8438..00ac956 100644 --- a/src/WebdriverClassicDriver.php +++ b/src/WebdriverClassicDriver.php @@ -63,6 +63,7 @@ class WebdriverClassicDriver extends CoreDriver private const BROWSER_NAME_ALIAS_MAP = [ 'edge' => WebDriverBrowserType::MICROSOFT_EDGE, 'chrome' => WebDriverBrowserType::CHROME, + 'chromium' => WebDriverBrowserType::CHROME, 'firefox' => WebDriverBrowserType::FIREFOX, ];