Merge 2.3-develop into 2.3.6-develop

dvoskoboinikov · web-flow · commit f20fb6db06e4 · 2020-08-03T14:06:32.000-05:00
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js b/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
@@ -56,6 +56,9 @@ define([
             if (this.options.isMultipleCountriesAllowed) {
                 this.element.parents('div.field').show();
                 this.element.on('change', $.proxy(function (e) {
+                    // clear region inputs on country change
+                    $(this.options.regionListId).val('');
+                    $(this.options.regionInputId).val('');
                     this._updateRegion($(e.target).val());
                 }, this));
 
@@ -165,9 +168,6 @@ define([
             this._clearError();
             this._checkRegionRequired(country);
 
-            $(regionList).find('option:selected').removeAttr('selected');
-            regionInput.val('');
-
             // Populate state/province dropdown list if available or use input box
             if (this.options.regionJson[country]) {
                 this._removeSelectOptions(regionList);
diff --git a/app/code/Magento/Paypal/Model/AbstractConfig.php b/app/code/Magento/Paypal/Model/AbstractConfig.php
@@ -58,7 +58,7 @@ abstract class AbstractConfig implements ConfigInterface
     /**
      * @var string
      */
-    private static $bnCode = 'Magento_Cart_%s';
+    private static $bnCode = 'Magento_2_%s';
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php b/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php
@@ -12,8 +12,7 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**
- * Class AbstractConfigTest
- * @package Magento\Paypal\Test\Unit\Model
+ * Test for \Magento\Framework\App\Config\ScopeConfigInterface
  */
 class AbstractConfigTest extends \PHPUnit\Framework\TestCase
 {
@@ -30,7 +29,7 @@ class AbstractConfigTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->scopeConfigMock = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
+        $this->scopeConfigMock = $this->getMockBuilder(ScopeConfigInterface::class)
             ->setMethods(['getValue', 'isSetFlag'])
             ->getMockForAbstractClass();
 
@@ -51,7 +50,7 @@ public function testSetMethod($method, $expected)
     public function testSetMethodInstance()
     {
         /** @var $methodInterfaceMock MethodInterface */
-        $methodInterfaceMock = $this->getMockBuilder(\Magento\Payment\Model\MethodInterface::class)
+        $methodInterfaceMock = $this->getMockBuilder(MethodInterface::class)
             ->getMockForAbstractClass();
         $this->assertSame($this->config, $this->config->setMethodInstance($methodInterfaceMock));
     }
@@ -66,7 +65,7 @@ public function testSetMethodInstance()
     public function setMethodDataProvider()
     {
         /** @var $methodInterfaceMock MethodInterface */
-        $methodInterfaceMock = $this->getMockBuilder(\Magento\Payment\Model\MethodInterface::class)
+        $methodInterfaceMock = $this->getMockBuilder(MethodInterface::class)
             ->getMockForAbstractClass();
         $methodInterfaceMock->expects($this->once())
             ->method('getCode')
@@ -353,7 +352,7 @@ public function testGetBuildNotationCode()
             $productMetadata
         );
 
-        self::assertEquals('Magento_Cart_SomeEdition', $this->config->getBuildNotationCode());
+        self::assertEquals('Magento_2_SomeEdition', $this->config->getBuildNotationCode());
     }
 
     /**
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php
@@ -10,6 +10,8 @@
 
 /**
  * Class AddComment
+ *
+ * Controller responsible for addition of the order comment to the order
  */
 class AddComment extends \Magento\Sales\Controller\Adminhtml\Order implements HttpPostActionInterface
 {
@@ -42,6 +44,7 @@ public function execute()
                     );
                 }
 
+                $order->setStatus($data['status']);
                 $notify = $data['is_customer_notified'] ?? false;
                 $visible = $data['is_visible_on_front'] ?? false;
 
diff --git a/app/code/Magento/Sales/Model/Order/Config.php b/app/code/Magento/Sales/Model/Order/Config.php
@@ -52,7 +52,7 @@ class Config
      */
     protected $maskStatusesMapping = [
         \Magento\Framework\App\Area::AREA_FRONTEND => [
-            \Magento\Sales\Model\Order::STATUS_FRAUD => \Magento\Sales\Model\Order::STATE_PROCESSING,
+            \Magento\Sales\Model\Order::STATUS_FRAUD => \Magento\Sales\Model\Order::STATUS_FRAUD,
             \Magento\Sales\Model\Order::STATE_PAYMENT_REVIEW => \Magento\Sales\Model\Order::STATE_PROCESSING
         ]
     ];
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Image/Adapter/InterfaceTest.php b/dev/tests/integration/testsuite/Magento/Framework/Image/Adapter/InterfaceTest.php
@@ -108,17 +108,18 @@ protected function _isFormatSupported($image, $adapter)
      * Mark test as skipped if not
      *
      * @param string $adapterType
-     * @return \Magento\Framework\Image\Adapter\AdapterInterface
+     * @return \Magento\Framework\Image\Adapter\AdapterInterface|null
      */
     protected function _getAdapter($adapterType)
     {
+        $adapter = null;
         try {
             $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
             $adapter = $objectManager->get(\Magento\Framework\Image\AdapterFactory::class)->create($adapterType);
-            return $adapter;
         } catch (\Exception $e) {
             $this->markTestSkipped($e->getMessage());
         }
+        return $adapter;
     }
 
     /**
@@ -667,7 +668,7 @@ public function createPngFromStringDataProvider()
             [
                 ['x' => 5, 'y' => 8],
                 'expectedColor1' => ['red' => 0, 'green' => 0, 'blue' => 0],
-                ['x' => 0, 'y' => 14],
+                ['x' => 0, 'y' => 11],
                 'expectedColor2' => ['red' => 255, 'green' => 255, 'blue' => 255],
                 \Magento\Framework\Image\Adapter\AdapterInterface::ADAPTER_GD2,
             ],
@@ -679,9 +680,9 @@ public function createPngFromStringDataProvider()
                 \Magento\Framework\Image\Adapter\AdapterInterface::ADAPTER_IM
             ],
             [
-                ['x' => 1, 'y' => 14],
+                ['x' => 1, 'y' => 11],
                 'expectedColor1' => ['red' => 255, 'green' => 255, 'blue' => 255],
-                ['x' => 5, 'y' => 12],
+                ['x' => 5, 'y' => 11],
                 'expectedColor2' => ['red' => 0, 'green' => 0, 'blue' => 0],
                 \Magento\Framework\Image\Adapter\AdapterInterface::ADAPTER_GD2
             ],
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Api/NvpTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/Api/NvpTest.php
@@ -95,7 +95,7 @@ public function testRequestTotalsAndLineItemsWithFPT()
             . '&SHIPPINGAMT=0.00&ITEMAMT=112.70&TAXAMT=0.00'
             . '&L_NAME0=Simple+Product+FPT&L_QTY0=1&L_AMT0=100.00'
             . '&L_NAME1=FPT&L_QTY1=1&L_AMT1=12.70'
-            . '&METHOD=SetExpressCheckout&VERSION=72.0&BUTTONSOURCE=Magento_Cart_';
+            . '&METHOD=SetExpressCheckout&VERSION=72.0&BUTTONSOURCE=Magento_2_';
 
         $this->httpClient->method('write')
             ->with(
@@ -146,7 +146,7 @@ public function testCallRefundTransaction()
 
         $httpQuery = 'TRANSACTIONID=fooTransactionId&REFUNDTYPE=Partial'
             .'&CURRENCYCODE=USD&AMT=145.98&METHOD=RefundTransaction'
-            .'&VERSION=72.0&BUTTONSOURCE=Magento_Cart_';
+            .'&VERSION=72.0&BUTTONSOURCE=Magento_2_';
 
         $this->httpClient->expects($this->once())->method('write')
             ->with(
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Api/PayflowNvpTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/Api/PayflowNvpTest.php
@@ -95,7 +95,7 @@ public function testRequestLineItems()
             . 'L_NAME1=Simple 2&L_QTY1=2&L_COST1=9.69&'
             . 'L_NAME2=Simple 3&L_QTY2=3&L_COST2=11.69&'
             . 'L_NAME3=Discount&L_QTY3=1&L_COST3=-10.00&'
-            . 'TRXTYPE=A&ACTION=S&BUTTONSOURCE=Magento_Cart_';
+            . 'TRXTYPE=A&ACTION=S&BUTTONSOURCE=Magento_2_';
 
         $this->httpClient->method('write')
             ->with(
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowLinkTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowLinkTest.php
@@ -119,14 +119,14 @@ public function testResolvePlaceOrderWithPayflowLinkForCustomer(): void
       cart_id: "$cartId"
       payment_method: {
           code: "$paymentMethod"
-            payflow_link: 
+            payflow_link:
             {
            cancel_url:"paypal/payflow/cancelPayment"
            return_url:"paypal/payflow/returnUrl"
            error_url:"paypal/payflow/errorUrl"
           }
       }
-  }) {    
+  }) {
        cart {
           selected_payment_method {
           code
@@ -142,7 +142,7 @@ public function testResolvePlaceOrderWithPayflowLinkForCustomer(): void
 QUERY;
 
         $productMetadata = ObjectManager::getInstance()->get(ProductMetadataInterface::class);
-        $button = 'Magento_Cart_' . $productMetadata->getEdition();
+        $button = 'Magento_2_' . $productMetadata->getEdition();
 
         $payflowLinkResponse = new DataObject(
             [
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithPayflowLinkTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithPayflowLinkTest.php
@@ -117,14 +117,14 @@ public function testResolvePlaceOrderWithPayflowLink(): void
       cart_id: "$cartId"
       payment_method: {
           code: "$paymentMethod"
-            payflow_link: 
+            payflow_link:
             {
            cancel_url:"paypal/payflow/cancel"
            return_url:"paypal/payflow/return"
            error_url:"paypal/payflow/error"
           }
       }
-  }) {    
+  }) {
        cart {
           selected_payment_method {
           code
@@ -140,7 +140,7 @@ public function testResolvePlaceOrderWithPayflowLink(): void
 QUERY;
 
         $productMetadata = ObjectManager::getInstance()->get(ProductMetadataInterface::class);
-        $button = 'Magento_Cart_' . $productMetadata->getEdition();
+        $button = 'Magento_2_' . $productMetadata->getEdition();
 
         $payflowLinkResponse = new DataObject(
             [
@@ -219,14 +219,14 @@ public function testResolveWithPayflowLinkDeclined(): void
       cart_id: "$cartId"
       payment_method: {
           code: "$paymentMethod"
-            payflow_link: 
+            payflow_link:
             {
            cancel_url:"paypal/payflow/cancelPayment"
            return_url:"paypal/payflow/returnUrl"
            error_url:"paypal/payflow/returnUrl"
           }
       }
-  }) {    
+  }) {
        cart {
           selected_payment_method {
           code
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithPaymentsAdvancedTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithPaymentsAdvancedTest.php
@@ -108,7 +108,7 @@ public function testResolvePlaceOrderWithPaymentsAdvanced(): void
         $cartId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $productMetadata = ObjectManager::getInstance()->get(ProductMetadataInterface::class);
-        $button = 'Magento_Cart_' . $productMetadata->getEdition();
+        $button = 'Magento_2_' . $productMetadata->getEdition();
 
         $payflowLinkResponse = new DataObject(
             [
@@ -256,7 +256,7 @@ private function setPaymentMethodAndPlaceOrder(string $cartId, string $paymentMe
              error_url:"paypal/payflowadvanced/customerror"
           }
       }
-  }) {    
+  }) {
        cart {
           selected_payment_method {
           code
@@ -300,7 +300,7 @@ private function setPaymentMethodWithInValidUrl(string $cartId, string $paymentM
              error_url:"paypal/payflowadvanced/error"
           }
       }
-  }) {    
+  }) {
        cart {
           selected_payment_method {
           code
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/_files/paypal_place_order_request.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/_files/paypal_place_order_request.php
@@ -13,7 +13,7 @@
 $notifyUrl = $url->getUrl('paypal/ipn/');
 
 $productMetadata = ObjectManager::getInstance()->get(ProductMetadataInterface::class);
-$button = 'Magento_Cart_' . $productMetadata->getEdition();
+$button = 'Magento_2_' . $productMetadata->getEdition();
 
 return [
     'TOKEN' => $token,
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ConfigTest.php
@@ -50,4 +50,28 @@ public function testCorrectCompleteStatusInStatesList()
 
         $this->assertEquals($completeStatus->getLabel(), $completeState->getText());
     }
+
+    /**
+     * Test Mask Status For Area
+     *
+     * @param string $code
+     * @param string $expected
+     * @dataProvider dataProviderForTestMaskStatusForArea
+     */
+    public function testMaskStatusForArea(string $code, string $expected)
+    {
+        $result = $this->orderConfig->getStatusFrontendLabel($code);
+        $this->assertEquals($expected, $result);
+    }
+
+    /**
+     * @return array
+     */
+    public function dataProviderForTestMaskStatusForArea()
+    {
+        return [
+            ['fraud', 'Suspected Fraud'],
+            ['processing', 'Processing'],
+        ];
+    }
 }
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/region-updater.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/region-updater.test.js
@@ -51,7 +51,8 @@ define([
             '': '',
             'US': 'United States',
             'GB': 'United Kingdom',
-            'DE': 'Germany'
+            'DE': 'Germany',
+            'IT': 'Italy'
         },
         regions = {
             '': 'Please select a region, state or province.'
@@ -202,5 +203,41 @@ define([
             expect($(regionSelectEl).is(':visible')).toBe(false);
             expect($(regionInputEl).is(':visible')).toBe(false);
         });
+        it('Check that initial values are not overwritten - region input', function () {
+            $(countryEl).val('GB');
+            $(regionInputEl).val('Liverpool');
+            $(postalCodeEl).val('L13 0AL');
+            init();
+            expect($(countryEl).val()).toBe('GB');
+            expect($(regionInputEl).val()).toBe('Liverpool');
+            expect($(postalCodeEl).val()).toBe('L13 0AL');
+        });
+        it('Check that initial values are not overwritten - region select', function () {
+            $(countryEl).val('US');
+            $(postalCodeEl).val('99501');
+            init({
+                defaultRegion: '2'
+            });
+            expect($(countryEl).val()).toBe('US');
+            expect($(regionSelectEl).find('option:selected').text()).toBe('Alaska');
+            expect($(postalCodeEl).val()).toBe('99501');
+        });
+        it('Check that region values are cleared out on country change - region input', function () {
+            $(countryEl).val('GB');
+            $(regionInputEl).val('Liverpool');
+            init();
+            $(countryEl).val('IT').change();
+            expect($(countryEl).val()).toBe('IT');
+            expect($(regionInputEl).val()).toBe('');
+        });
+        it('Check that region values are cleared out on country change - region select', function () {
+            $(countryEl).val('US');
+            init({
+                defaultRegion: '2'
+            });
+            $(countryEl).val('DE').change();
+            expect($(countryEl).val()).toBe('DE');
+            expect($(regionSelectEl).val()).toBe('');
+        });
     });
 });

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@`
`10`	`10`
`11`	`11`	`/**`
`12`	`12`	`* Class AddComment`
	`13`	`+ *`
	`14`	`+ * Controller responsible for addition of the order comment to the order`
`13`	`15`	`*/`
`14`	`16`	`class AddComment extends \Magento\Sales\Controller\Adminhtml\Order implements HttpPostActionInterface`
`15`	`17`	`{`
`@@ -42,6 +44,7 @@ public function execute()`
`42`	`44`	`);`
`43`	`45`	`}`
`44`	`46`
	`47`	`+ $order->setStatus($data['status']);`
`45`	`48`	`$notify = $data['is_customer_notified'] ?? false;`
`46`	`49`	`$visible = $data['is_visible_on_front'] ?? false;`
`47`	`50`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ class Config`
`52`	`52`	`*/`
`53`	`53`	`protected $maskStatusesMapping = [`
`54`	`54`	`\Magento\Framework\App\Area::AREA_FRONTEND => [`
`55`		`- \Magento\Sales\Model\Order::STATUS_FRAUD => \Magento\Sales\Model\Order::STATE_PROCESSING,`
	`55`	`+ \Magento\Sales\Model\Order::STATUS_FRAUD => \Magento\Sales\Model\Order::STATUS_FRAUD,`
`56`	`56`	`\Magento\Sales\Model\Order::STATE_PAYMENT_REVIEW => \Magento\Sales\Model\Order::STATE_PROCESSING`
`57`	`57`	`]`
`58`	`58`	`];`
Original file line number	Diff line number	Diff line change
`@@ -119,14 +119,14 @@ public function testResolvePlaceOrderWithPayflowLinkForCustomer(): void`
`119`	`119`	`cart_id: "$cartId"`
`120`	`120`	`payment_method: {`
`121`	`121`	`code: "$paymentMethod"`
`122`		`- payflow_link:`
	`122`	`+ payflow_link:`
`123`	`123`	`{`
`124`	`124`	`cancel_url:"paypal/payflow/cancelPayment"`
`125`	`125`	`return_url:"paypal/payflow/returnUrl"`
`126`	`126`	`error_url:"paypal/payflow/errorUrl"`
`127`	`127`	`}`
`128`	`128`	`}`
`129`		`- }) {`
	`129`	`+ }) {`
`130`	`130`	`cart {`
`131`	`131`	`selected_payment_method {`
`132`	`132`	`code`
`@@ -142,7 +142,7 @@ public function testResolvePlaceOrderWithPayflowLinkForCustomer(): void`
`142`	`142`	`QUERY;`
`143`	`143`
`144`	`144`	`$productMetadata = ObjectManager::getInstance()->get(ProductMetadataInterface::class);`
`145`		`- $button = 'Magento_Cart_' . $productMetadata->getEdition();`
	`145`	`+ $button = 'Magento_2_' . $productMetadata->getEdition();`
`146`	`146`
`147`	`147`	`$payflowLinkResponse = new DataObject(`
`148`	`148`	`[`
Original file line number	Diff line number	Diff line change
`@@ -117,14 +117,14 @@ public function testResolvePlaceOrderWithPayflowLink(): void`
`117`	`117`	`cart_id: "$cartId"`
`118`	`118`	`payment_method: {`
`119`	`119`	`code: "$paymentMethod"`
`120`		`- payflow_link:`
	`120`	`+ payflow_link:`
`121`	`121`	`{`
`122`	`122`	`cancel_url:"paypal/payflow/cancel"`
`123`	`123`	`return_url:"paypal/payflow/return"`
`124`	`124`	`error_url:"paypal/payflow/error"`
`125`	`125`	`}`
`126`	`126`	`}`
`127`		`- }) {`
	`127`	`+ }) {`
`128`	`128`	`cart {`
`129`	`129`	`selected_payment_method {`
`130`	`130`	`code`
`@@ -140,7 +140,7 @@ public function testResolvePlaceOrderWithPayflowLink(): void`
`140`	`140`	`QUERY;`
`141`	`141`
`142`	`142`	`$productMetadata = ObjectManager::getInstance()->get(ProductMetadataInterface::class);`
`143`		`- $button = 'Magento_Cart_' . $productMetadata->getEdition();`
	`143`	`+ $button = 'Magento_2_' . $productMetadata->getEdition();`
`144`	`144`
`145`	`145`	`$payflowLinkResponse = new DataObject(`
`146`	`146`	`[`
`@@ -219,14 +219,14 @@ public function testResolveWithPayflowLinkDeclined(): void`
`219`	`219`	`cart_id: "$cartId"`
`220`	`220`	`payment_method: {`
`221`	`221`	`code: "$paymentMethod"`
`222`		`- payflow_link:`
	`222`	`+ payflow_link:`
`223`	`223`	`{`
`224`	`224`	`cancel_url:"paypal/payflow/cancelPayment"`
`225`	`225`	`return_url:"paypal/payflow/returnUrl"`
`226`	`226`	`error_url:"paypal/payflow/returnUrl"`
`227`	`227`	`}`
`228`	`228`	`}`
`229`		`- }) {`
	`229`	`+ }) {`
`230`	`230`	`cart {`
`231`	`231`	`selected_payment_method {`
`232`	`232`	`code`