From 29781a39794d962e1be851fa2b8e365fa063e575 Mon Sep 17 00:00:00 2001 From: Jan Goralski Date: Fri, 6 Dec 2024 09:09:28 +0100 Subject: [PATCH] [Maintenance][Behat] Enable not creating a driver session in api scenarios --- behat.yml.dist | 2 ++ .../Resources/config/suites/api/account/address_book.yml | 1 + .../Behat/Resources/config/suites/api/account/customer.yml | 1 + .../config/suites/api/account/customer_registration.yml | 1 + .../config/suites/api/account/email_verification.yml | 1 + .../Behat/Resources/config/suites/api/admin/dashboard.yaml | 3 ++- .../Resources/config/suites/api/cart/accessing_cart.yml | 1 + .../Behat/Resources/config/suites/api/cart/shopping_cart.yml | 1 + .../Behat/Resources/config/suites/api/channel/channels.yml | 1 + .../Behat/Resources/config/suites/api/checkout/checkout.yml | 1 + .../config/suites/api/checkout/paying_for_order.yml | 1 + .../config/suites/api/contact/requesting_contact.yml | 1 + .../Resources/config/suites/api/currency/currencies.yml | 1 + .../config/suites/api/currency/viewing_exchange_rates.yml | 1 + .../config/suites/api/homepage/viewing_products.yml | 1 + .../Resources/config/suites/api/inventory/cart_inventory.yml | 1 + .../config/suites/api/inventory/checkout_inventory.yaml | 1 + .../config/suites/api/inventory/managing_inventory.yaml | 1 + .../Behat/Resources/config/suites/api/locale/locales.yaml | 3 ++- .../suites/api/order/modifying_placed_order_address.yaml | 1 + .../Resources/config/suites/api/order/order_history.yaml | 1 + .../config/suites/api/payment/managing_payment_methods.yaml | 3 ++- .../config/suites/api/product/adding_product_review.yml | 1 + .../config/suites/api/product/viewing_product_reviews.yml | 1 + .../suites/api/promotion/applying_catalog_promotions.yml | 1 + .../suites/api/promotion/applying_promotion_coupon.yml | 1 + .../config/suites/api/promotion/applying_promotion_rules.yml | 1 + .../suites/api/promotion/managing_catalog_promotions.yml | 1 + .../config/suites/api/promotion/managing_promotions.yml | 1 + .../config/suites/api/promotion/receiving_discount.yml | 1 + .../suites/api/promotion/removing_catalog_promotions.yml | 1 + .../suites/api/shipping/applying_shipping_method_rules.yml | 1 + .../config/suites/api/shipping/viewing_shipping_methods.yml | 1 + .../Resources/config/suites/api/taxation/applying_taxes.yml | 1 + .../config/suites/api/taxation/managing_tax_rates.yml | 1 + .../Resources/config/suites/api/user/managing_users.yml | 1 + .../Tester/ApiScenarioEventDispatchingScenarioTester.php | 5 ++++- 37 files changed, 44 insertions(+), 4 deletions(-) diff --git a/behat.yml.dist b/behat.yml.dist index 6818a6b35b5..d21dbf41298 100644 --- a/behat.yml.dist +++ b/behat.yml.dist @@ -58,6 +58,8 @@ default: SyliusLabs\SuiteTagsExtension: ~ + Sylius\Bundle\ApiBundle\Behat\Extension\SyliusApiBundleExtension: ~ + gherkin: filters: tags: "~@todo&&~@cli" # CLI is excluded as it registers an error handler that mutes fatal errors diff --git a/src/Sylius/Behat/Resources/config/suites/api/account/address_book.yml b/src/Sylius/Behat/Resources/config/suites/api/account/address_book.yml index 07485bfbeb6..e3ba9c55053 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/account/address_book.yml +++ b/src/Sylius/Behat/Resources/config/suites/api/account/address_book.yml @@ -36,3 +36,4 @@ default: filters: tags: "@address_book&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/account/customer.yml b/src/Sylius/Behat/Resources/config/suites/api/account/customer.yml index cc93f728e5c..97b3de25a82 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/account/customer.yml +++ b/src/Sylius/Behat/Resources/config/suites/api/account/customer.yml @@ -46,3 +46,4 @@ default: filters: tags: "@customer_account&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/account/customer_registration.yml b/src/Sylius/Behat/Resources/config/suites/api/account/customer_registration.yml index acf8be5a17c..5001d14fecb 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/account/customer_registration.yml +++ b/src/Sylius/Behat/Resources/config/suites/api/account/customer_registration.yml @@ -24,3 +24,4 @@ default: filters: tags: "@customer_registration&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/account/email_verification.yml b/src/Sylius/Behat/Resources/config/suites/api/account/email_verification.yml index 61deae1856e..e75d4c7950c 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/account/email_verification.yml +++ b/src/Sylius/Behat/Resources/config/suites/api/account/email_verification.yml @@ -22,3 +22,4 @@ default: filters: tags: "@email_verification&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/admin/dashboard.yaml b/src/Sylius/Behat/Resources/config/suites/api/admin/dashboard.yaml index ed29a2372ae..d1f5d44c702 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/admin/dashboard.yaml +++ b/src/Sylius/Behat/Resources/config/suites/api/admin/dashboard.yaml @@ -7,7 +7,7 @@ default: contexts: - sylius.behat.context.hook.doctrine_orm - Sylius\Calendar\Tests\Behat\Context\Hook\CalendarContext - + - sylius.behat.context.transform.admin - sylius.behat.context.transform.shared_storage - sylius.behat.context.transform.user @@ -37,3 +37,4 @@ default: filters: tags: "@admin_dashboard&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/cart/accessing_cart.yml b/src/Sylius/Behat/Resources/config/suites/api/cart/accessing_cart.yml index 8203ebac17a..795f7da21dc 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/cart/accessing_cart.yml +++ b/src/Sylius/Behat/Resources/config/suites/api/cart/accessing_cart.yml @@ -31,3 +31,4 @@ default: filters: tags: "@accessing_cart&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/cart/shopping_cart.yml b/src/Sylius/Behat/Resources/config/suites/api/cart/shopping_cart.yml index 42175300e83..d876ebd0ce2 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/cart/shopping_cart.yml +++ b/src/Sylius/Behat/Resources/config/suites/api/cart/shopping_cart.yml @@ -31,3 +31,4 @@ default: filters: tags: "@shopping_cart&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/channel/channels.yml b/src/Sylius/Behat/Resources/config/suites/api/channel/channels.yml index c1aa92fa6bd..2773b10be2b 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/channel/channels.yml +++ b/src/Sylius/Behat/Resources/config/suites/api/channel/channels.yml @@ -17,3 +17,4 @@ default: filters: tags: "@channels&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/checkout/checkout.yml b/src/Sylius/Behat/Resources/config/suites/api/checkout/checkout.yml index 81142101109..536f4a372a2 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/checkout/checkout.yml +++ b/src/Sylius/Behat/Resources/config/suites/api/checkout/checkout.yml @@ -59,3 +59,4 @@ default: filters: tags: "@checkout&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/checkout/paying_for_order.yml b/src/Sylius/Behat/Resources/config/suites/api/checkout/paying_for_order.yml index 7918de3352e..35f07b9c8a0 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/checkout/paying_for_order.yml +++ b/src/Sylius/Behat/Resources/config/suites/api/checkout/paying_for_order.yml @@ -44,3 +44,4 @@ default: filters: tags: "@paying_for_order&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/contact/requesting_contact.yml b/src/Sylius/Behat/Resources/config/suites/api/contact/requesting_contact.yml index ef7d15d952c..924c93d0442 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/contact/requesting_contact.yml +++ b/src/Sylius/Behat/Resources/config/suites/api/contact/requesting_contact.yml @@ -19,3 +19,4 @@ default: filters: tags: "@requesting_contact&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/currency/currencies.yml b/src/Sylius/Behat/Resources/config/suites/api/currency/currencies.yml index 4a4c70d2117..9a19c25e9b8 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/currency/currencies.yml +++ b/src/Sylius/Behat/Resources/config/suites/api/currency/currencies.yml @@ -20,3 +20,4 @@ default: filters: tags: "@currencies&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/currency/viewing_exchange_rates.yml b/src/Sylius/Behat/Resources/config/suites/api/currency/viewing_exchange_rates.yml index f871cc2a55a..451223d991e 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/currency/viewing_exchange_rates.yml +++ b/src/Sylius/Behat/Resources/config/suites/api/currency/viewing_exchange_rates.yml @@ -22,3 +22,4 @@ default: filters: tags: "@viewing_exchange_rates&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/homepage/viewing_products.yml b/src/Sylius/Behat/Resources/config/suites/api/homepage/viewing_products.yml index 23e4ee6eaeb..349a7ea311e 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/homepage/viewing_products.yml +++ b/src/Sylius/Behat/Resources/config/suites/api/homepage/viewing_products.yml @@ -20,3 +20,4 @@ default: filters: tags: "@homepage&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/inventory/cart_inventory.yml b/src/Sylius/Behat/Resources/config/suites/api/inventory/cart_inventory.yml index 21f03200648..7143b54b988 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/inventory/cart_inventory.yml +++ b/src/Sylius/Behat/Resources/config/suites/api/inventory/cart_inventory.yml @@ -21,3 +21,4 @@ default: filters: tags: "@cart_inventory&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/inventory/checkout_inventory.yaml b/src/Sylius/Behat/Resources/config/suites/api/inventory/checkout_inventory.yaml index 98c3f94a458..86b61d90124 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/inventory/checkout_inventory.yaml +++ b/src/Sylius/Behat/Resources/config/suites/api/inventory/checkout_inventory.yaml @@ -32,3 +32,4 @@ default: filters: tags: "@checkout_inventory&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/inventory/managing_inventory.yaml b/src/Sylius/Behat/Resources/config/suites/api/inventory/managing_inventory.yaml index 32b0066ab91..22f276c1f9b 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/inventory/managing_inventory.yaml +++ b/src/Sylius/Behat/Resources/config/suites/api/inventory/managing_inventory.yaml @@ -33,3 +33,4 @@ default: filters: tags: "@managing_inventory&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/locale/locales.yaml b/src/Sylius/Behat/Resources/config/suites/api/locale/locales.yaml index 50744f54fe6..5cb93e4130b 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/locale/locales.yaml +++ b/src/Sylius/Behat/Resources/config/suites/api/locale/locales.yaml @@ -20,6 +20,7 @@ default: - sylius.behat.context.api.shop.channel - sylius.behat.context.api.shop.locale - sylius.behat.context.api.shop.product - + filters: tags: "@locales&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/order/modifying_placed_order_address.yaml b/src/Sylius/Behat/Resources/config/suites/api/order/modifying_placed_order_address.yaml index 2f1f158a6d1..6f1406b60ca 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/order/modifying_placed_order_address.yaml +++ b/src/Sylius/Behat/Resources/config/suites/api/order/modifying_placed_order_address.yaml @@ -42,3 +42,4 @@ default: filters: tags: "@modifying_placed_order_address&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/order/order_history.yaml b/src/Sylius/Behat/Resources/config/suites/api/order/order_history.yaml index 556369a06ed..ac50a3f3a52 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/order/order_history.yaml +++ b/src/Sylius/Behat/Resources/config/suites/api/order/order_history.yaml @@ -35,3 +35,4 @@ default: filters: tags: "@order_history&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/payment/managing_payment_methods.yaml b/src/Sylius/Behat/Resources/config/suites/api/payment/managing_payment_methods.yaml index 478ec30db0f..457cc9e3109 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/payment/managing_payment_methods.yaml +++ b/src/Sylius/Behat/Resources/config/suites/api/payment/managing_payment_methods.yaml @@ -26,7 +26,7 @@ default: - sylius.behat.context.transform.product - sylius.behat.context.transform.shipping_method - sylius.behat.context.transform.shared_storage - + - sylius.behat.context.api.admin.save - sylius.behat.context.api.admin.response - Sylius\Behat\Context\Api\Admin\ManagingPaymentMethodsContext @@ -34,3 +34,4 @@ default: filters: tags: "@managing_payment_methods&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/product/adding_product_review.yml b/src/Sylius/Behat/Resources/config/suites/api/product/adding_product_review.yml index 2214d228072..a62217ee99c 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/product/adding_product_review.yml +++ b/src/Sylius/Behat/Resources/config/suites/api/product/adding_product_review.yml @@ -25,3 +25,4 @@ default: filters: tags: "@adding_product_review&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/product/viewing_product_reviews.yml b/src/Sylius/Behat/Resources/config/suites/api/product/viewing_product_reviews.yml index 98337a7ab11..9db82e5e016 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/product/viewing_product_reviews.yml +++ b/src/Sylius/Behat/Resources/config/suites/api/product/viewing_product_reviews.yml @@ -23,3 +23,4 @@ default: filters: tags: "@viewing_product_reviews&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/promotion/applying_catalog_promotions.yml b/src/Sylius/Behat/Resources/config/suites/api/promotion/applying_catalog_promotions.yml index eedb5128b80..e26aa491b02 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/promotion/applying_catalog_promotions.yml +++ b/src/Sylius/Behat/Resources/config/suites/api/promotion/applying_catalog_promotions.yml @@ -35,3 +35,4 @@ default: filters: tags: "@applying_catalog_promotions&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/promotion/applying_promotion_coupon.yml b/src/Sylius/Behat/Resources/config/suites/api/promotion/applying_promotion_coupon.yml index 1231b112c1d..aafd4421600 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/promotion/applying_promotion_coupon.yml +++ b/src/Sylius/Behat/Resources/config/suites/api/promotion/applying_promotion_coupon.yml @@ -37,3 +37,4 @@ default: filters: tags: "@applying_promotion_coupon&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/promotion/applying_promotion_rules.yml b/src/Sylius/Behat/Resources/config/suites/api/promotion/applying_promotion_rules.yml index 071b5614a3d..5e44aacdd63 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/promotion/applying_promotion_rules.yml +++ b/src/Sylius/Behat/Resources/config/suites/api/promotion/applying_promotion_rules.yml @@ -38,3 +38,4 @@ default: - sylius.behat.context.api.shop.checkout filters: tags: "@applying_promotion_rules&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/promotion/managing_catalog_promotions.yml b/src/Sylius/Behat/Resources/config/suites/api/promotion/managing_catalog_promotions.yml index 2862031fabc..6820df37ea4 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/promotion/managing_catalog_promotions.yml +++ b/src/Sylius/Behat/Resources/config/suites/api/promotion/managing_catalog_promotions.yml @@ -33,3 +33,4 @@ default: filters: tags: "@managing_catalog_promotions&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/promotion/managing_promotions.yml b/src/Sylius/Behat/Resources/config/suites/api/promotion/managing_promotions.yml index 3d15c301857..d822232536a 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/promotion/managing_promotions.yml +++ b/src/Sylius/Behat/Resources/config/suites/api/promotion/managing_promotions.yml @@ -42,3 +42,4 @@ default: filters: tags: "@managing_promotions&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/promotion/receiving_discount.yml b/src/Sylius/Behat/Resources/config/suites/api/promotion/receiving_discount.yml index f495e12771d..ee4d8c51052 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/promotion/receiving_discount.yml +++ b/src/Sylius/Behat/Resources/config/suites/api/promotion/receiving_discount.yml @@ -38,3 +38,4 @@ default: filters: tags: "@receiving_discount&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/promotion/removing_catalog_promotions.yml b/src/Sylius/Behat/Resources/config/suites/api/promotion/removing_catalog_promotions.yml index a6ea05f54f0..7db9d0a2710 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/promotion/removing_catalog_promotions.yml +++ b/src/Sylius/Behat/Resources/config/suites/api/promotion/removing_catalog_promotions.yml @@ -30,3 +30,4 @@ default: filters: tags: "@removing_catalog_promotions&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/shipping/applying_shipping_method_rules.yml b/src/Sylius/Behat/Resources/config/suites/api/shipping/applying_shipping_method_rules.yml index 9d813800bbd..912808ae179 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/shipping/applying_shipping_method_rules.yml +++ b/src/Sylius/Behat/Resources/config/suites/api/shipping/applying_shipping_method_rules.yml @@ -37,3 +37,4 @@ default: filters: tags: "@applying_shipping_method_rules&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/shipping/viewing_shipping_methods.yml b/src/Sylius/Behat/Resources/config/suites/api/shipping/viewing_shipping_methods.yml index 5d4f6e6c37f..36254127354 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/shipping/viewing_shipping_methods.yml +++ b/src/Sylius/Behat/Resources/config/suites/api/shipping/viewing_shipping_methods.yml @@ -36,3 +36,4 @@ default: filters: tags: "@viewing_shipping_methods&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/taxation/applying_taxes.yml b/src/Sylius/Behat/Resources/config/suites/api/taxation/applying_taxes.yml index fd93531cec9..af3f067da5f 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/taxation/applying_taxes.yml +++ b/src/Sylius/Behat/Resources/config/suites/api/taxation/applying_taxes.yml @@ -39,3 +39,4 @@ default: filters: tags: "@applying_taxes&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/taxation/managing_tax_rates.yml b/src/Sylius/Behat/Resources/config/suites/api/taxation/managing_tax_rates.yml index cbf4f29d03f..16ab1c3628f 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/taxation/managing_tax_rates.yml +++ b/src/Sylius/Behat/Resources/config/suites/api/taxation/managing_tax_rates.yml @@ -23,3 +23,4 @@ default: filters: tags: "@managing_tax_rates&&@api" + javascript: false diff --git a/src/Sylius/Behat/Resources/config/suites/api/user/managing_users.yml b/src/Sylius/Behat/Resources/config/suites/api/user/managing_users.yml index 913ff7c923e..ab9289e7d9e 100644 --- a/src/Sylius/Behat/Resources/config/suites/api/user/managing_users.yml +++ b/src/Sylius/Behat/Resources/config/suites/api/user/managing_users.yml @@ -23,3 +23,4 @@ default: filters: tags: "@managing_users&&@api" + javascript: false diff --git a/src/Sylius/Bundle/ApiBundle/Behat/Tester/ApiScenarioEventDispatchingScenarioTester.php b/src/Sylius/Bundle/ApiBundle/Behat/Tester/ApiScenarioEventDispatchingScenarioTester.php index 36a1fae5cdd..6c994d6a732 100644 --- a/src/Sylius/Bundle/ApiBundle/Behat/Tester/ApiScenarioEventDispatchingScenarioTester.php +++ b/src/Sylius/Bundle/ApiBundle/Behat/Tester/ApiScenarioEventDispatchingScenarioTester.php @@ -40,7 +40,10 @@ public function setUp(Environment $env, FeatureNode $feature, Scenario $scenario } $tags = $scenario->getTags(); - if (($key = array_search('javascript', $tags)) !== false) { + if ( + ($key = array_search('javascript', $tags)) !== false || + ($key = array_search('mink:chromedriver', $tags)) !== false + ) { unset($tags[$key]); }