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.

Sign up for GitHub

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

Jump to bottom

[Catalog] Unable to open the product from sidebar's Compare Products block #27451

Merged
merged 10 commits into from
Jun 13, 2020
Merged

[Catalog] Unable to open the product from sidebar's Compare Products block #27451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
11195fc
Fixing the opening of the product from the compare block
eduard13 Mar 26, 2020
3e18da8
Fixing the opening of the product from the compare block
eduard13 Mar 26, 2020
48b57fd
Fixing the opening of the product from the compare block
eduard13 Mar 26, 2020
cd55580
Moving the tests to the right module
eduard13 Mar 26, 2020
244a46b
Applying the fix to blank theme
eduard13 Apr 5, 2020
95a2a09
Merge branch '2.4-develop' into compare-remove-product-issue
eduard13 Apr 8, 2020
221ef59
Small adjustments
eduard13 Apr 9, 2020
a93a105
Merge branch '2.4-develop' of http://github.com/magento/magento2 into…
engcom-Echo Jun 9, 2020
044dc68
test file has been moved to the tests folder
engcom-Echo Jun 9, 2020
435cc35
Update StorefrontRemoveProductFromCompareSidebarTest.xml
engcom-Echo Jun 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions ...talog/Test/Mftf/ActionGroup/StorefrontClickOnProductFromSidebarCompareListActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="StorefrontClickOnProductFromSidebarCompareListActionGroup">
<annotations>
<description>Click on the product item from the sidebar comparing list.</description>
</annotations>

<arguments>
<argument name="product" type="entity"/>
</arguments>

<waitForElementVisible selector="{{StorefrontComparisonSidebarSection.ProductTitleByName((product.name)}}" stepKey="waitForAddedCompareProduct"/>
<click selector="{{StorefrontComparisonSidebarSection.ProductTitleByName((product.name))}}" stepKey="clickOnProductLink"/>
<waitForPageLoad stepKey="waitForProductPageLoad"/>
</actionGroup>
</actionGroups>
43 changes: 43 additions & 0 deletions app/code/Magento/Catalog/Test/Mftf/Test/StorefrontRemoveProductFromCompareSidebarTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
<test name="StorefrontRemoveProductFromCompareSidebarTest">
<annotations>
<title value="Verify that the product isn't removed on clicking the product name"/>
<stories value="Verify that the product isn't removed on clicking the product name"/>
<description value="Verify that the product isn't removed on clicking the product name, but it's redirected to product page"/>
<features value="Catalog"/>
<severity value="MINOR"/>
<group value="Catalog"/>
<testCaseId value="MC-35068"/>
</annotations>
<before>
<createData entity="_defaultCategory" stepKey="defaultCategory"/>
<createData entity="SimpleProduct" stepKey="simpleProduct">
<requiredEntity createDataKey="defaultCategory"/>
</createData>
</before>
<after>
<deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
<deleteData createDataKey="defaultCategory" stepKey="deleteCategory"/>
</after>
<actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="openCategoryPage">
<argument name="category" value="$$defaultCategory$$"/>
</actionGroup>
<actionGroup ref="StorefrontAddCategoryProductToCompareActionGroup" stepKey="addProductToCompareList">
<argument name="productVar" value="$$simpleProduct$$"/>
</actionGroup>
<actionGroup ref="StorefrontClickOnProductFromSidebarCompareListActionGroup" stepKey="clickOnComparingProductLink">
<argument name="product" value="$$simpleProduct$$"/>
</actionGroup>
<actionGroup ref="StorefrontCheckProductUrlActionGroup" stepKey="checkProductPageUrl">
<argument name="productUrl" value="$$simpleProduct.custom_attributes[url_key]$$"/>
</actionGroup>
</test>
</tests>
20 changes: 18 additions & 2 deletions app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,11 +457,26 @@
.action {
&.delete {
&:extend(.abs-remove-button-for-blocks all);
line-height: unset;
position: absolute;
right: 0;
top: -1px;
width: auto;
}
}

.block-wishlist {
.action {
&.delete {
line-height: unset;
width: auto;
}
}
}

.block-compare {
.action {
&.delete {
right: initial;
}
}
}

Expand Down Expand Up @@ -814,6 +829,7 @@
&:extend(.abs-remove-button-for-blocks all);
left: -6px;
position: absolute;
right: 0;
top: 0;
}
mrtuvn marked this conversation as resolved.
Show resolved Hide resolved

Expand Down
10 changes: 10 additions & 0 deletions app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -998,13 +998,23 @@
}
}
}

.block-compare {
.action {
&.delete {
left: 0;
right: initial;
}
}
}
}
mrtuvn marked this conversation as resolved.
Show resolved Hide resolved
mrtuvn marked this conversation as resolved.
Show resolved Hide resolved
}

.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
.compare.wrapper {
display: none;
}

.catalog-product_compare-index {
.columns {
.column {
Expand Down