Merge pull request #3111 from magento-honey-badgers/2.3-regression-pr-HB

cpartica · web-flow · commit 5c70bb78702e · 2018-09-02T16:26:35.000-05:00
[2.3 regression team] Bugs
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptions.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptions.xml
@@ -95,6 +95,7 @@
         <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionField.title}}" stepKey="seeProductOptionFieldInput1"/>
         <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionArea.title}}" stepKey="seeProductOptionAreaInput1"/>
         <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{productWithOptions.file}}" stepKey="seeProductOptionFileInput1"/>
+        <seeElement selector="{{CheckoutPaymentSection.ProductOptionLinkActiveByProductItemName($createProduct.name$, productWithOptions.file)}}" stepKey="seeProductOptionFileInputLink1"/>
         <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionValueDropdown1.title}}" stepKey="seeProductOptionValueDropdown1Input1"/>
         <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionValueRadioButtons1.title}}" stepKey="seeProductOptionValueRadioButtons1Input1"/>
         <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionValueCheckbox.title}}" stepKey="seeProductOptionValueCheckboxInput1" />
@@ -128,6 +129,7 @@
         <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionField.title}}" stepKey="seeAdminOrderProductOptionField" />
         <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionArea.title}}" stepKey="seeAdminOrderProductOptionArea"/>
         <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{productWithOptions.file}}" stepKey="seeAdminOrderProductOptionFile"/>
+        <seeElement selector="{{AdminOrderItemsOrderedSection.productNameOptionsLink(productWithOptions.file)}}" stepKey="seeAdminOrderProductOptionFileLink"/>
         <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueDropdown1.title}}" stepKey="seeAdminOrderProductOptionValueDropdown1"/>
         <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueRadioButtons1.title}}" stepKey="seeAdminOrderProductOptionValueRadioButton1"/>
         <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueCheckbox.title}}" stepKey="seeAdminOrderProductOptionValueCheckbox" />
@@ -144,6 +146,7 @@
         <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionField.title}}" stepKey="seeAdminOrderProductOptionField1" />
         <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionArea.title}}" stepKey="seeAdminOrderProductOptionArea1"/>
         <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{productWithOptions.file}}" stepKey="seeAdminOrderProductOptionFile1"/>
+        <seeElement selector="{{AdminOrderItemsOrderedSection.productNameOptionsLink(productWithOptions.file)}}" stepKey="seeAdminOrderProductOptionFileLink1"/>
         <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueDropdown1.title}}" stepKey="seeAdminOrderProductOptionValueDropdown11"/>
         <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueRadioButtons1.title}}" stepKey="seeAdminOrderProductOptionValueRadioButton11"/>
         <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueCheckbox.title}}" stepKey="seeAdminOrderProductOptionValueCheckbox1" />
@@ -161,6 +164,7 @@
         <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionField.title, ProductOptionField.title)}}" userInput="{{ProductOptionField.title}}" stepKey="seeStorefontOrderProductOptionField1" />
         <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionArea.title, ProductOptionArea.title)}}" userInput="{{ProductOptionArea.title}}" stepKey="seeStorefontOrderProductOptionArea1"/>
         <see selector="{{StorefrontCustomerOrderSection.productCustomOptionsFile($createProduct.name$, ProductOptionFile.title, productWithOptions.file)}}" userInput="{{productWithOptions.file}}" stepKey="seeStorefontOrderProductOptionFile1"/>
+        <seeElement selector="{{StorefrontCustomerOrderSection.productCustomOptionsLink($createProduct.name$, ProductOptionFile.title, productWithOptions.file)}}" stepKey="seeStorefontOrderProductOptionFileLink1"/>
         <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionDropDown.title, ProductOptionValueDropdown1.title)}}" userInput="{{ProductOptionValueDropdown1.title}}" stepKey="seeStorefontOrderProductOptionValueDropdown11"/>
         <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionRadiobutton.title, ProductOptionValueRadioButtons1.title)}}" userInput="{{ProductOptionValueRadioButtons1.title}}" stepKey="seeStorefontOrderProductOptionValueRadioButtons11"/>
         <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionCheckbox.title, ProductOptionValueCheckbox.title)}}" userInput="{{ProductOptionValueCheckbox.title}}" stepKey="seeStorefontOrderProductOptionValueCheckbox1" />
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
@@ -36,6 +36,7 @@
         <element name="ProductItemByName" type="text" selector="//div[@class='product-item-details']//strong[@class='product-item-name'][text()='{{var1}}']" parameterized="true" />
         <element name="ProductOptionsByProductItemName" 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']" parameterized="true" />
         <element name="ProductOptionsActiveByProductItemName" 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']" parameterized="true" />
+        <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="paymentMethodTitle" type="text" selector=".payment-method-title span" />
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html b/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
@@ -45,7 +45,7 @@
                                 <span data-bind="html: option.value.join('<br>')"></span>
                             <!-- /ko -->
                             <!-- ko ifnot: Array.isArray(option.value) -->
-                                <span data-bind="text: option.value"></span>
+                                <span data-bind="html: option.value"></span>
                             <!-- /ko -->
                         </dd>
                         <!-- /ko -->
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html
@@ -35,7 +35,7 @@
                     <dd class="values" data-bind="html: full_view"></dd>
                     <!-- /ko -->
                     <!-- ko ifnot: ($data.full_view)-->
-                    <dd class="values" data-bind="text: value"></dd>
+                    <dd class="values" data-bind="html: value"></dd>
                     <!-- /ko -->
                 <!-- /ko -->
             </dl>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderSection.xml
@@ -11,5 +11,6 @@
     <section name="StorefrontCustomerOrderSection">
         <element name="productCustomOptions" type="text" selector="//strong[contains(@class, 'product-item-name') and normalize-space(.)='{{var1}}']/following-sibling::*[contains(@class, 'item-options')]/dt[normalize-space(.)='{{var2}}']/following-sibling::dd[normalize-space(.)='{{var3}}']" parameterized="true"/>
         <element name="productCustomOptionsFile" type="text" selector="//strong[contains(@class, 'product-item-name') and normalize-space(.)='{{var1}}']/following-sibling::*[contains(@class, 'item-options')]/dt[normalize-space(.)='{{var2}}']/following-sibling::dd[contains(.,'{{var3}}')]" parameterized="true"/>
+        <element name="productCustomOptionsLink" type="text" selector="//strong[contains(@class, 'product-item-name') and normalize-space(.)='{{var1}}']/following-sibling::*[contains(@class, 'item-options')]/dt[normalize-space(.)='{{var2}}']/following-sibling::dd//a[text() = '{{var3}}']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Paypal/Controller/Payflow/ReturnUrl.php b/app/code/Magento/Paypal/Controller/Payflow/ReturnUrl.php
@@ -68,6 +68,7 @@ public function execute()
             if ($order->getIncrementId()) {
                 if ($this->checkOrderState($order)) {
                     $redirectBlock->setData('goto_success_page', true);
+                    $this->_eventManager->dispatch('paypal_checkout_success', ['order' => $order]);
                 } else {
                     if ($this->checkPaymentMethod($order)) {
                         $gotoSection = $this->_cancelPayment((string)$this->getRequest()->getParam('RESPMSG'));
diff --git a/app/code/Magento/Paypal/Test/Unit/Controller/Payflow/ReturnUrlTest.php b/app/code/Magento/Paypal/Test/Unit/Controller/Payflow/ReturnUrlTest.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Paypal\Test\Unit\Controller\Payflow;
 
+use Magento\Framework\Event\ManagerInterface;
 use Magento\Sales\Api\PaymentFailuresInterface;
 use Magento\Checkout\Block\Onepage\Success;
 use Magento\Checkout\Model\Session;
@@ -96,6 +97,11 @@ class ReturnUrlTest extends \PHPUnit\Framework\TestCase
      */
     private $paymentFailures;
 
+    /**
+     * @var ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $eventManagerMock;
+
     /**
      * @inheritdoc
      */
@@ -148,25 +154,31 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->context->expects($this->any())->method('getView')->willReturn($this->view);
-        $this->context->expects($this->any())->method('getRequest')->willReturn($this->request);
-
         $this->paymentFailures = $this->getMockBuilder(PaymentFailuresInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->eventManagerMock = $this->getMockBuilder(ManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->context->method('getView')
             ->willReturn($this->view);
         $this->context->method('getRequest')
             ->willReturn($this->request);
-
-        $this->returnUrl = $this->objectManager->getObject(ReturnUrl::class, [
-            'context' => $this->context,
-            'checkoutSession' => $this->checkoutSession,
-            'orderFactory' => $this->orderFactory,
-            'checkoutHelper' => $this->checkoutHelper,
-            'paymentFailures' => $this->paymentFailures,
-        ]);
+        $this->context->method('getEventManager')
+            ->willReturn($this->eventManagerMock);
+
+        $this->returnUrl = $this->objectManager->getObject(
+            ReturnUrl::class,
+            [
+                'context' => $this->context,
+                'checkoutSession' => $this->checkoutSession,
+                'orderFactory' => $this->orderFactory,
+                'checkoutHelper' => $this->checkoutHelper,
+                'paymentFailures' => $this->paymentFailures,
+            ]
+        );
     }
 
     /**
@@ -187,6 +199,10 @@ public function testExecuteAllowedOrderState($state)
             ->with('goto_success_page', true)
             ->willReturnSelf();
 
+        $this->eventManagerMock->expects($this->once())
+            ->method('dispatch')
+            ->with('paypal_checkout_success', $this->arrayHasKey('order'));
+
         $result = $this->returnUrl->execute();
         $this->assertNull($result);
     }
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderItemsOrderedSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderItemsOrderedSection.xml
@@ -23,6 +23,7 @@
 
         <element name="productNameColumn" type="text" selector=".edit-order-table .col-product .product-title"/>
         <element name="productNameOptions" type="text" selector=".edit-order-table .col-product .item-options"/>
+        <element name="productNameOptionsLink" type="text" selector="//table[contains(@class, 'edit-order-table')]//td[contains(@class, 'col-product')]//a[text() = '{{var1}}']" parameterized="true"/>
         <element name="productSkuColumn" type="text" selector=".edit-order-table .col-product .product-sku-block"/>
         <element name="statusColumn" type="text" selector=".edit-order-table .col-status"/>
         <element name="originalPriceColumn" type="text" selector=".edit-order-table .col-original-price .price"/>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml
@@ -20,9 +20,9 @@ $_item = $block->getItem();
                 <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                 <dd>
                     <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                        <?= $block->escapeHtml($_formatedOptionValue['full_view']) ?>
+                        <?= $block->escapeHtml($_formatedOptionValue['full_view'], ['a']) ?>
                     <?php else: ?>
-                        <?=$block->escapeHtml($_formatedOptionValue['value']) ?>
+                        <?=$block->escapeHtml($_formatedOptionValue['value'], ['a']) ?>
                     <?php endif; ?>
                 </dd>
             <?php else: ?>
diff --git a/app/code/Magento/Signifyd/Observer/PlaceOrder.php b/app/code/Magento/Signifyd/Observer/PlaceOrder.php
@@ -10,6 +10,7 @@
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Exception\AlreadyExistsException;
 use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Model\Order;
 use Magento\Signifyd\Api\CaseCreationServiceInterface;
 use Magento\Signifyd\Model\Config;
 use Psr\Log\LoggerInterface;
@@ -80,7 +81,9 @@ public function execute(Observer $observer)
     private function createCaseForOrder($order)
     {
         $orderId = $order->getEntityId();
-        if (null === $orderId || $order->getPayment()->getMethodInstance()->isOffline()) {
+        if (null === $orderId
+            || $order->getPayment()->getMethodInstance()->isOffline()
+            || $order->getState() === Order::STATE_PENDING_PAYMENT) {
             return;
         }
 
diff --git a/app/code/Magento/Signifyd/Test/Unit/Observer/PlaceOrderTest.php b/app/code/Magento/Signifyd/Test/Unit/Observer/PlaceOrderTest.php
@@ -10,6 +10,7 @@
 use Magento\Framework\Exception\AlreadyExistsException;
 use Magento\Payment\Model\MethodInterface;
 use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Payment;
 use Magento\Signifyd\Api\CaseCreationServiceInterface;
 use Magento\Signifyd\Model\Config;
@@ -193,6 +194,23 @@ public function testExecute()
         $this->placeOrder->execute($this->observer);
     }
 
+    public function testExecuteWithOrderPendingPayment()
+    {
+        $orderId = 1;
+        $storeId = 2;
+
+        $this->withActiveSignifydIntegration(true, $storeId);
+        $this->withOrderEntity($orderId, $storeId);
+        $this->orderEntity->method('getState')
+            ->willReturn(Order::STATE_PENDING_PAYMENT);
+        $this->withAvailablePaymentMethod(true);
+
+        $this->creationService->expects(self::never())
+            ->method('createForOrder');
+
+        $this->placeOrder->execute($this->observer);
+    }
+
     /**
      * Specifies order entity mock execution.
      *
diff --git a/app/code/Magento/Signifyd/etc/events.xml b/app/code/Magento/Signifyd/etc/events.xml
@@ -12,4 +12,7 @@
     <event name="paypal_express_place_order_success">
         <observer name="signifyd_place_order_paypal_express_observer" instance="Magento\Signifyd\Observer\PlaceOrder"/>
     </event>
+    <event name="paypal_checkout_success">
+        <observer name="signifyd_place_order_checkout_success_observer" instance="Magento\Signifyd\Observer\PlaceOrder" />
+    </event>
 </config>
diff --git a/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less
@@ -35,12 +35,19 @@
             .items {
                 text-align: left;
                 .item {
+                    > span {
+                        display: block;
+                        padding: 5px 5px 5px 23px;
+                    }
                     &:last-child {
                         &:hover {
                             .lib-css(background, @dropdown-list-item__hover);
                         }
                     }
                 }
+                li {
+                    padding: 0;
+                }
             }
 
             .table-comparison &,
diff --git a/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less
@@ -40,6 +40,16 @@
             .items {
                 padding: 6px 0;
                 text-align: left;
+                .item {
+                    > span {
+                        display: block;
+                        padding: 5px 5px 5px 23px;
+                    }
+
+                }
+                li {
+                    padding: 0;
+                }
             }
 
             > .action {
diff --git a/lib/internal/Magento/Framework/View/Asset/Minification.php b/lib/internal/Magento/Framework/View/Asset/Minification.php
@@ -162,7 +162,16 @@ public function getExcludes($contentType)
     private function getMinificationExcludeValues($key)
     {
         $configValues = $this->scopeConfig->getValue($key, $this->scope) ?? [];
-
+        //value used to be a string separated by 'newline' separator so we need to convert it to array
+        if (!is_array($configValues)) {
+            $configValuesFromString = [];
+            foreach (explode("\n", $configValues) as $exclude) {
+                if (trim($exclude) != '') {
+                    $configValuesFromString[] = trim($exclude);
+                }
+            }
+            $configValues = $configValuesFromString;
+        }
         return array_values($configValues);
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/MinificationTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/MinificationTest.php
@@ -195,6 +195,8 @@ public function isMinifiedFilenameDataProvider()
     }
 
     /**
+     * Test dev/js/minify_exclude system value as array
+     *
      * @return void
      */
     public function testGetExcludes()
@@ -213,4 +215,38 @@ public function testGetExcludes()
         /** check cache: */
         $this->assertEquals($expected, $this->minification->getExcludes('js'));
     }
+
+    /**
+     * Test dev/js/minify_exclude system value backward compatibility when value was a string
+     *
+     * @param string $value
+     * @param array $expectedValue
+     * @return void
+     *
+     * @dataProvider getExcludesTinyMceAsStringDataProvider
+     */
+    public function testGetExcludesTinyMceAsString(string $value, array $expectedValue)
+    {
+        $this->scopeConfigMock
+            ->expects($this->once())
+            ->method('getValue')
+            ->with('dev/js/minify_exclude')
+            ->willReturn($value);
+
+        $this->assertEquals($expectedValue, $this->minification->getExcludes('js'));
+        /** check cache: */
+        $this->assertEquals($expectedValue, $this->minification->getExcludes('js'));
+    }
+
+    /**
+     * @return array
+     */
+    public function getExcludesTinyMceAsStringDataProvider()
+    {
+        return [
+            ["/tiny_mce/  \n  /tiny_mce2/", ['/tiny_mce/', '/tiny_mce2/']],
+            ['/tiny_mce/', ['/tiny_mce/']],
+            [' /tiny_mce/', ['/tiny_mce/']],
+        ];
+    }
 }
