diff --git a/CONFLICTS.md b/CONFLICTS.md deleted file mode 100644 index 06d5f13a..00000000 --- a/CONFLICTS.md +++ /dev/null @@ -1,10 +0,0 @@ -# CONFLICTS - -This document explains why certain conflicts were added to `composer.json` and -references related issues. - -- `behat/mink-selenium2-driver:>=1.7.0`: - - This version adds strict type to the `Behat\Mink\Driver\Selenium2Driver::visit($url)` method - which causes a fatal error because the method signature is no longer compatible with the parent class: - `PHP Fatal error: Declaration of Behat\Mink\Driver\Selenium2Driver::visit(string $url) must be compatible with Behat\Mink\Driver\CoreDriver::visit($url) in /home/runner/work/Sylius-Standard/Sylius-Standard/vendor/behat/mink-selenium2-driver/src/Selenium2Driver.php on line 401` diff --git a/behat.yml.dist b/behat.yml.dist index c547e2e5..fc5f0112 100644 --- a/behat.yml.dist +++ b/behat.yml.dist @@ -15,32 +15,14 @@ default: files_path: "%paths.base%/vendor/sylius/sylius/src/Sylius/Behat/Resources/fixtures/" base_url: "http://localhost:8080/" default_session: symfony - javascript_session: chrome_headless + javascript_session: chrome sessions: symfony: symfony: ~ - chrome_headless: + chrome: chrome: api_url: http://127.0.0.1:9222 validate_certificate: false - chrome: - selenium2: - browser: chrome - capabilities: - browserName: chrome - browser: chrome - version: "" - marionette: null # https://github.com/Behat/MinkExtension/pull/311 - chrome: - switches: - - "start-fullscreen" - - "start-maximized" - - "no-sandbox" - extra_capabilities: - unexpectedAlertBehaviour: accept - firefox: - selenium2: - browser: firefox show_auto: false FriendsOfBehat\SymfonyExtension: diff --git a/composer.json b/composer.json index a205cae4..8cffb8af 100644 --- a/composer.json +++ b/composer.json @@ -18,9 +18,8 @@ }, "require-dev": { "behat/behat": "^3.6.1", - "behat/mink-selenium2-driver": "^1.4", - "dmore/behat-chrome-extension": "^1.3", - "dmore/chrome-mink-driver": "^2.7", + "dmore/behat-chrome-extension": "^1.4", + "dmore/chrome-mink-driver": "^2.9", "friends-of-behat/mink": "^1.8", "friends-of-behat/mink-browserkit-driver": "^1.4", "friends-of-behat/mink-debug-extension": "^2.0", @@ -56,9 +55,6 @@ "autoload-dev": { "classmap": ["tests/Application/Kernel.php"] }, - "conflict": { - "behat/mink-selenium2-driver": ">=1.7.0" - }, "config": { "sort-packages": true, "allow-plugins": {