From 257081a75d25b1539cfa9367440d9cda078c56ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Tue, 6 Feb 2024 15:52:26 +0100 Subject: [PATCH 1/8] Replaced Mink fork with the original one. Removed Goutte driver --- behat_ibexa_oss.yaml | 1 - composer.json | 13 ++++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/behat_ibexa_oss.yaml b/behat_ibexa_oss.yaml index 3046b7ad..e69031ff 100644 --- a/behat_ibexa_oss.yaml +++ b/behat_ibexa_oss.yaml @@ -17,7 +17,6 @@ default: Behat\MinkExtension: files_path: '%paths.base%/vendor/ezsystems/ezplatform-admin-ui/src/lib/Behat/TestFiles/' base_url: '%env(string:WEB_HOST)%' - goutte: ~ javascript_session: 'selenium' sessions: selenium: diff --git a/composer.json b/composer.json index df5ab005..cba43948 100644 --- a/composer.json +++ b/composer.json @@ -12,32 +12,31 @@ "php": "^7.3 || ^8.0", "ext-json": "*", "behat/behat": "^3.11", - "behat/mink-goutte-driver": "^1.2", + "behat/mink-browserkit-driver": "^1.4", "behat/mink-selenium2-driver": "^1.4", + "behat/mink": "^1.8", "bex/behat-screenshot": "^2.1", "dmore/behat-chrome-extension": "^1.3", "dmore/chrome-mink-driver": "^2.7", "ezsystems/behat-screenshot-image-driver-cloudinary": "^1.1@dev", "ezsystems/ezplatform-http-cache": "^2.3@dev", "ezsystems/ezplatform-kernel": "^1.3@dev", - "friends-of-behat/mink": "^1.8", - "friends-of-behat/mink-browserkit-driver": "^1.4", + "fakerphp/faker": "^1.17", "friends-of-behat/mink-extension": "^2.4", "friends-of-behat/symfony-extension": "^2.1", - "fakerphp/faker": "^1.17", "guzzlehttp/psr7": "^1.6.1", "liuggio/fastest": "^1.7", "php-http/client-common": "^2.1", "phpunit/phpunit": "^8.5 || ^9.0 || ^10.0", + "psy/psysh": "^0.10.8", "symfony/config": "^5.0", "symfony/console": "^5.0", "symfony/dependency-injection": "^5.0", - "symfony/stopwatch": "^5.2", "symfony/http-kernel": "^5.0", "symfony/process": "^5.4", "symfony/property-access": "^5.0", - "symfony/yaml": "^5.0", - "psy/psysh": "^0.10.8" + "symfony/stopwatch": "^5.2", + "symfony/yaml": "^5.0" }, "require-dev": { "ibexa/ci-scripts": "^0.1@dev", From 9fe3290f875664354d9dec6acbb73353273f5cdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Tue, 6 Feb 2024 15:53:37 +0100 Subject: [PATCH 2/8] TMP --- dependencies.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 dependencies.json diff --git a/dependencies.json b/dependencies.json new file mode 100644 index 00000000..8cc5fdea --- /dev/null +++ b/dependencies.json @@ -0,0 +1,11 @@ +{ + "recipesEndpoint": "", + "packages": [ + { + "requirement": "dev-revert-conflict as 3.3.x-dev", + "repositoryUrl": "https://github.com/ibexa/oss", + "package": "ibexa/oss", + "shouldBeAddedAsVCS": false + } + ] +} From 0f3da6c698cbe37c0908f009b165fb285448e454 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Tue, 6 Feb 2024 15:58:57 +0100 Subject: [PATCH 3/8] Bumped browserkit-driver --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index cba43948..adaa5e92 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "php": "^7.3 || ^8.0", "ext-json": "*", "behat/behat": "^3.11", - "behat/mink-browserkit-driver": "^1.4", + "behat/mink-browserkit-driver": "^2.2", "behat/mink-selenium2-driver": "^1.4", "behat/mink": "^1.8", "bex/behat-screenshot": "^2.1", From 42d717536d1229bc952f67d3946cf7afa4c4b0fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Tue, 6 Feb 2024 16:03:32 +0100 Subject: [PATCH 4/8] Bumped Selenium --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index adaa5e92..4df15a98 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "ext-json": "*", "behat/behat": "^3.11", "behat/mink-browserkit-driver": "^2.2", - "behat/mink-selenium2-driver": "^1.4", + "behat/mink-selenium2-driver": "^1.7", "behat/mink": "^1.8", "bex/behat-screenshot": "^2.1", "dmore/behat-chrome-extension": "^1.3", From 577c867ca9fdd3d2dc9e591ccd86bbf574bc6499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Tue, 6 Feb 2024 18:58:27 +0100 Subject: [PATCH 5/8] Added browserkit driver --- behat_ibexa_oss.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/behat_ibexa_oss.yaml b/behat_ibexa_oss.yaml index e69031ff..e5e5dbf1 100644 --- a/behat_ibexa_oss.yaml +++ b/behat_ibexa_oss.yaml @@ -17,6 +17,7 @@ default: Behat\MinkExtension: files_path: '%paths.base%/vendor/ezsystems/ezplatform-admin-ui/src/lib/Behat/TestFiles/' base_url: '%env(string:WEB_HOST)%' + browserkit_http: ~ javascript_session: 'selenium' sessions: selenium: From 5af2907a2b440e547f10daeb1c28736ad9805bc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Tue, 6 Feb 2024 20:37:08 +0100 Subject: [PATCH 6/8] DEBUG --- src/lib/Browser/Context/BrowserContext.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/Browser/Context/BrowserContext.php b/src/lib/Browser/Context/BrowserContext.php index 30c71e23..56da80c1 100644 --- a/src/lib/Browser/Context/BrowserContext.php +++ b/src/lib/Browser/Context/BrowserContext.php @@ -65,6 +65,7 @@ private function getHeaderValue($responseHeaders, $header): string if ($this->getSession()->getDriver() instanceof ChromeDriver) { return $responseHeaders[$header]; } + var_dump($responseHeaders); return $responseHeaders[$header][0]; } From 2c9c66626e6041f48e0855f50ea4863c29f1f660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Tue, 6 Feb 2024 20:37:11 +0100 Subject: [PATCH 7/8] New config --- behat_ibexa_oss.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/behat_ibexa_oss.yaml b/behat_ibexa_oss.yaml index e5e5dbf1..346eab74 100644 --- a/behat_ibexa_oss.yaml +++ b/behat_ibexa_oss.yaml @@ -17,9 +17,11 @@ default: Behat\MinkExtension: files_path: '%paths.base%/vendor/ezsystems/ezplatform-admin-ui/src/lib/Behat/TestFiles/' base_url: '%env(string:WEB_HOST)%' - browserkit_http: ~ javascript_session: 'selenium' + default_session: browserkit sessions: + browserkit: + browserkit_http: ~ selenium: selenium2: browser: chrome From 33a1d999a8feca71d825473b62573ef3ed7a4221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Wed, 7 Feb 2024 08:55:08 +0100 Subject: [PATCH 8/8] Converted Headers to lowercase --- src/lib/Browser/Context/BrowserContext.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib/Browser/Context/BrowserContext.php b/src/lib/Browser/Context/BrowserContext.php index 56da80c1..85352879 100644 --- a/src/lib/Browser/Context/BrowserContext.php +++ b/src/lib/Browser/Context/BrowserContext.php @@ -65,8 +65,7 @@ private function getHeaderValue($responseHeaders, $header): string if ($this->getSession()->getDriver() instanceof ChromeDriver) { return $responseHeaders[$header]; } - var_dump($responseHeaders); - return $responseHeaders[$header][0]; + return $responseHeaders[strtolower($header)][0]; } }