diff --git a/behat.yml.dist b/behat.yml.dist index 73791fab6b..79072c0167 100644 --- a/behat.yml.dist +++ b/behat.yml.dist @@ -115,6 +115,7 @@ default: contexts: - Behat\MinkExtension\Context\MinkContext - Sylius\Bundle\CoreBundle\Behat\OAuthContext + - Sylius\Bundle\MoneyBundle\Behat\MoneyContext - Sylius\Bundle\WebBundle\Behat\WebContext filters: tags: @oauth diff --git a/features/backend/countries.feature b/features/backend/countries.feature index 15402fb7c9..554cb4964a 100644 --- a/features/backend/countries.feature +++ b/features/backend/countries.feature @@ -5,8 +5,8 @@ Feature: Countries and provinces I want to be able to manage countries and their provinces Background: - Given I am logged in as administrator - And there is default currency configured + Given there is default currency configured + And I am logged in as administrator And there are following countries: | name | provinces | | France | Lyon, Toulouse, Rennes, Nancy | diff --git a/features/backend/dashboard.feature b/features/backend/dashboard.feature index f0fd32225e..6caa09ea84 100644 --- a/features/backend/dashboard.feature +++ b/features/backend/dashboard.feature @@ -5,8 +5,8 @@ Feature: Store dashboard I need to be able to see sales info in backend dashboard Background: - Given I am logged in as administrator - And there is default currency configured + Given there is default currency configured + And I am logged in as administrator And the following zones are defined: | name | type | members | | German lands | country | Germany, Austria, Switzerland | diff --git a/features/backend/general_settings.feature b/features/backend/general_settings.feature index ad234dc8e2..ced7cbc177 100644 --- a/features/backend/general_settings.feature +++ b/features/backend/general_settings.feature @@ -5,8 +5,8 @@ Feature: General settings I want to be able to edit general configuration Background: - Given I am logged in as administrator - And there is default currency configured + Given there is default currency configured + And I am logged in as administrator Scenario: Accessing the settings form Given I am on the dashboard page diff --git a/features/backend/groups.feature b/features/backend/groups.feature index e8f3f3d40c..437a14c0f4 100644 --- a/features/backend/groups.feature +++ b/features/backend/groups.feature @@ -5,8 +5,8 @@ Feature: User groups management I want to be able to group them Background: - Given I am logged in as administrator - And there is default currency configured + Given there is default currency configured + And I am logged in as administrator And the following zones are defined: | name | type | members | | German lands | country | Germany, Austria, Switzerland | diff --git a/features/backend/inventory.feature b/features/backend/inventory.feature index d5b84fd466..d2504a914f 100644 --- a/features/backend/inventory.feature +++ b/features/backend/inventory.feature @@ -5,8 +5,8 @@ Feature: Inventory tracking I want to be able to manage stock levels and availability Background: - Given I am logged in as administrator - And there is default currency configured + Given there is default currency configured + And I am logged in as administrator And there are following options: | name | presentation | values | | T-Shirt color | Color | Red, Blue, Green | diff --git a/features/backend/orders.feature b/features/backend/orders.feature index a92ff805dd..6069566043 100644 --- a/features/backend/orders.feature +++ b/features/backend/orders.feature @@ -5,8 +5,8 @@ Feature: Orders management I want to be able to list, view, edit and create orders Background: - Given I am logged in as administrator - And there is default currency configured + Given there is default currency configured + And I am logged in as administrator And the following zones are defined: | name | type | members | | German lands | country | Germany, Austria, Switzerland | diff --git a/features/backend/payment_methods.feature b/features/backend/payment_methods.feature index a24972302b..4f7e2d579e 100644 --- a/features/backend/payment_methods.feature +++ b/features/backend/payment_methods.feature @@ -5,8 +5,8 @@ Feature: Payment methods I want to be able to manage payment methods Background: - Given I am logged in as administrator - And there is default currency configured + Given there is default currency configured + And I am logged in as administrator And the following payment methods exist: | name | gateway | | Credit Card | stripe | diff --git a/features/backend/product_attributes.feature b/features/backend/product_attributes.feature index d13abd1f78..99c41e5580 100644 --- a/features/backend/product_attributes.feature +++ b/features/backend/product_attributes.feature @@ -5,8 +5,8 @@ Feature: Product attributes I want to be able to configure product attributes Background: - Given I am logged in as administrator - And there is default currency configured + Given there is default currency configured + And I am logged in as administrator And there are following attributes: | name | presentation | | T-Shirt collection | Collection | diff --git a/features/backend/product_options.feature b/features/backend/product_options.feature index a0b7c80ce2..e311da2ded 100644 --- a/features/backend/product_options.feature +++ b/features/backend/product_options.feature @@ -5,8 +5,8 @@ Feature: Product options I want to be able to manage options Background: - Given I am logged in as administrator - And there is default currency configured + Given there is default currency configured + And I am logged in as administrator And there are following options: | name | presentation | values | | T-Shirt color | Color | Red, Blue, Green | diff --git a/features/backend/product_prototypes.feature b/features/backend/product_prototypes.feature index 2eb70b0b17..d139e001e9 100644 --- a/features/backend/product_prototypes.feature +++ b/features/backend/product_prototypes.feature @@ -5,8 +5,8 @@ Feature: Product prototypes I want to be able to create prototypes Background: - Given I am logged in as administrator - And there is default currency configured + Given there is default currency configured + And I am logged in as administrator And there are following options: | name | presentation | values | | T-Shirt color | Color | Red, Blue, Green | diff --git a/features/backend/product_taxonomies.feature b/features/backend/product_taxonomies.feature index 05ab701478..faf4611e7c 100644 --- a/features/backend/product_taxonomies.feature +++ b/features/backend/product_taxonomies.feature @@ -5,8 +5,8 @@ Feature: Browsing products by taxonomies I want to be able to view them by category Background: - Given I am logged in as administrator - And there is default currency configured + Given there is default currency configured + And I am logged in as administrator And there are following taxonomies defined: | name | | Category | diff --git a/features/backend/product_variants.feature b/features/backend/product_variants.feature index 53418d7375..b6bef80892 100644 --- a/features/backend/product_variants.feature +++ b/features/backend/product_variants.feature @@ -5,8 +5,8 @@ Feature: Product variants I want to be able to manage product variants Background: - Given I am logged in as administrator - And there is default currency configured + Given there is default currency configured + And I am logged in as administrator And there are following options: | name | presentation | values | | T-Shirt color | Color | Red, Blue, Green | diff --git a/features/backend/products.feature b/features/backend/products.feature index b521fca4f0..52b78accfc 100644 --- a/features/backend/products.feature +++ b/features/backend/products.feature @@ -5,8 +5,8 @@ Feature: Products I want to be able to manage products Background: - Given I am logged in as administrator - And there is default currency configured + Given there is default currency configured + And I am logged in as administrator And there are following options: | name | presentation | values | | T-Shirt color | Color | Red, Blue, Green | diff --git a/features/backend/products_filter.feature b/features/backend/products_filter.feature index ee09a4aeed..4d0cfd1142 100644 --- a/features/backend/products_filter.feature +++ b/features/backend/products_filter.feature @@ -5,8 +5,8 @@ Feature: Products filter I want to be able to filter list by name Background: - Given I am logged in as administrator - And there is default currency configured + Given there is default currency configured + And I am logged in as administrator And the following products exist: | name | price | sku | | Super T-Shirt | 19.99 | 123 | diff --git a/features/backend/promotions.feature b/features/backend/promotions.feature index 9ab8ff8278..4b2ad20b0d 100644 --- a/features/backend/promotions.feature +++ b/features/backend/promotions.feature @@ -5,8 +5,8 @@ Feature: Promotions I want to be able to manage promotions Background: - Given I am logged in as administrator - And there is default currency configured + Given there is default currency configured + And I am logged in as administrator And the following promotions exist: | name | description | usage limit | used | starts | ends | | New Year | New Year Sale for more than 3 items | | | 2013-12-31 | 2014-01-03 | diff --git a/features/backend/shipments.feature b/features/backend/shipments.feature index 3a468165db..6d1c123b20 100644 --- a/features/backend/shipments.feature +++ b/features/backend/shipments.feature @@ -5,8 +5,8 @@ Feature: Shipments I want to be able to list and view shipments Background: - Given I am logged in as administrator - And there is default currency configured + Given there is default currency configured + And I am logged in as administrator And the following zones are defined: | name | type | members | | German lands | country | Germany, Austria, Switzerland | diff --git a/features/backend/shipping_categories.feature b/features/backend/shipping_categories.feature index f94fa9d00b..0af426f87d 100644 --- a/features/backend/shipping_categories.feature +++ b/features/backend/shipping_categories.feature @@ -5,8 +5,8 @@ Feature: Shipping categories I want to be able to manage shipping categories Background: - Given I am logged in as administrator - And there is default currency configured + Given there is default currency configured + And I am logged in as administrator And there are following shipping categories: | name | | Regular | diff --git a/features/backend/shipping_methods.feature b/features/backend/shipping_methods.feature index 4cddd473cc..24edfb5a64 100644 --- a/features/backend/shipping_methods.feature +++ b/features/backend/shipping_methods.feature @@ -5,8 +5,8 @@ Feature: Shipping methods I want to be able to configure shipping methods Background: - Given I am logged in as administrator - And there is default currency configured + Given there is default currency configured + And I am logged in as administrator And the following zones are defined: | name | type | members | | UK + Germany | country | United Kingdom, Germany | diff --git a/features/backend/tax_categories.feature b/features/backend/tax_categories.feature index 0c698fc7c8..77c7691c8e 100644 --- a/features/backend/tax_categories.feature +++ b/features/backend/tax_categories.feature @@ -5,8 +5,8 @@ Feature: Tax categories I want to be able to manage tax categories Background: - Given I am logged in as administrator - And there is default currency configured + Given there is default currency configured + And I am logged in as administrator And there are following tax categories: | name | | Clothing | diff --git a/features/backend/tax_rates.feature b/features/backend/tax_rates.feature index 84d9373158..ba947924b0 100644 --- a/features/backend/tax_rates.feature +++ b/features/backend/tax_rates.feature @@ -5,8 +5,8 @@ Feature: Tax rates I want to be able to configure tax rates Background: - Given I am logged in as administrator - And there is default currency configured + Given there is default currency configured + And I am logged in as administrator And the following zones are defined: | name | type | members | | UK + Germany | country | United Kingdom, Germany | diff --git a/features/backend/taxation_settings.feature b/features/backend/taxation_settings.feature index d6174f1c6c..b41c6efd87 100644 --- a/features/backend/taxation_settings.feature +++ b/features/backend/taxation_settings.feature @@ -5,8 +5,8 @@ Feature: Taxation settings I want to be able to edit taxation configuration Background: - Given I am logged in as administrator - And there is default currency configured + Given there is default currency configured + And I am logged in as administrator And the following zones are defined: | name | type | members | | German lands | country | Germany, Austria, Switzerland | diff --git a/features/backend/taxonomies.feature b/features/backend/taxonomies.feature index aa833525a5..c2bf1a04e8 100644 --- a/features/backend/taxonomies.feature +++ b/features/backend/taxonomies.feature @@ -5,8 +5,8 @@ Feature: taxonomies I want to be able to manage taxonomies Background: - Given I am logged in as administrator - And there is default currency configured + Given there is default currency configured + And I am logged in as administrator And there are following taxonomies defined: | name | | Category | diff --git a/features/backend/users.feature b/features/backend/users.feature index 6df36393b9..3cc2d7e296 100644 --- a/features/backend/users.feature +++ b/features/backend/users.feature @@ -5,8 +5,8 @@ Feature: Users management I want to be able to list registered users Background: - Given I am logged in as administrator - And there is default currency configured + Given there is default currency configured + And I am logged in as administrator And there are products: | name | price | | Mug | 5.99 | diff --git a/features/backend/zones.feature b/features/backend/zones.feature index f768533d77..4cc7ce84be 100644 --- a/features/backend/zones.feature +++ b/features/backend/zones.feature @@ -5,8 +5,8 @@ Feature: Zones In order to apply taxes and allow shipping to geographical areas Background: - Given I am logged in as administrator - And there is default currency configured + Given there is default currency configured + And I am logged in as administrator And there are following zones: | name | type | members | scope | | Baltic states | country | Lithuania, Latvia, Estonia | content | diff --git a/features/currency/currency_management.feature b/features/currency/currency_management.feature index 883945d6cb..32ad02f0b7 100644 --- a/features/currency/currency_management.feature +++ b/features/currency/currency_management.feature @@ -5,13 +5,13 @@ Feature: Currency management I want to configure currencies and exchange rates Background: - Given I am logged in as administrator - And there are following currencies configured: + Given there are following currencies configured: | code | exchange rate | enabled | | USD | 0.76496 | yes | | GBP | 1.16998 | no | | EUR | 1.00000 | yes | | AUD | 0.73986 | yes | + And I am logged in as administrator Scenario: Browsing all configured currencies Given I am on the dashboard page diff --git a/features/frontend/account_addresses.feature b/features/frontend/account_addresses.feature index bf40f361f0..7d7548b514 100644 --- a/features/frontend/account_addresses.feature +++ b/features/frontend/account_addresses.feature @@ -5,8 +5,8 @@ Feature: User account addresses page I want to be able to add, edit or delete my shipping and billing addresses Background: - Given I am logged in user - And there is default currency configured + Given there is default currency configured + And I am logged in user And the following countries exist: | name | | Germany | diff --git a/features/frontend/account_homepage.feature b/features/frontend/account_homepage.feature index b86ea38808..5cb5faf9dd 100644 --- a/features/frontend/account_homepage.feature +++ b/features/frontend/account_homepage.feature @@ -10,6 +10,7 @@ Feature: User account homepage Scenario: Viewing the homepage of my account Given I am on the store homepage + And there is default currency configured And I am logged in user When I follow "My account" Then I should be on my account homepage diff --git a/features/frontend/account_orders.feature b/features/frontend/account_orders.feature index 445c50b3ea..60f629dfe6 100644 --- a/features/frontend/account_orders.feature +++ b/features/frontend/account_orders.feature @@ -5,9 +5,9 @@ Feature: User account orders page I want to be able to track and get an invoice of my sent orders Background: - Given I am logged in user + Given there is default currency configured + And I am logged in user And I am on my account homepage - And there is default currency configured And the following zones are defined: | name | type | members | | Scandinavia | country | Norway, Sweden, Finland | diff --git a/features/frontend/account_password.feature b/features/frontend/account_password.feature index cbc4f13c9d..4a9230f424 100644 --- a/features/frontend/account_password.feature +++ b/features/frontend/account_password.feature @@ -5,9 +5,9 @@ Feature: User account password change I want to be able to change password Background: - Given I am logged in user + Given there is default currency configured + And I am logged in user And I am on my account homepage - And there is default currency configured Scenario: Viewing my password change page Given I follow "My password" diff --git a/features/frontend/account_profile.feature b/features/frontend/account_profile.feature index 49ecc37917..9ad62f70e3 100644 --- a/features/frontend/account_profile.feature +++ b/features/frontend/account_profile.feature @@ -5,9 +5,9 @@ Feature: User account profile edition I want to be able to edit my name and my email Background: - Given I am logged in user + Given there is default currency configured + And I am logged in user And I am on my account homepage - And there is default currency configured Scenario: Viewing my personal information page Given I follow "My personal information" diff --git a/features/frontend/cart_promotions_complex.feature b/features/frontend/cart_promotions_complex.feature index 5c1e3f77ad..c91d9bc413 100644 --- a/features/frontend/cart_promotions_complex.feature +++ b/features/frontend/cart_promotions_complex.feature @@ -37,7 +37,7 @@ Feature: Checkout promotions with multiple rules and actions And I added product "Sarge" to cart, with quantity "5" When I add product "Lenny" to cart, with quantity "2" Then I should be on the cart summary page - And "Promotion total: -€27.75" should appear on the page + And "Promotion total: (€27.75)" should appear on the page And "Grand total: €127.25" should appear on the page Scenario: Promotion is not applied when one of the cart does not diff --git a/features/frontend/cart_promotions_coupons.feature b/features/frontend/cart_promotions_coupons.feature index 5c2120b807..5c497bc02b 100644 --- a/features/frontend/cart_promotions_coupons.feature +++ b/features/frontend/cart_promotions_coupons.feature @@ -50,7 +50,7 @@ Feature: Checkout coupon promotions And I press "Save" Then I should be on the cart summary page And I should see "Your promotion coupon has been added to the cart" - And "Promotion total: -€5.00" should appear on the page + And "Promotion total: (€5.00)" should appear on the page And "Grand total: €115.00" should appear on the page Scenario: An invalid coupon can not be added to the cart diff --git a/features/frontend/cart_promotions_dates.feature b/features/frontend/cart_promotions_dates.feature index 6edc063f32..57f931d34b 100644 --- a/features/frontend/cart_promotions_dates.feature +++ b/features/frontend/cart_promotions_dates.feature @@ -39,5 +39,5 @@ Feature: Checkout limited time promotions Given I am on the store homepage When I added product "Sarge" to cart, with quantity "8" Then I should be on the cart summary page - And "Promotion total: -€20.00" should appear on the page + And "Promotion total: (€20.00)" should appear on the page And "Grand total: €160.00" should appear on the page diff --git a/features/frontend/cart_promotions_fixed.feature b/features/frontend/cart_promotions_fixed.feature index f8a5c3c05b..a0e9ff5cb1 100644 --- a/features/frontend/cart_promotions_fixed.feature +++ b/features/frontend/cart_promotions_fixed.feature @@ -5,7 +5,8 @@ Feature: Checkout fixed discount promotions I want to apply promotion discounts during checkout Background: - Given I am logged in as user "klaus@example.com" + Given there is default currency configured + And I am logged in as user "klaus@example.com" And the following countries exist: | name | | Germany | @@ -62,14 +63,13 @@ Feature: Checkout fixed discount promotions And promotion "3rd order" has following actions defined: | type | configuration | | Fixed discount | Amount: 10 | - And there is default currency configured Scenario: Fixed discount promotion is applied when the cart has the required amount Given I am on the store homepage When I add product "Woody" to cart, with quantity "3" Then I should be on the cart summary page - And "Promotion total: -€40.00" should appear on the page + And "Promotion total: (€40.00)" should appear on the page And "Grand total: €295.00" should appear on the page Scenario: Fixed discount promotion is not applied when the cart @@ -87,7 +87,7 @@ Feature: Checkout fixed discount promotions And I added product "Etch" to cart, with quantity "1" When I add product "Lenny" to cart, with quantity "2" Then I should be on the cart summary page - And "Promotion total: -€15.00" should appear on the page + And "Promotion total: (€15.00)" should appear on the page And "Grand total: €110.00" should appear on the page Scenario: Item count promotion is not applied when the cart has @@ -105,7 +105,7 @@ Feature: Checkout fixed discount promotions And I fill in the shipping address to Germany And I press "Continue" And I go to the cart summary page - Then "Promotion total: -€40.00" should appear on the page + Then "Promotion total: (€40.00)" should appear on the page And "Grand total: €35.00" should appear on the page Scenario: Shipping country promotion is not applied when shipping country does not match @@ -122,7 +122,7 @@ Feature: Checkout fixed discount promotions Given I am on the store homepage When I add product "Ubu" to cart, with quantity "1" Then I should be on the cart summary page - And "Promotion total: -€40.00" should appear on the page + And "Promotion total: (€40.00)" should appear on the page And "Grand total: €160.00" should appear on the page Scenario: Ubuntu T-Shirts promotion is not applied when the cart does not contain Ubuntu T-Shirts @@ -163,7 +163,7 @@ Feature: Checkout fixed discount promotions And I fill in the shipping address to Poland And I press "Continue" And I go to the cart summary page - And "Promotion total: -€10.00" should appear on the page + And "Promotion total: (€10.00)" should appear on the page And "Grand total: €5.00" should appear on the page Scenario: Nth order promotion is not applied when user have no orders before @@ -180,5 +180,5 @@ Feature: Checkout fixed discount promotions And I added product "Buzz" to cart, with quantity "1" When I add product "Woody" to cart, with quantity "3" Then I should still be on the cart summary page - And "Promotion total: -€55.00" should appear on the page + And "Promotion total: (€55.00)" should appear on the page And "Grand total: €1,500.00" should appear on the page diff --git a/features/frontend/cart_promotions_percentage.feature b/features/frontend/cart_promotions_percentage.feature index 497fb1118c..7dab5e11f4 100644 --- a/features/frontend/cart_promotions_percentage.feature +++ b/features/frontend/cart_promotions_percentage.feature @@ -41,7 +41,7 @@ Feature: Checkout percentage discount promotions Given I am on the store homepage When I add product "Woody" to cart, with quantity "3" Then I should be on the cart summary page - And "Promotion total: -€30.00" should appear on the page + And "Promotion total: (€30.00)" should appear on the page And "Grand total: €315.00" should appear on the page Scenario: Fixed discount promotion is not applied when the cart @@ -59,7 +59,7 @@ Feature: Checkout percentage discount promotions And I added product "Etch" to cart, with quantity "1" When I add product "Lenny" to cart, with quantity "2" Then I should be on the cart summary page - And "Promotion total: -€18.75" should appear on the page + And "Promotion total: (€18.75)" should appear on the page And "Grand total: €106.25" should appear on the page Scenario: Item count promotion is not applied when the cart has @@ -77,5 +77,5 @@ Feature: Checkout percentage discount promotions And I added product "Buzz" to cart, with quantity "1" When I add product "Woody" to cart, with quantity "3" Then I should still be on the cart summary page - And "Promotion total: -€362.51" should appear on the page + And "Promotion total: (€362.51)" should appear on the page And "Grand total: €1,186.40" should appear on the page diff --git a/features/frontend/cart_promotions_usage_limit.feature b/features/frontend/cart_promotions_usage_limit.feature index 9604b8695f..3db774c7e1 100644 --- a/features/frontend/cart_promotions_usage_limit.feature +++ b/features/frontend/cart_promotions_usage_limit.feature @@ -41,7 +41,7 @@ Feature: Checkout usage limited promotions Given I am on the store homepage When I add product "Buzz" to cart, with quantity "2" Then I should be on the cart summary page - And "Promotion total: -€500.00" should appear on the page + And "Promotion total: (€500.00)" should appear on the page And "Grand total: €0.00" should appear on the page Scenario: Promotion with usage limit is not applied when the diff --git a/features/frontend/checkout_addressing.feature b/features/frontend/checkout_addressing.feature index fad33ecba7..7cf777401e 100644 --- a/features/frontend/checkout_addressing.feature +++ b/features/frontend/checkout_addressing.feature @@ -31,8 +31,8 @@ Feature: Checkout addressing | zone | name | calculator | configuration | | UK + Germany | DHL Express | Flat rate | Amount: 5000 | | USA | FedEx | Flat rate | Amount: 6500 | - And I am logged in user And there is default currency configured + And I am logged in user Scenario: Filling the shipping address Given I added product "PHP Top" to cart diff --git a/features/frontend/checkout_inventory.feature b/features/frontend/checkout_inventory.feature index 323a2896dc..b9a5853686 100644 --- a/features/frontend/checkout_inventory.feature +++ b/features/frontend/checkout_inventory.feature @@ -23,8 +23,8 @@ Feature: Checkout inventory And the following payment methods exist: | name | gateway | enabled | | Credit Card | dummy | yes | - And I am logged in as administrator And there is default currency configured + And I am logged in as administrator Scenario: Inventory is updated after buying products Given I added product "PHP Top" to cart, with quantity "4" diff --git a/features/frontend/user_login.feature b/features/frontend/user_login.feature index 0aeed7cd4c..9df480cdae 100644 --- a/features/frontend/user_login.feature +++ b/features/frontend/user_login.feature @@ -8,6 +8,7 @@ Feature: Sign in to the store Given there are following users: | email | password | enabled | | bar@foo.com | foo | yes | + And there is default currency configured Scenario: Log in with username and password Given I am on the store homepage diff --git a/features/frontend/user_login_via_oauth.feature b/features/frontend/user_login_via_oauth.feature index 4ec342fc1b..9b17516ee1 100644 --- a/features/frontend/user_login_via_oauth.feature +++ b/features/frontend/user_login_via_oauth.feature @@ -5,7 +5,8 @@ Feature: Sign in to the store via OAuth I need to be able to log in to the store Background: - Given I am not logged in + Given there is default currency configured + And I am not logged in And I am on the store homepage Scenario Outline: Get to the OAuth login page diff --git a/features/frontend/user_registration.feature b/features/frontend/user_registration.feature index 434cad7629..66279eb5b5 100644 --- a/features/frontend/user_registration.feature +++ b/features/frontend/user_registration.feature @@ -8,6 +8,7 @@ Feature: User registration Given there are following users: | email | password | | bar@bar.com | foo | + And there is default currency configured Scenario: Successfully creating account in store Given I am on the store homepage diff --git a/features/localization/locale_management.feature b/features/localization/locale_management.feature index 5e71e02ff2..e25373f947 100644 --- a/features/localization/locale_management.feature +++ b/features/localization/locale_management.feature @@ -5,8 +5,7 @@ Feature: Managing locales I want to be able to configure locales Background: - Given I am logged in as administrator - And there are following currencies configured: + Given there are following currencies configured: | code | exchange rate | enabled | | EUR | 1.00000 | yes | And there are following locales configured: @@ -14,7 +13,7 @@ Feature: Managing locales | de_DE | yes | | en_US | no | | fr_FR | yes | - + And I am logged in as administrator Scenario: Seeing index of all locales Given I am on the dashboard page When I follow "Locales" diff --git a/features/localization/locale_selection.feature b/features/localization/locale_selection.feature index a2928241fd..2e102582db 100644 --- a/features/localization/locale_selection.feature +++ b/features/localization/locale_selection.feature @@ -11,6 +11,7 @@ Feature: Locale selection | en_US | yes | | fr_FR | no | | pl_PL | yes | + And there is default currency configured Scenario: Only enabled locales are visible to the user Given I am on the store homepage diff --git a/src/Sylius/Bundle/MoneyBundle/Behat/MoneyContext.php b/src/Sylius/Bundle/MoneyBundle/Behat/MoneyContext.php index 74e88311f0..59fa3043e5 100644 --- a/src/Sylius/Bundle/MoneyBundle/Behat/MoneyContext.php +++ b/src/Sylius/Bundle/MoneyBundle/Behat/MoneyContext.php @@ -60,7 +60,7 @@ class MoneyContext extends DefaultContext } /** - * @Given there is default currency configured + * @Given /^there is default currency configured$/ */ public function setupDefaultCurrency() {