[Magento Community Engineering] Community Contributions - 2.3-develop

magento-engcom-team · web-flow · commit 0adff35ad082 · 2019-09-28T00:23:40.000+03:00
- merged latest code from mainline branch
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/DataProvider/Breadcrumbs.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/DataProvider/Breadcrumbs.php
@@ -29,8 +29,11 @@ public function __construct(
     }
 
     /**
+     * Get breadcrumbs data
+     *
      * @param string $categoryPath
      * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getData(string $categoryPath): array
     {
@@ -41,7 +44,7 @@ public function getData(string $categoryPath): array
 
         if (count($parentCategoryIds)) {
             $collection = $this->collectionFactory->create();
-            $collection->addAttributeToSelect(['name', 'url_key']);
+            $collection->addAttributeToSelect(['name', 'url_key', 'url_path']);
             $collection->addAttributeToFilter('entity_id', $parentCategoryIds);
 
             foreach ($collection as $category) {
@@ -50,6 +53,7 @@ public function getData(string $categoryPath): array
                     'category_name' => $category->getName(),
                     'category_level' => $category->getLevel(),
                     'category_url_key' => $category->getUrlKey(),
+                    'category_url_path' => $category->getUrlPath(),
                 ];
             }
         }
diff --git a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
@@ -223,6 +223,7 @@ type Breadcrumb @doc(description: "Breadcrumb item."){
     category_name: String @doc(description: "Category name.")
     category_level: Int @doc(description: "Category level.")
     category_url_key: String @doc(description: "Category URL key.")
+    category_url_path: String @doc(description: "Category URL path.")
 }
 
 type CustomizableRadioOption implements CustomizableOptionInterface @doc(description: "CustomizableRadioOption contains information about a set of radio buttons that are defined as part of a customizable option.") {
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml
@@ -57,7 +57,10 @@
         <scrollToTopOfPage stepKey="scrollToTop"/>
         <waitForPageLoad stepKey="waitForApplied"/>
     </actionGroup>
-
+    <actionGroup name="AdminCreateMultipleWebsiteCatalogPriceRule" extends="createCatalogPriceRule">
+        <remove keyForRemoval="selectSite"/>
+        <selectOption selector="{{AdminNewCatalogPriceRule.websites}}" parameterArray="['FirstWebsite', 'SecondWebsite']" stepKey="selectWebsite"/>
+    </actionGroup>
     <actionGroup name="CreateCatalogPriceRuleViaTheUi">
         <arguments>
             <argument name="catalogRule" defaultValue="_defaultCatalogRule"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillNewBillingAddressActionGroup.xml
@@ -28,6 +28,10 @@
         <fillField selector="{{CheckoutPaymentSection.guestPostcode}}" userInput="{{customerAddressVar.postcode}}" stepKey="enterPostcode"/>
         <fillField selector="{{CheckoutPaymentSection.guestTelephone}}" userInput="{{customerAddressVar.telephone}}" stepKey="enterTelephone"/>
     </actionGroup>
+    <actionGroup name="StorefrontCheckoutFillNewBillingAddressActionGroup" extends="GuestCheckoutFillNewBillingAddressActionGroup">
+        <remove keyForRemoval="enterEmail"/>
+        <remove keyForRemoval="waitForLoading3"/>
+    </actionGroup>
 
     <actionGroup name="LoggedInCheckoutFillNewBillingAddressActionGroup">
         <annotations>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutPage.xml b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutPage.xml
@@ -14,5 +14,6 @@
         <section name="CheckoutOrderSummarySection"/>
         <section name="CheckoutSuccessMainSection"/>
         <section name="CheckoutPaymentSection"/>
+        <section name="SelectShippingBillingPopupSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
@@ -42,6 +42,7 @@
         <element name="ProductOptionLinkActiveByProductItemName" type="text" selector="//div[@class='product-item-details']//strong[@class='product-item-name'][text()='{{var1}}']//ancestor::div[@class='product-item-details']//div[@class='product options active']//a[text() = '{{var2}}']" parameterized="true" />
         <element name="shipToInformation" type="text" selector="//div[@class='ship-to']//div[@class='shipping-information-content']" />
         <element name="shippingMethodInformation" type="text" selector="//div[@class='ship-via']//div[@class='shipping-information-content']" />
+        <element name="shippingInformationSection" type="text" selector=".ship-to .shipping-information-content" />
         <element name="paymentMethodTitle" type="text" selector=".payment-method-title span" />
         <element name="productOptionsByProductItemPrice" type="text" selector="//div[@class='product-item-inner']//div[@class='subtotal']//span[@class='price'][contains(.,'{{price}}')]//ancestor::div[@class='product-item-details']//div[@class='product options']" parameterized="true"/>
         <element name="productOptionsActiveByProductItemPrice" type="text" selector="//div[@class='subtotal']//span[@class='price'][contains(.,'{{price}}')]//ancestor::div[@class='product-item-details']//div[@class='product options active']" parameterized="true"/>
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
@@ -249,6 +249,16 @@ define([
             if (this.validateShippingInformation()) {
                 quote.billingAddress(null);
                 checkoutDataResolver.resolveBillingAddress();
+                registry.async('checkoutProvider')(function (checkoutProvider) {
+                    var shippingAddressData = checkoutData.getShippingAddressFromData();
+
+                    if (shippingAddressData) {
+                        checkoutProvider.set(
+                            'shippingAddress',
+                            $.extend(true, {}, checkoutProvider.get('shippingAddress'), shippingAddressData)
+                        );
+                    }
+                });
                 setShippingInformationAction().done(
                     function () {
                         stepNavigator.next();
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
@@ -51,6 +51,21 @@
         <data key="default_shipping">Yes</data>
         <requiredEntity type="region">RegionTX</requiredEntity>
     </entity>
+    <entity name="US_Address_TX_Without_Default" type="address">
+        <data key="firstname">John</data>
+        <data key="lastname">Doe</data>
+        <data key="company">Magento</data>
+        <array key="street">
+            <item>7700 West Parmer Lane</item>
+        </array>
+        <data key="city">Austin</data>
+        <data key="state">Texas</data>
+        <data key="country_id">US</data>
+        <data key="country">United States</data>
+        <data key="postcode">78729</data>
+        <data key="telephone">512-345-6789</data>
+        <requiredEntity type="region">RegionTX</requiredEntity>
+    </entity>
     <entity name="US_Address_TX_Default_Billing" type="address">
         <data key="firstname">John</data>
         <data key="lastname">Doe</data>
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
@@ -47,6 +47,20 @@
         <data key="group">General</data>
         <requiredEntity type="address">US_Address_TX</requiredEntity>
     </entity>
+    <entity name="Simple_US_Customer_Without_Default_Address" type="customer">
+        <data key="group_id">1</data>
+        <data key="default_billing">true</data>
+        <data key="default_shipping">true</data>
+        <data key="email" unique="prefix">John.Doe@example.com</data>
+        <data key="firstname">John</data>
+        <data key="lastname">Doe</data>
+        <data key="fullname">John Doe</data>
+        <data key="password">pwdTest123!</data>
+        <data key="store_id">0</data>
+        <data key="website_id">0</data>
+        <data key="group">General</data>
+        <requiredEntity type="address">US_Address_TX_Without_Default</requiredEntity>
+    </entity>
     <entity name="SimpleUsCustomerWithNewCustomerGroup" type="customer">
         <data key="default_billing">true</data>
         <data key="default_shipping">true</data>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionGroup.xml
@@ -105,7 +105,18 @@
         <waitForElementVisible selector="{{AdminCartPriceRulesFormSection.categoryCheckbox(categoryName)}}" stepKey="waitForCategoryVisible" after="openChooser"/>
         <checkOption selector="{{AdminCartPriceRulesFormSection.categoryCheckbox(categoryName)}}" stepKey="checkCategoryName" after="waitForCategoryVisible"/>
     </actionGroup>
-
+    <actionGroup name="AdminCreateMultiWebsiteCartPriceRuleActionGroup" extends="AdminCreateCartPriceRuleActionGroup">
+        <annotations>
+            <description>EXTENDS: AdminCreateCartPriceRuleActionGroup. Removes 'clickSaveButton' for the next data changing. Assign cart price rule to 2 websites instead of 1.</description>
+        </annotations>
+        <arguments>
+            <argument name="ruleName"/>
+        </arguments>
+        <remove keyForRemoval="clickSaveButton"/>
+        <remove keyForRemoval="seeSuccessMessage"/>
+        <remove keyForRemoval="selectWebsites"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" parameterArray="['FirstWebsite', 'SecondWebsite']" stepKey="selectWebsites" after="fillRuleName"/>
+    </actionGroup>
     <actionGroup name="CreateCartPriceRuleSecondWebsiteActionGroup">
         <annotations>
             <description>Goes to the Admin Cart Price Rule grid page. Clicks on Add New Rule. Fills the provided Rule (Name). Selects 'Second Website' from the 'Websites' menu.</description>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
@@ -19,6 +19,7 @@
         <element name="description" type="textarea" selector="//div[@class='admin__field-control']/textarea[@name='description']"/>
         <element name="active" type="checkbox" selector="//div[@class='admin__actions-switch']/input[@name='is_active']/../label"/>
         <element name="websites" type="multiselect" selector="select[name='website_ids']"/>
+        <element name="websitesOptions" type="select" selector="[name='website_ids'] option"/>
         <element name="customerGroups" type="multiselect" selector="select[name='customer_group_ids']"/>
         <element name="customerGroupsOptions" type="multiselect" selector="select[name='customer_group_ids'] option"/>
         <element name="coupon" type="select" selector="select[name='coupon_type']"/>
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
@@ -502,6 +502,57 @@ public function testAnchorCategory()
         $this->assertEquals($expectedResponse, $response);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+     */
+    public function testBreadCrumbs()
+    {
+        /** @var CategoryCollection $categoryCollection */
+        $categoryCollection = $this->objectManager->create(CategoryCollection::class);
+        $categoryCollection->addFieldToFilter('name', 'Category 1.1.1');
+        /** @var CategoryInterface $category */
+        $category = $categoryCollection->getFirstItem();
+        $categoryId = $category->getId();
+        $this->assertNotEmpty($categoryId, "Preconditions failed: category is not available.");
+        $query = <<<QUERY
+{
+  category(id: {$categoryId}) {
+    name
+    breadcrumbs {
+      category_id
+      category_name
+      category_level
+      category_url_key
+      category_url_path
+    }
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+        $expectedResponse = [
+            'category' => [
+                'name' => 'Category 1.1.1',
+                'breadcrumbs' => [
+                    [
+                        'category_id' => 3,
+                        'category_name' => "Category 1",
+                        'category_level' => 2,
+                        'category_url_key' => "category-1",
+                        'category_url_path' => "category-1"
+                    ],
+                    [
+                        'category_id' => 4,
+                        'category_name' => "Category 1.1",
+                        'category_level' => 3,
+                        'category_url_key' => "category-1-1",
+                        'category_url_path' => "category-1/category-1-1"
+                    ],
+                ]
+            ]
+        ];
+        $this->assertEquals($expectedResponse, $response);
+    }
+
     /**
      * @param ProductInterface $product
      * @param array $actualResponse
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/ConfigurableTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/ConfigurableTest.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ConfigurableProduct\Block\Cart\Item\Renderer;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\ConfigurableProduct\Block\Cart\Item\Renderer\Configurable as ConfigurableRenderer;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\View\LayoutInterface;
+
+/**
+ * Test \Magento\ConfigurableProduct\Block\Cart\Item\Renderer\Configurable block
+ *
+ * @magentoAppArea frontend
+ */
+class ConfigurableTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ConfigurableRenderer
+     */
+    private $block;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->block = $this->objectManager->get(LayoutInterface::class)
+            ->createBlock(ConfigurableRenderer::class);
+    }
+
+    /**
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/quote_with_configurable_product.php
+     */
+    public function testGetProductPriceHtml()
+    {
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $configurableProduct = $productRepository->getById(1);
+
+        $layout = $this->objectManager->get(LayoutInterface::class);
+        $layout->createBlock(
+            \Magento\Framework\Pricing\Render::class,
+            'product.price.render.default',
+            [
+                'data' => [
+                    'price_render_handle' => 'catalog_product_prices',
+                    'use_link_for_as_low_as' => true
+                ]
+            ]
+        );
+
+        $this->block->setItem(
+            $this->block->getCheckoutSession()->getQuote()->getAllVisibleItems()[0]
+        );
+        $html = $this->block->getProductPriceHtml($configurableProduct);
+        $this->assertContains('<span class="price">$10.00</span>', $html);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,11 @@ public function __construct(`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`/**`
	`32`	`+ * Get breadcrumbs data`
	`33`	`+ *`
`32`	`34`	`* @param string $categoryPath`
`33`	`35`	`* @return array`
	`36`	`+ * @throws \Magento\Framework\Exception\LocalizedException`
`34`	`37`	`*/`
`35`	`38`	`public function getData(string $categoryPath): array`
`36`	`39`	`{`
`@@ -41,7 +44,7 @@ public function getData(string $categoryPath): array`
`41`	`44`
`42`	`45`	`if (count($parentCategoryIds)) {`
`43`	`46`	`$collection = $this->collectionFactory->create();`
`44`		`- $collection->addAttributeToSelect(['name', 'url_key']);`
	`47`	`+ $collection->addAttributeToSelect(['name', 'url_key', 'url_path']);`
`45`	`48`	`$collection->addAttributeToFilter('entity_id', $parentCategoryIds);`
`46`	`49`
`47`	`50`	`foreach ($collection as $category) {`
`@@ -50,6 +53,7 @@ public function getData(string $categoryPath): array`
`50`	`53`	`'category_name' => $category->getName(),`
`51`	`54`	`'category_level' => $category->getLevel(),`
`52`	`55`	`'category_url_key' => $category->getUrlKey(),`
	`56`	`+ 'category_url_path' => $category->getUrlPath(),`
`53`	`57`	`];`
`54`	`58`	`}`
`55`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -223,6 +223,7 @@ type Breadcrumb @doc(description: "Breadcrumb item."){`
`223`	`223`	`category_name: String @doc(description: "Category name.")`
`224`	`224`	`category_level: Int @doc(description: "Category level.")`
`225`	`225`	`category_url_key: String @doc(description: "Category URL key.")`
	`226`	`+ category_url_path: String @doc(description: "Category URL path.")`
`226`	`227`	`}`
`227`	`228`
`228`	`229`	`type CustomizableRadioOption implements CustomizableOptionInterface @doc(description: "CustomizableRadioOption contains information about a set of radio buttons that are defined as part of a customizable option.") {`