merge magento/2.3-develop into magento-obsessive-owls/MAGETWO-56442

magento-cicd2 · web-flow · commit d41ef98162e3 · 2019-05-22T08:00:50.000-07:00
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml
@@ -12,10 +12,10 @@
             <features value="Catalog"/>
             <stories value="MAGETWO-51484-Input type configuration for custom Product Attributes"/>
             <group value="Catalog"/>
-            <title value="Admin should be able to switch between two versions of TinyMCE"/>
-            <description value="Admin should be able to switch between two versions of TinyMCE"/>
+            <title value="Admin are able to change Input Type of Text Editor product attribute"/>
+            <description value="Admin are able to change Input Type of Text Editor product attribute"/>
             <severity value="CRITICAL"/>
-            <testCaseId value="MAGETWO-85745"/>
+            <testCaseId value="MC-6215"/>
         </annotations>
         <before>
             <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
@@ -15,7 +15,7 @@
             <title value="Admin should be able to sell products with different variants of their own"/>
             <description value="Admin should be able to sell products with different variants of their own"/>
             <severity value="CRITICAL"/>
-            <testCaseId value="MAGETWO-58184"/>
+            <testCaseId value="MC-16476"/>
             <group value="product"/>
         </annotations>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
@@ -12,10 +12,10 @@
         <annotations>
             <features value="Catalog"/>
             <stories value="Purchase a product with Custom Options of different types"/>
-            <title value="Admin should be able to sell products with different variants of their own"/>
-            <description value="Admin should be able to sell products with different variants of their own"/>
+            <title value="Admin should be able to sell products with custom options of different types"/>
+            <description value="Admin should be able to sell products with custom options of different types"/>
             <severity value="CRITICAL"/>
-            <testCaseId value="MAGETWO-61717"/>
+            <testCaseId value="MC-16462"/>
             <group value="Catalog"/>
         </annotations>
         <before>
diff --git a/app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php b/app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php
@@ -393,4 +393,40 @@ public function dataProviderGetSavePercent()
             ['basePrice' => '20.80', 'tierPrice' => '18.72', 'savedPercent' => '10']
         ];
     }
+
+    /**
+     * @param null|string|float $quantity
+     * @param float $expectedValue
+     * @dataProvider getQuantityDataProvider
+     */
+    public function testGetQuantity($quantity, $expectedValue)
+    {
+        $tierPrice = new TierPrice(
+            $this->product,
+            $quantity,
+            $this->calculator,
+            $this->priceCurrencyMock,
+            $this->session,
+            $this->groupManagement,
+            $this->customerGroupRetriever
+        );
+
+        $this->assertEquals($expectedValue, $tierPrice->getQuantity());
+    }
+
+    /**
+     * @return array
+     */
+    public function getQuantityDataProvider()
+    {
+        return [
+            [null, 1],
+            ['one', 1],
+            ['', 1],
+            [4, 4],
+            [4.5, 4.5],
+            ['0.7', 0.7],
+            ['0.0000000', 1]
+        ];
+    }
 }
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldShouldNotAcceptJustIntegerValuesTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldShouldNotAcceptJustIntegerValuesTest.xml
@@ -12,10 +12,10 @@
         <annotations>
             <features value="Checkout"/>
             <stories value="MAGETWO-91465"/>
-            <title value="Guest Checkout"/>
+            <title value="Guest Checkout - address State field should not allow just integer values"/>
             <description value="Address State field should not allow just integer values"/>
             <severity value="MAJOR"/>
-            <testCaseId value="MAGETWO-93203"/>
+            <testCaseId value="MC-6223"/>
             <group value="checkout"/>
         </annotations>
         <before>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/CheckCheckoutSuccessPageTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/CheckCheckoutSuccessPageTest.xml
@@ -15,7 +15,7 @@
             <title value="Customer Checkout"/>
             <description value="To be sure that other elements of Success page are shown for placed order as registered Customer."/>
             <severity value="CRITICAL"/>
-            <testCaseId value="MAGETWO-60345"/>
+            <testCaseId value="MC-16488"/>
             <group value="checkout"/>
         </annotations>
 
@@ -135,10 +135,10 @@
         <annotations>
             <features value="Checkout"/>
             <stories value="Success page elements are presented for placed order as Guest"/>
-            <title value="Customer Checkout"/>
-            <description value="To be sure that other elements of Success page are presented for placed order as Guest."/>
+            <title value="Guest Checkout - elements of success page are presented for placed order as guest"/>
+            <description value="To be sure that other elements of Success page are presented for placed order as Guest"/>
             <severity value="CRITICAL"/>
-            <testCaseId value="MAGETWO-60346"/>
+            <testCaseId value="MC-16490"/>
             <group value="checkout"/>
         </annotations>
 
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml
@@ -12,7 +12,7 @@
         <annotations>
             <features value="Checkout"/>
             <stories value="Checkout via the Admin"/>
-            <title value="Customer Checkout"/>
+            <title value="Customer Checkout via the Admin"/>
             <description value="Should be able to place an order as a customer."/>
             <severity value="CRITICAL"/>
             <testCaseId value="MC-5922"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest.xml
@@ -12,10 +12,10 @@
         <annotations>
             <features value="Checkout"/>
             <stories value="Checkout via Guest Checkout"/>
-            <title value="Guest Checkout"/>
-            <description value="Should be able to place an order as a Guest."/>
+            <title value="Guest Checkout - guest should be able to place an order"/>
+            <description value="Should be able to place an order as a Guest"/>
             <severity value="CRITICAL"/>
-            <testCaseId value="MAGETWO-72094"/>
+            <testCaseId value="MC-12825"/>
             <group value="checkout"/>
         </annotations>
         <before>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPal.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPal.xml
@@ -15,7 +15,7 @@
             <title value="Conflict resolution for PayPal in United Kingdom"/>
             <description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country United Kingdom"/>
             <severity value="Major"/>
-            <testCaseId value="MC-13146"/>
+            <testCaseId value="MC-16679"/>
             <group value="paypal"/>
         </annotations>
         <before>
@@ -120,7 +120,7 @@
             <title value="Conflict resolution for PayPal in France"/>
             <description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country France"/>
             <severity value="Major"/>
-            <testCaseId value="MC-13146"/>
+            <testCaseId value="MC-16675"/>
             <group value="paypal"/>
         </annotations>
         <selectOption selector="{{PaymentsConfigSection.merchantCountry}}" userInput="France" stepKey="setMerchantCountry"/>
@@ -160,7 +160,7 @@
             <title value="Conflict resolution for PayPal in Hong Kong"/>
             <description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country Hong Kong"/>
             <severity value="Major"/>
-            <testCaseId value="MC-13146"/>
+            <testCaseId value="MC-16676"/>
             <group value="paypal"/>
         </annotations>
         <selectOption selector="{{PaymentsConfigSection.merchantCountry}}" userInput="Hong Kong SAR China" stepKey="setMerchantCountry"/>
@@ -200,7 +200,7 @@
             <title value="Conflict resolution for PayPal in Italy"/>
             <description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country Italy"/>
             <severity value="Major"/>
-            <testCaseId value="MC-13146"/>
+            <testCaseId value="MC-16677"/>
             <group value="paypal"/>
         </annotations>
         <selectOption selector="{{PaymentsConfigSection.merchantCountry}}" userInput="Italy" stepKey="setMerchantCountry"/>
@@ -240,7 +240,7 @@
             <title value="Conflict resolution for PayPal in Spain"/>
             <description value="A popup should show when enabling different paypal solutions when one is already enabled for merchant country Spain"/>
             <severity value="Major"/>
-            <testCaseId value="MC-13146"/>
+            <testCaseId value="MC-16678"/>
             <group value="paypal"/>
         </annotations>
         <selectOption selector="{{PaymentsConfigSection.merchantCountry}}" userInput="Spain" stepKey="setMerchantCountry"/>
diff --git a/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml b/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml
@@ -16,7 +16,7 @@
             <title value="Admin should able to switch between versions of TinyMCE"/>
             <description value="Admin should able to switch between versions of TinyMCE"/>
             <severity value="CRITICAL"/>
-            <testCaseId value="MAGETWO-82936"/>
+            <testCaseId value="MC-6114"/>
         </annotations>
         <before>
             <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest.xml
@@ -14,7 +14,7 @@
             <title value="Url Rewrites Correctly Generated for Multiple Storeviews During Product Import"/>
             <description value="Check Url Rewrites Correctly Generated for Multiple Storeviews During Product Import."/>
             <severity value="CRITICAL"/>
-            <testCaseId value="MAGETWO-68980"/>
+            <testCaseId value="MC-12656"/>
             <group value="urlRewrite"/>
         </annotations>
         <before>
@@ -118,10 +118,10 @@
         <annotations>
             <features value="Url Rewrite"/>
             <stories value="Url Rewrites for Multiple Storeviews"/>
-            <title value="Url Rewrites Correctly Generated for Multiple Storeviews During Product Import"/>
+            <title value="Url Rewrites Correctly Generated for Multiple Storeviews During Product Import With Configuration Turned Off"/>
             <description value="Check Url Rewrites Correctly Generated for Multiple Storeviews During Product Import."/>
             <severity value="CRITICAL"/>
-            <testCaseId value="MAGETWO-94801"/>
+            <testCaseId value="MC-6802"/>
             <group value="urlRewrite"/>
         </annotations>
         <before>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUrlRewritesForProductInAnchorCategoriesTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUrlRewritesForProductInAnchorCategoriesTest.xml
@@ -14,7 +14,7 @@
             <title value="Url-rewrites for product in anchor categories"/>
             <description value="For a product with category that has parent anchor categories, the rewrites is created when the category/product is saved."/>
             <severity value="CRITICAL"/>
-            <testCaseId value="MAGETWO-76098"/>
+            <testCaseId value="MC-16568"/>
             <group value="urlRewrite"/>
         </annotations>
 
@@ -83,10 +83,10 @@
         <annotations>
             <features value="Url Rewrite"/>
             <stories value="Url-rewrites for product in anchor categories"/>
-            <title value="Url-rewrites for product in anchor categories"/>
+            <title value="Url-rewrites for product in anchor categories with configuration turned off"/>
             <description value="For a product with category that has parent anchor categories, the rewrites is created when the category/product is saved."/>
             <severity value="CRITICAL"/>
-            <testCaseId value="MAGETWO-94800"/>
+            <testCaseId value="MC-6844"/>
             <group value="urlRewrite"/>
         </annotations>
 
@@ -183,10 +183,10 @@
         <annotations>
             <features value="Url Rewrite"/>
             <stories value="Url-rewrites for product in anchor categories for all store views"/>
-            <title value="Url-rewrites for product in anchor categories"/>
+            <title value="Url-rewrites for product in anchor categories for all store views"/>
             <description value="Verify that Saving category do not delete UrlRewrites for subcategories and all products in them."/>
             <severity value="CRITICAL"/>
-            <testCaseId value="MAGETWO-76301"/>
+            <testCaseId value="MC-16681"/>
             <group value="urlRewrite"/>
         </annotations>
         <before>
@@ -210,10 +210,10 @@
         <annotations>
             <features value="Url Rewrite"/>
             <stories value="Url-rewrites for product in anchor categories for all store views"/>
-            <title value="Url-rewrites for product in anchor categories"/>
-            <description value="Verify that Saving category do not delete UrlRewrites for subcategories and all products in them."/>
+            <title value="Url-rewrites for product in anchor categories for all store views with configuration turned off"/>
+            <description value="Url-rewrites for product in anchor categories for all store views with configuration turned off"/>
             <severity value="CRITICAL"/>
-            <testCaseId value="MAGETWO-94802"/>
+            <testCaseId value="MC-6964"/>
             <group value="urlRewrite"/>
         </annotations>
         <before>
diff --git a/dev/tests/integration/testsuite/Magento/Reports/Controller/Adminhtml/Report/Product/SoldTest.php b/dev/tests/integration/testsuite/Magento/Reports/Controller/Adminhtml/Report/Product/SoldTest.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Reports\Controller\Adminhtml\Report\Product;
+
+/**
+ * @magentoAppArea adminhtml
+ */
+class SoldTest extends \Magento\TestFramework\TestCase\AbstractBackendController
+{
+    public function testExecute()
+    {
+        $this->dispatch('backend/reports/report_product/sold');
+        $actual = $this->getResponse()->getBody();
+        $this->assertContains('Ordered Products Report', $actual);
+        //verify if SKU column is presented on grid
+        $this->assertContains('SKU', $actual);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Reports/Model/ResourceModel/Report/Sold/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Reports/Model/ResourceModel/Report/Sold/CollectionTest.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Reports\Model\ResourceModel\Report\Sold;
+
+/**
+ * Class CollectionTest
+ */
+class CollectionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Reports\Model\ResourceModel\Product\Sold\Collection
+     */
+    private $collection;
+
+    protected function setUp()
+    {
+        /**
+         * @var \Magento\Reports\Model\ResourceModel\Product\Sold\Collection
+         */
+        $this->collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Reports\Model\ResourceModel\Product\Sold\Collection::class
+        );
+    }
+
+    /**
+     * @magentoDataFixture Magento/Sales/_files/order_item_with_configurable_for_reorder.php
+     */
+    public function testFilterByProductTypeException()
+    {
+        $items = $this->collection->addOrderedQty()->getItems();
+        $this->assertEquals(1, count($items));
+        $orderItem = array_shift($items);
+        $this->assertEquals('1.0000', $orderItem['ordered_qty']);
+        $this->assertEquals('Configurable Product', $orderItem['order_items_name']);
+        //verify if order_item_sku exists in return data
+        $this->assertEquals('simple_20', $orderItem['order_items_sku']);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Review/Block/Product/ReviewRendererTest.php b/dev/tests/integration/testsuite/Magento/Review/Block/Product/ReviewRendererTest.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Review\Block\Product;
+
+/**
+ * Class ReviewRendererTest
+ */
+class ReviewRendererTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Test verifies ReviewRenderer::getReviewsSummaryHtml call with $displayIfNoReviews = false
+     * The reviews summary will be shown as expected only if there is at least one review available
+     *
+     * @magentoDataFixture Magento/Review/_files/different_reviews.php
+     * @magentoAppArea frontend
+     */
+    public function testGetReviewSummaryHtml()
+    {
+        $productSku = 'simple';
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+        $productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $product = $productRepository->get($productSku);
+        /** @var  ReviewRenderer $reviewRenderer */
+        $reviewRenderer = $objectManager->create(ReviewRenderer::class);
+        $actualResult = $reviewRenderer->getReviewsSummaryHtml($product);
+        $this->assertEquals(2, $reviewRenderer->getReviewsCount());
+        $this->assertContains('<span itemprop="reviewCount">2</span>', $actualResult);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Review/_files/different_reviews.php b/dev/tests/integration/testsuite/Magento/Review/_files/different_reviews.php
@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 
+// phpcs:ignore Magento2.Security.IncludeFile
 require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
 
 $review = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
@@ -71,3 +72,4 @@
         )->getStore()->getId()
     ]
 )->save();
+$review->aggregate();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_item_with_configurable_for_reorder.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_item_with_configurable_for_reorder.php
@@ -7,10 +7,11 @@
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\ProductRepository;
 
+// phpcs:ignore Magento2.Security.IncludeFile
 require __DIR__ . '/../../../Magento/ConfigurableProduct/_files/product_configurable.php';
 
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
+// phpcs:ignore Magento2.Security.IncludeFile
 $addressData = include __DIR__ . '/../../../Magento/Sales/_files/address_data.php';
 
 $billingAddress = $objectManager->create(\Magento\Sales\Model\Order\Address::class, ['data' => $addressData]);
@@ -62,6 +63,8 @@
 $orderItem->setProductType($product->getTypeId());
 $orderItem->setProductOptions(['info_buyRequest' => $requestInfo]);
 $orderItemSimple->setProductId($simpleProduct->getId());
+$orderItem->setName($product->getName());
+$orderItem->setSku($simpleProduct->getSku());
 $orderItemSimple->setParentItem($orderItem);
 $orderItemSimple->setStoreId(0);
 $orderItemSimple->setProductType($simpleProduct->getTypeId());
diff --git a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonConverterTest.php b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonConverterTest.php
