Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.0.0 ee #584

Merged
merged 16 commits into from
Jun 21, 2021
Merged

2.0.0 ee #584

merged 16 commits into from
Jun 21, 2021

Conversation

mhaack
Copy link
Contributor

@mhaack mhaack commented Jun 4, 2021

Description

Merge 2.0.0 ee branch, with staged product changes we already have, finally into master.

Related Issue

CIF-1964, CIF1965 and more to come

Motivation and Context

Prepare for CIF 2.0.0

How Has This Been Tested?

Unit test & ITs added

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • I have signed the Adobe Open Source CLA.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes and the overall coverage did not decrease.
  • All unit tests pass on CircleCi.
  • I ran all tests locally and they pass.

cjelger and others added 13 commits March 17, 2021 13:10
* introduce product v2 for 'staged' Magento field
* adapt unit tests for component v2
* ensure the product and variant queries can be extended "multiple times"
* add @SInCE annotation to product interface
* add readme
* update Magento schema to 2.4.2 EE
* add mandatory "staged" field to the mock JSON responses
* extend unit tests to test both product v1 and v2 components
* fix POM dependencies and remove no longer needed picker implementation

Co-authored-by: Levente Santha <levente@adobe.com>
* create productlist v2 component
* update unit tests and GraphQL mock server for Venia ITs
# Conflicts:
#	bundles/core/src/test/java/com/adobe/cq/commerce/core/components/internal/models/v1/productlist/ProductListImplTest.java
#	bundles/core/src/test/resources/graphql/magento-graphql-search-result-with-category.json
#	bundles/core/src/test/resources/test-queries/graphql-requests.log
#	examples/bundle/src/main/resources/graphql/magento-graphql-category.json
* introduce product v2 for 'staged' Magento field
* adapt unit tests for component v2
* ensure the product and variant queries can be extended "multiple times"
* add @SInCE annotation to product interface
* add readme
* update Magento schema to 2.4.2 EE
* add mandatory "staged" field to the mock JSON responses
* extend unit tests to test both product v1 and v2 components
* fix POM dependencies and remove no longer needed picker implementation

Co-authored-by: Levente Santha <levente@adobe.com>
* create productlist v2 component
* update unit tests and GraphQL mock server for Venia ITs
…nto 2.0.0-ee

# Conflicts:
#	bundles/core/src/main/java/com/adobe/cq/commerce/core/components/models/productlist/ProductList.java
#	bundles/core/src/test/java/com/adobe/cq/commerce/core/components/internal/models/v1/productlist/ProductListImplTest.java
#	bundles/core/src/test/resources/graphql/magento-graphql-search-category-result-products.json
#	bundles/core/src/test/resources/test-queries/graphql-requests.log
#	examples/bundle/src/main/resources/graphql/magento-graphql-category.json
@codecov
Copy link

codecov bot commented Jun 4, 2021

Codecov Report

Merging #584 (c4754fd) into master (38c3ae6) will increase coverage by 0.06%.
The diff coverage is 95.45%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #584      +/-   ##
============================================
+ Coverage     87.90%   87.97%   +0.06%     
- Complexity     1372     1396      +24     
============================================
  Files           250      254       +4     
  Lines          6435     6472      +37     
  Branches        964      969       +5     
============================================
+ Hits           5657     5694      +37     
  Misses          583      583              
  Partials        195      195              
Flag Coverage Δ
integration 63.39% <11.36%> (-0.61%) ⬇️
jest 85.34% <ø> (ø)
karma 94.83% <ø> (ø)
unittests 87.23% <95.45%> (+0.13%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...onents/internal/models/v1/product/ProductImpl.java 90.47% <ø> (ø)
...nternal/models/v1/productlist/ProductListImpl.java 94.80% <ø> (ø)
...core/components/models/common/ProductListItem.java 0.00% <0.00%> (ø)
...ommerce/core/examples/servlets/GraphqlServlet.java 89.09% <ø> (+1.13%) ⬆️
...nternal/models/v2/productlist/ProductListImpl.java 85.71% <85.71%> (ø)
...internal/models/v1/common/ProductListItemImpl.java 91.30% <100.00%> (+0.39%) ⬆️
...models/v1/productcarousel/ProductCarouselImpl.java 86.15% <100.00%> (+0.21%) ⬆️
...models/v1/relatedproducts/RelatedProductsImpl.java 88.46% <100.00%> (ø)
...onents/internal/models/v2/product/ProductImpl.java 100.00% <100.00%> (ø)
...mmerce/core/components/models/product/Product.java 100.00% <100.00%> (ø)
... and 9 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 38c3ae6...c4754fd. Read the comment docs.

@mhaack mhaack merged commit 6907ca9 into master Jun 21, 2021
@mhaack mhaack deleted the 2.0.0-ee branch June 21, 2021 14:52
@mhaack mhaack mentioned this pull request Jun 28, 2021
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants