Merge branch '1.13' into 2.0

* 1.13: [Maintenance] Use chromedrive in behat tests [Maintenance][AbstractStateMachine] Add Sylius logo to readme
Sylius · Apr 25, 2024 · b7f67cb · b7f67cb
2 parents d3ec448 + da86bdb
commit b7f67cb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/features/admin/order/managing_orders/order_filtration/filtering_orders_by_variants.feature b/features/admin/order/managing_orders/order_filtration/filtering_orders_by_variants.feature
@@ -34,7 +34,7 @@ Feature: Filtering orders by variants
         And I should see an order with "#0000002" number
         And I should see an order with "#0000003" number
 
-    @ui @api @javascript
+    @ui @api @mink:chromedriver
     Scenario: Filtering orders by multiple variants of the same product
         When I browse orders
         And I filter by variants "Nebula Top" and "Neutron Sleeveless"

diff --git a/features/admin/taxonomy/managing_taxons/reordering_taxon.feature b/features/admin/taxonomy/managing_taxons/reordering_taxon.feature
@@ -24,14 +24,14 @@ Feature: Reordering taxons
         And I should see the taxon named "Watches" in the list
         But the first taxon on the list should be "Watches"
 
-    @ui @javascript @no-api
+    @ui @mink:chromedriver @no-api
     Scenario: Moving up the first taxon on list
         When I want to see all taxons in store
         And I move up "T-Shirts" taxon
         Then I should see 4 taxons on the list
         And the first taxon on the list should be "T-Shirts"
 
-    @ui @javascript @no-api
+    @ui @mink:chromedriver @no-api
     Scenario: Moving down the last taxon on list
         When I want to see all taxons in store
         And I move down "Wallets" taxon

diff --git a/src/Sylius/Abstraction/StateMachine/README.md b/src/Sylius/Abstraction/StateMachine/README.md
@@ -7,7 +7,15 @@ should be used (Winzou State Machine or Symfony Workflow) per graph.
 Sylius
 ------
 
-![Sylius](https://demo.sylius.com/assets/shop/img/logo.png)
+<p align="center">
+    <a href="https://sylius.com" target="_blank">
+        <picture>
+          <source media="(prefers-color-scheme: dark)" srcset="https://media.sylius.com/sylius-logo-800-dark.png">
+          <source media="(prefers-color-scheme: light)" srcset="https://media.sylius.com/sylius-logo-800.png">
+          <img alt="Sylius Logo." src="https://media.sylius.com/sylius-logo-800.png">
+        </picture>
+    </a>
+</p>
 
 Sylius is an Open Source eCommerce solution built from decoupled components with powerful API and the highest quality code. [Read more on sylius.com](https://sylius.com).