Commit graph

4637 commits

Author SHA1 Message Date
Wojdylak
3f164fcf09
Resolve conflicts between 2.0 and payment-request 2024-09-06 11:04:40 +02:00
Kamil Grygierzec
736c65dd8c
Cover the scenario for allowing access for only correctly logged in users 2024-09-06 10:22:37 +02:00
Michał Pysiak
2c4972219a
Disable scenarios that require checkout complete to be ready 2024-09-06 09:57:25 +02:00
Michał Pysiak
e6d470640c
Enable and fix scenarios 2024-09-06 08:51:50 +02:00
Kamil Grygierzec
cf969f08c8
Enable the remaining cart suites 2024-09-05 17:35:57 +02:00
Jan Goralski
080c0cac50
[Behat][Checkout] Enable shipping step tests 2024-09-05 16:11:35 +02:00
Rafał Jaskulski
5081335ddc
[Shop] Currency switcher (#16861)
| Q               | A
|-----------------|-----
| Branch?         | bootstrap-shop
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | n/a
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.13 branch
 - Features and deprecations must be submitted against the 1.14 branch
- Features, removing deprecations and BC breaks must be submitted
against the 2.0 branch
 - Make sure that the correct base branch is set

To be sure you are not breaking any Backward Compatibilities, check the
documentation:

https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->

Made currency switcher twig component, enabled currency scenarios.
Refactored CardComponent - removed duplicated PriceComponents
2024-09-05 10:31:15 +02:00
Grzegorz Sadowski
1f263a4e4a
Merge branch '2.0' into bootstrap-shop
* 2.0:
  [Api][Unit] Fix it_gets_all_product_variants_when_invalid_product_filter_provided test
  [Api] Replace sylius.api to sylius_api
  [Api] Cover sorting and filtration of resources
2024-09-05 10:11:48 +02:00
Grzegorz Sadowski
bb79cdad8b
[Api] Cover sorting and filtering of resources (#16856)
| Q               | A
|-----------------|-----
| Branch?         | 2.0
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | n/a
| License         | MIT
2024-09-05 10:11:07 +02:00
Grzegorz Sadowski
aa7b4c62fa
Merge branch '2.0' into bootstrap-shop
* 2.0:
  [Behat] Refine codebase for promotion and cart contexts
  Enable dashboard and homepage suites
  Minor Product config improvement
  Enable the rest of product tests and correct order of the attribute values in the response
  Correct contract tests and behat
  Bring back non exposed ProductOptionValue
  [Behat] Refine flow of shop promotion scenarios
2024-09-05 10:09:27 +02:00
Michał Pysiak
ee3aa699d8
Enable scenario 2024-09-05 09:42:16 +02:00
Grzegorz Sadowski
e8841ed9fb
[Behat] Refine Promotion Scenarios (#16840)
| Q               | A
|-----------------|-----
| Branch?         | 2.0
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations? | no<!-- don't forget to update the UPGRADE-*.md file
-->
| Related tickets | continuation of
https://github.com/Sylius/Sylius/pull/16807
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.13 branch
 - Features and deprecations must be submitted against the 1.14 branch
- Features, removing deprecations and BC breaks must be submitted
against the 2.0 branch
 - Make sure that the correct base branch is set

To be sure you are not breaking any Backward Compatibilities, check the
documentation:

https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->
2024-09-05 09:36:31 +02:00
Wojdylak
bceb1c0928
[Api] Cover sorting and filtration of resources 2024-09-05 09:33:25 +02:00
Grzegorz Sadowski
a452741130
[API] Enable remaining Product tests (#16848)
| Q               | A
|-----------------|-----
| Branch?         | api-platform-3 <!-- see the comment below -->
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.13 branch
 - Features and deprecations must be submitted against the 1.14 branch
- Features, removing deprecations and BC breaks must be submitted
against the 2.0 branch
 - Make sure that the correct base branch is set

To be sure you are not breaking any Backward Compatibilities, check the
documentation:

https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->
2024-09-05 09:28:29 +02:00
Michał Pysiak
cb1a5139d5
Enable missing scenarios
# Conflicts:
#	features/shop/promotion/applying_promotion_rules/reapplying_promotion_on_cart_change.feature
#	features/shop/promotion/applying_promotion_rules/receiving_discount_based_on_cart_quantity.feature
#	features/shop/promotion/applying_promotion_rules/receiving_discount_based_on_chosen_product.feature
#	features/shop/promotion/applying_promotion_rules/receiving_discount_based_on_customer_group.feature
#	features/shop/promotion/applying_promotion_rules/receiving_discount_based_on_items_from_specific_taxons.feature
#	features/shop/promotion/applying_promotion_rules/receiving_discount_based_on_items_total.feature
#	features/shop/promotion/applying_promotion_rules/receiving_discount_based_on_nth_order.feature
#	features/shop/promotion/applying_promotion_rules/receiving_discount_based_on_total_of_items_from_specific_taxon.feature
2024-09-05 08:19:53 +02:00
Michał Pysiak
3653f58c75
Add component, enable scenarios
# Conflicts:
#	features/shop/currency/handling_different_currencies_on_multiple_channels.feature
#	features/shop/currency/switching_current_currency.feature
2024-09-05 07:44:27 +02:00
Grzegorz Sadowski
f9da71dbb3
Resolve conflicts between 2.0 and bootstrap-shop 2024-09-05 07:07:43 +02:00
Kamil Grygierzec
20a5baa609
Enable dashboard and homepage suites 2024-09-04 15:29:34 +02:00
Grzegorz Sadowski
9db198d6fa
Resolve conflicts between 2.0 and bootstrap-shop 2024-09-04 15:19:35 +02:00
Kamil Grygierzec
424d1c143b
Enable the rest of product tests and correct order of the attribute values in the response 2024-09-04 12:05:52 +02:00
Wojdylak
214a3eefb9
[Shop][Cart][Addressing] Fix behat tests 2024-09-04 09:36:52 +02:00
Wojdylak
016b1c4a09
[Shop][Cart][Addressing] Enable behat tests 2024-09-04 08:48:22 +02:00
Rafikooo
6400889ef8
[Behat] Refine flow of shop promotion scenarios 2024-09-04 08:44:33 +02:00
Michał Pysiak
1d369dbdb3 Changes after CR 2024-09-04 06:57:10 +02:00
Michał Pysiak
4d97966d69 Enable scenarios, fix behats
# Conflicts:
#	src/Sylius/Behat/Page/Shop/Cart/SummaryPage.php
2024-09-04 06:57:10 +02:00
Kamil Grygierzec
152addef27
Enable behat tests for address book 2024-09-03 15:41:33 +02:00
Rafał Jaskulski
4615474453
[Maintenance] Enable non-api tests again (#16814)
| Q               | A
|-----------------|-----
| Branch?         | api-platform-3
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations? | no<!-- don't forget to update the UPGRADE-*.md file
-->
| Related tickets | 
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.13 branch
 - Features and deprecations must be submitted against the 1.14 branch
- Features, removing deprecations and BC breaks must be submitted
against the 2.0 branch
 - Make sure that the correct base branch is set

To be sure you are not breaking any Backward Compatibilities, check the
documentation:

https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->
2024-09-03 10:47:36 +02:00
Grzegorz Sadowski
f530b004be
[Shop][Behat] Fix checkout scenarios 2024-09-03 10:04:27 +02:00
Grzegorz Sadowski
111eb3b6e6
Merge branch '2.0' into api-platform-3
* 2.0:
  [CS][DX] Refactor
  [CS][DX] Refactor
  [CS][DX] Refactor
  [CI] Update Sylius branches in refactor workflow
  [Behat] Switch another random JS failed scenarios to Chromedriver
  [Behat] Switch another random JS failed scenarios to Chromedriver
  [Behat] Switch random JS failed scenarios to Chromedriver
  [CS][DX] Refactor
2024-09-03 07:40:01 +02:00
Rafał Jaskulski
7f69b3452f
[UPMERGE] 2.0 -> bootstrap-shop (#16834)
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.github/workflows/upmerge_pr.yaml).

**Remember!** The upmerge should always be merged with using `Merge pull
request` button.

In case of conflicts, please resolve them manually with usign the
following commands:
```
git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/bootstrap-shop -m "Resolve conflicts between 2.0 and bootstrap-shop"
```

If you use other name for the upstream remote, please replace `upstream`
with the name of your remote pointing to the `Sylius/Sylius` repository.

Once the conflicts are resolved, please run `git merge --continue` and
push the changes to this PR.
2024-09-03 06:38:37 +02:00
Grzegorz Sadowski
6dc7b73c5a
Merge branch '1.14' into 2.0
* 1.14:
  [Behat] Switch another random JS failed scenarios to Chromedriver
  [Behat] Switch another random JS failed scenarios to Chromedriver
  [Behat] Switch random JS failed scenarios to Chromedriver
2024-09-02 14:54:18 +02:00
Grzegorz Sadowski
797e10e58a
[Behat] Switch another random JS failed scenarios to Chromedriver 2024-09-02 13:27:54 +02:00
Grzegorz Sadowski
e0cd54b0df
[Behat] Switch another random JS failed scenarios to Chromedriver 2024-09-02 12:51:30 +02:00
Grzegorz Sadowski
8ebb064557
[Behat] Switch random JS failed scenarios to Chromedriver 2024-09-02 12:28:14 +02:00
Michał Pysiak
824cfff1cd
Enable suites for currencies and exchange rates 2024-09-02 12:22:01 +02:00
Michał Pysiak
dae715f072 Enable scenarios, fix behats 2024-09-02 12:06:25 +02:00
Jan Góralski
ad85940b2e
minor #16799 [Behat] Enable Applying Shipping Fee Scenarios (Rafikooo)
This PR was merged into the api-platform-3 branch.

Discussion
----------

| Q               | A
|-----------------|-----
| Branch?         | api-platform-3 <!-- see the comment below -->
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no <!-- don't forget to update the UPGRADE-*.md file -->
| Related tickets | continuation of https://github.com/Sylius/Sylius/pull/16692, https://github.com/Sylius/Sylius/pull/16760, https://github.com/Sylius/Sylius/pull/16792
| License         | MIT

Commits
-------
  [Behat] Enable applying shipping fee scenarios
  [Behat] Decouple addressing from selecting the shipping method step
  [Behat][UI] Decouple addressing from selecting the shipping method step
  [ECS] Apply ecs fixes
  [Behat] Simplify and improve scenarios' flow
  [Behat][UI] Reduce nested step methods calls
  [Behat][API] Enable applying shipping fee suite
  [Behat] Move context method to the proper class after rebase
2024-08-29 16:10:24 +02:00
Rafikooo
0809749257 [Behat] Reorganize inventory scenario tags 2024-08-29 13:21:41 +02:00
Rafikooo
a8afd680a0 [Behat] Reorganize promotions scenario tags and mark untagged UI ones as '@todo-ui' 2024-08-29 13:21:41 +02:00
Michał Pysiak
8985296da8
Enable test, add test attribute 2024-08-29 13:03:51 +02:00
Rafikooo
979b2910be
[Behat] Simplify and improve scenarios' flow 2024-08-29 12:34:57 +02:00
Wojdylak
1b8e8080b8
[Shop][Behat] Change javascript to mink:chromedriver 2024-08-29 09:39:08 +02:00
Grzegorz Sadowski
07dc38e98c
[Shop][Behat] Enable already covered scenarios 2024-08-29 08:33:20 +02:00
Grzegorz Sadowski
5b047faa43
[Admin][Behat] Enable already covered scenarios 2024-08-29 08:33:11 +02:00
Rafikooo
681fcc23b5
[Behat] Decouple addressing from selecting the shipping method step 2024-08-29 07:24:52 +02:00
Rafikooo
0c7a078dbd
[Behat] Enable applying shipping fee scenarios 2024-08-29 07:24:51 +02:00
Wojdylak
4da1e69e66
[Shop][Contact] Enable behat tests 2024-08-28 14:57:01 +02:00
Wojdylak
02323ee5a6 [Shop][Product] Move OrderItemModifierListener to shop bundle 2024-08-28 11:52:33 +02:00
Wojdylak
5af189655f [Shop][Product] Add validation messages to addToCart form 2024-08-28 11:52:33 +02:00
Wojdylak
bed0a1c3d1 [Shop][Product] Add validation to addToCart 2024-08-28 11:52:33 +02:00