Merge pull request #3786 from magento-arcticfoxes/2.3.1-qwerty-pr

[2.3.1-qwerty] Sync with 2.3.1-release
magento · Feb 21, 2019 · 4efed2d · 4efed2d
2 parents f34a59f + 51b4346
commit 4efed2d
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 5 deletions.
diff --git a/app/code/Magento/AuthorizenetAcceptjs/etc/payment.xml b/app/code/Magento/AuthorizenetAcceptjs/etc/payment.xml
@@ -9,7 +9,7 @@
          xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Payment:etc/payment.xsd">
     <methods>
         <method name="authorizenet_acceptjs">
-            <allow_multiple_address>1</allow_multiple_address>
+            <allow_multiple_address>0</allow_multiple_address>
         </method>
     </methods>
 </payment>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilter.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilter.xml
@@ -28,6 +28,7 @@
             <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct2">
                 <argument name="product" value="SimpleProduct"/>
             </actionGroup>
+            <actionGroup ref="NavigateToAndResetProductGridToDefaultView" stepKey="NavigateToAndResetProductGridToDefaultView"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductList"/>

diff --git a/app/design/adminhtml/Magento/backend/Magento_Rma/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Rma/web/css/source/_module.less
@@ -7,13 +7,21 @@
     .rma-request-details,
     .rma-wrapper .order-shipping-address {
         float: left;
-        #mix-grid .width(6,12);
+        /**
+         * @codingStandardsIgnoreStart
+         */
+        #mix-grid .width(6, 12);
+        //@codingStandardsIgnoreEnd
     }
 
     .rma-confirmation,
-    .rma-wrapper .order-return-address {
+    .rma-wrapper .order-return-address, .rma-wrapper .order-shipping-method {
         float: right;
-        #mix-grid .width(6,12);
+        /**
+        * @codingStandardsIgnoreStart
+        */
+        #mix-grid .width(6, 12);
+        //@codingStandardsIgnoreEnd
     }
 }
 

diff --git a/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/ConfigTest.php b/dev/tests/integration/testsuite/Magento/AuthorizenetAcceptjs/Gateway/ConfigTest.php
@@ -8,6 +8,7 @@
 
 namespace Magento\AuthorizenetAcceptjs\Gateway;
 
+use Magento\Framework\Config\Data;
 use Magento\Payment\Model\Method\Adapter;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\ObjectManager;
@@ -40,5 +41,11 @@ public function testVerifyConfiguration()
         $this->assertTrue($paymentAdapter->canUseInternal());
         $this->assertTrue($paymentAdapter->canEdit());
         $this->assertTrue($paymentAdapter->canFetchTransactionInfo());
+
+        /** @var Data $configReader */
+        $configReader = $this->objectManager->get('Magento\Payment\Model\Config\Data');
+        $value = $configReader->get('methods/authorizenet_acceptjs/allow_multiple_address');
+
+        $this->assertSame('0', $value);
     }
 }
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml
@@ -69,5 +69,9 @@
         <item>
             <path>dev/build/publication/sanity/ce.xml</path>
         </item>
+        <item>
+            <path>app/design/adminhtml/Magento/backend/Magento_Rma/web/css/source/_module.less</path>
+            <word>rma</word>
+        </item>
     </whitelist>
 </config>
diff --git a/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php b/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
@@ -170,7 +170,6 @@ public function write($method, $url, $http_ver = '1.1', $headers = [], $body = '
 
         // set url to post to
         curl_setopt($this->_getResource(), CURLOPT_URL, $url);
-        curl_setopt($this->_getResource(), CURLOPT_HTTP_VERSION, $http_ver);
         curl_setopt($this->_getResource(), CURLOPT_RETURNTRANSFER, true);
         if ($method == \Zend_Http_Client::POST) {
             curl_setopt($this->_getResource(), CURLOPT_POST, true);