MAGETWO-75086: Child product image should be shown in Wishist if opti…

…ons are selected for configurable product #8168
magento · Jul 24, 2018 · c19bd50 · c19bd50
1 parent 433d226
commit c19bd50
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 13 deletions.
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/ProductsOnAdminActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/ProductsOnAdminActionGroup.xml
@@ -34,7 +34,7 @@
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickOnFiltersButton"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clearFilters"/>
-        <fillField selector="{{AdminProductGridFilterSection.name}}" userInput="{{product.name}}" stepKey="fillNameFieldInFilter"/>
+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{product.name}}" stepKey="fillNameFieldInFilter"/>
         <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="applyFilters"/>
         <click selector="{{AdminProductGridSection.multicheckDropdown}}" stepKey="clickMulticheckDropDown"/>
         <click selector="{{AdminProductGridSection.multicheckOption('Select All')}}" stepKey="selectAllFilteredProducts"/>

diff --git a/...AdminCategoryProductAttributeEditPage.xml → ...tf/Page/AdminProductAttributeEditPage.xml b/...AdminCategoryProductAttributeEditPage.xml → ...tf/Page/AdminProductAttributeEditPage.xml
@@ -8,7 +8,7 @@
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="AdminCategoryProductAttributeEditPage" url="catalog/product_attribute/edit/" area="admin" module="Magento_Catalog">
+    <page name="AdminProductAttributeEditPage" url="catalog/product_attribute/edit/" area="admin" module="Magento_Catalog">
         <section name="AdminProductAttributeEditSection"/>
         <section name="AdminConfirmationModalSection"/>
     </page>

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
@@ -17,7 +17,7 @@
         <element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
         <element name="newFromDateFilter" type="input" selector="input.admin__control-text[name='news_from_date[from]']"/>
         <element name="skuFilter" type="input" selector="input.admin__control-text[name='sku']"/>
-        <element name="name" type="input" selector="input.admin__control-text[name='name']"/>
+        <element name="nameFilter" type="input" selector="input.admin__control-text[name='name']"/>
         <element name="viewBookmark" type="button" selector="//div[contains(@class, 'admin__data-grid-action-bookmarks')]/ul/li/div/a[text() = '{{label}}']" parameterized="true" timeout="30"/>
         <element name="viewDropdown" type="button" selector=".admin__data-grid-action-bookmarks button.admin__action-dropdown"/>
     </section>

diff --git a/app/code/Magento/Checkout/Model/Cart/ImageProvider.php b/app/code/Magento/Checkout/Model/Cart/ImageProvider.php
@@ -25,8 +25,8 @@ class ImageProvider
      */
     protected $itemPool;
 
-    /** 
-     * @var \Magento\Checkout\CustomerData\DefaultItem 
+    /**
+     * @var \Magento\Checkout\CustomerData\DefaultItem
      */
     private $customerDataItem;
 

diff --git a/...Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml b/...Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml
@@ -63,9 +63,9 @@
         <click selector="{{AdminCreateProductConfigurationsPanelSection.next}}" stepKey="clickOnNextButton2"/>
         <click selector="{{AdminCreateProductConfigurationsPanelSection.applyUniquePricesByAttributeToEachSku}}" stepKey="clickOnApplyUniquePricesByAttributeToEachSku"/>
         <selectOption selector="{{AdminCreateProductConfigurationsPanelSection.selectAttribute}}" userInput="{{colorProductAttribute.default_label}}" stepKey="selectAttributes"/>
-        <fillField selector="{{AdminCreateProductConfigurationsPanelSection.attribute1}}" userInput="{{colorProductAttribute1.price}}" stepKey="fillAttributePrice1"/>
-        <fillField selector="{{AdminCreateProductConfigurationsPanelSection.attribute2}}" userInput="{{colorProductAttribute2.price}}" stepKey="fillAttributePrice2"/>
-        <fillField selector="{{AdminCreateProductConfigurationsPanelSection.attribute3}}" userInput="{{colorProductAttribute3.price}}" stepKey="fillAttributePrice3"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanelSection.attribute('0')}}" userInput="{{colorProductAttribute1.price}}" stepKey="fillAttributePrice1"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanelSection.attribute('1')}}" userInput="{{colorProductAttribute2.price}}" stepKey="fillAttributePrice2"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanelSection.attribute('2')}}" userInput="{{colorProductAttribute3.price}}" stepKey="fillAttributePrice3"/>
         <click selector="{{AdminCreateProductConfigurationsPanelSection.applySingleQuantityToEachSkus}}" stepKey="clickOnApplySingleQuantityToEachSku"/>
         <fillField selector="{{AdminCreateProductConfigurationsPanelSection.quantity}}" userInput="1" stepKey="enterAttributeQuantity"/>
         <click selector="{{AdminCreateProductConfigurationsPanelSection.next}}" stepKey="clickOnNextButton3"/>

diff --git a/...to/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml b/...to/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml
@@ -22,9 +22,7 @@
         <element name="saveAttribute" type="button" selector="li[data-attribute-option-title=''] .action-save" timeout="30"/>
         <element name="applyUniquePricesByAttributeToEachSku" type="radio" selector=".admin__field-label[for='apply-unique-prices-radio']"/>
         <element name="selectAttribute" type="select" selector="#select-each-price" timeout="30"/>
-        <element name="attribute1" type="input" selector="#apply-single-price-input-0"/>
-        <element name="attribute2" type="input" selector="#apply-single-price-input-1"/>
-        <element name="attribute3" type="input" selector="#apply-single-price-input-2"/>
+        <element name="attribute" type="input" selector="#apply-single-price-input-{{var1}}" parameterized="true"/>
         <element name="applySingleQuantityToEachSkus" type="radio" selector=".admin__field-label[for='apply-single-inventory-radio']" timeout="30"/>
         <element name="quantity" type="input" selector="#apply-single-inventory-input"/>
     </section>

diff --git a/...onfigurableProduct/Test/Unit/Model/Product/Configuration/Item/ItemProductResolverTest.php b/...onfigurableProduct/Test/Unit/Model/Product/Configuration/Item/ItemProductResolverTest.php
@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace Magento\ConfigurableProduct\Test\Unit\Model\Product\Configuration;
+namespace Magento\ConfigurableProduct\Test\Unit\Model\Product\Configuration\Item;
 
 use Magento\Catalog\Model\Config\Source\Product\Thumbnail;
 use Magento\Catalog\Model\Product;

diff --git a/...nto/GroupedProduct/Test/Unit/Model/Product/Configuration/Item/ItemProductResolverTest.php b/...nto/GroupedProduct/Test/Unit/Model/Product/Configuration/Item/ItemProductResolverTest.php
@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace Magento\GroupedProduct\Test\Unit\Model\Product\Configuration;
+namespace Magento\GroupedProduct\Test\Unit\Model\Product\Configuration\Item;
 
 use Magento\Catalog\Model\Config\Source\Product\Thumbnail;
 use Magento\Catalog\Model\Product;