merge magento/2.3-develop into magento-honey-badgers/MC-17875

Author: magento-cicd2

app/code/Magento/Backend/Test/Mftf/ActionGroup/SetAdminAccountActionGroup.xml

@@ -10,15 +10,15 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="SetAdminAccountActionGroup">
         <arguments>
-            <argument name="InterfaceLocaleByValue" type="string"/>
+            <argument name="InterfaceLocaleByValue" defaultValue="en_US" type="string"/>
         </arguments>
         <!-- Navigate to admin System Account Page-->
         <amOnPage url="{{AdminSystemAccountPage.url}}" stepKey="openAdminSystemAccountPage" />
-        <waitForPageLoad stepKey="loadAdminSystemAccountPage"/>
         <!-- Change Admin locale to Français (France) / French (France) -->
         <selectOption userInput="{{InterfaceLocaleByValue}}" selector="{{AdminSystemAccountSection.interfaceLocale}}" stepKey="setInterfaceLocate"/>
         <fillField selector="{{AdminSystemAccountSection.currentPassword}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/>
-        <click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="clickSave"/>
-        <waitForElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="waitSuccessMessage"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSave"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitSuccessMessage"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the account." stepKey="seeSuccessMessage"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Braintree/Model/LocaleResolver.php

@@ -8,6 +8,9 @@
 use Magento\Framework\Locale\ResolverInterface;
 use Magento\Braintree\Gateway\Config\PayPal\Config;
 
+/**
+ * Resolves locale for PayPal Express.
+ */
 class LocaleResolver implements ResolverInterface
 {
     /**
@@ -20,6 +23,17 @@ class LocaleResolver implements ResolverInterface
      */
     private $config;
 
+    /**
+     * Mapping Magento locales on PayPal locales.
+     *
+     * @var array
+     */
+    private $localeMap = [
+        'zh_Hans_CN' => 'zh_CN',
+        'zh_Hant_HK' => 'zh_HK',
+        'zh_Hant_TW' => 'zh_TW'
+    ];
+
     /**
      * @param ResolverInterface $resolver
      * @param Config $config
@@ -66,10 +80,11 @@ public function setLocale($locale = null)
      * Gets store's locale or the `en_US` locale if store's locale does not supported by PayPal.
      *
      * @return string
+     * @see https://braintree.github.io/braintree-web/current/PayPalCheckout.html#createPayment
      */
     public function getLocale()
     {
-        $locale = $this->resolver->getLocale();
+        $locale = $this->localeMap[$this->resolver->getLocale()] ?? $this->resolver->getLocale();
         $allowedLocales = $this->config->getValue('supported_locales');
 
         return strpos($allowedLocales, $locale) !== false ? $locale : 'en_US';

app/code/Magento/Braintree/Test/Mftf/ActionGroup/ConfigureBraintreeActionGroup.xml

@@ -7,7 +7,7 @@
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-
+    <!-- Skip by MQE-1576 -->
     <actionGroup name="ConfigureBraintree">
         <!-- GoTo ConfigureBraintree fields -->
         <click stepKey="clickOnSTORES" selector="{{AdminMenuSection.stores}}"/>
@@ -50,4 +50,4 @@
         <magentoCLI stepKey="disableBrainTree" command="config:set payment/braintree/active 0"/>
         <magentoCLI stepKey="disableBrainTreePaypal" command="config:set payment/braintree_paypal/active 0"/>
     </actionGroup>
-</actionGroups>
+</actionGroups>

app/code/Magento/Braintree/Test/Mftf/Data/BraintreeData.xml

@@ -6,8 +6,7 @@
   */
 -->
 
-<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="SampleBraintreeConfig" type="braintree_config_state">
         <requiredEntity type="title">SampleTitle</requiredEntity>
         <requiredEntity type="payment_action">SamplePaymentAction</requiredEntity>
@@ -54,13 +53,13 @@
         <data key="value">sandbox</data>
     </entity>
     <entity name="MerchantId" type="merchant_id">
-        <data key="value">d4pdjhxgjfrsmzbf</data>
+        <data key="value">MERCH_ID</data>
     </entity>
     <entity name="PublicKey" type="public_key">
-        <data key="value">m7q4wmh43xrgyrst</data>
+        <data key="value">PUBLIC_KEY</data>
     </entity>
     <entity name="PrivateKey" type="private_key">
-        <data key="value">67de364080b1b4e2492d7a3de413a572</data>
+        <data key="value">PRIVATE_KEY</data>
     </entity>
 
     <!-- default configuration used to restore Magento config -->
@@ -138,14 +137,17 @@
         <data key="year">20</data>
         <data key="cvv">113</data>
     </entity>
+    <entity name="StoredPaymentMethods">
+        <data key="cardNumberEnding">5100</data>
+        <data key="cardExpire">12/2020</data>
+    </entity>
 
     <entity name="BraintreeConfigurationData" type="data">
         <data key="title">Credit Card (Braintree)</data>
-        <data key="merchantID">d4pdjhxgjfrsmzbf</data>
-        <data key="publicKey">m7q4wmh43xrgyrst</data>
-        <data key="privateKey">67de364080b1b4e2492d7a3de413a572</data>
-        <data key="merchantAccountID">Magneto</data>
+        <data key="merchantID">MERCH_ID</data>
+        <data key="publicKey">PUBLIC_KEY</data>
+        <data key="privateKey">PRIVATE_KEY</data>
+        <data key="merchantAccountID">MERCH_ACCOUNT_ID</data>
         <data key="titleForPayPalThroughBraintree">PayPal (Braintree)</data>
     </entity>
-
 </entities>

app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml

@@ -17,6 +17,9 @@
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-93767"/>
             <group value="braintree"/>
+            <skip>
+                <issueId value="MQE-1576"/>
+            </skip>
         </annotations>
 
         <before>

app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml

@@ -17,6 +17,9 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-93677"/>
             <group value="braintree"/>
+            <skip>
+                <issueId value="MQE-1576"/>
+            </skip>
         </annotations>
 
 

app/code/Magento/Braintree/Test/Mftf/Test/CretateAdminOrderWithOnlinePaymentIncludingTaxAndDiscount.xml

@@ -17,6 +17,9 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-94472"/>
             <group value="braintree"/>
+            <skip>
+                <issueId value="MQE-1576"/>
+            </skip>
         </annotations>
 
         <before>

app/code/Magento/Braintree/Test/Unit/Model/LocaleResolverTest.php

@@ -98,19 +98,35 @@ public function testSetLocale()
     /**
      * Test getLocale method
      *
-     * @return void
+     * @param string $locale
+     * @param string $expectedLocale
+     * @dataProvider getLocaleDataProvider
      */
-    public function testGetLocale()
+    public function testGetLocale(string $locale, string $expectedLocale)
     {
-        $locale = 'en_TEST';
-        $allowedLocales = 'en_US,en_GB,en_AU,da_DK,fr_FR,fr_CA,de_DE,zh_HK,it_IT,nl_NL';
-        $this->resolverMock->expects($this->once())->method('getLocale')->willReturn($locale);
-        $this->configMock->expects($this->once())->method('getValue')->with('supported_locales')
+        $allowedLocales = 'en_US,en_GB,en_AU,da_DK,fr_FR,fr_CA,de_DE,zh_HK,it_IT,zh_CN,zh_TW,nl_NL';
+        $this->resolverMock->method('getLocale')
+            ->willReturn($locale);
+        $this->configMock->method('getValue')
+            ->with('supported_locales')
             ->willReturn($allowedLocales);
-
-        $expected = 'en_US';
         $actual = $this->localeResolver->getLocale();
-        self::assertEquals($expected, $actual);
+
+        self::assertEquals($expectedLocale, $actual);
+    }
+
+    /**
+     * @return array
+     */
+    public function getLocaleDataProvider(): array
+    {
+        return [
+            ['locale' => 'zh_Hans_CN', 'expectedLocale' => 'zh_CN'],
+            ['locale' => 'zh_Hant_HK', 'expectedLocale' => 'zh_HK'],
+            ['locale' => 'zh_Hant_TW', 'expectedLocale' => 'zh_TW'],
+            ['locale' => 'fr_FR', 'expectedLocale' => 'fr_FR'],
+            ['locale' => 'unknown', 'expectedLocale' => 'en_US'],
+        ];
     }
 
     /**

app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml

@@ -92,7 +92,7 @@
         <!--Category Selection-->
         <element name="categoryByName" type="multiselect" selector="//div[@data-index='category_ids']//span[contains(text(), '{{category}}')]" parameterized="true"/>
         <element name="searchForCategory" type="input" selector="div.action-menu._active > div.admin__action-multiselect-search-wrap input" timeout="30"/>
-        <element name="selectCategory" type="multiselect" selector="//div[@class='action-menu _active']//label[@class='admin__action-multiselect-label']"/>
+        <element name="selectCategory" type="multiselect" selector="//div[@class='action-menu _active']//label[@class='admin__action-multiselect-label']" timeout="30"/>
         <element name="categoriesLabel" type="text" selector="//div[@class='action-menu _active']//button[@data-action='close-advanced-select']"/>
         <element name="userDefinedQuantity" type="checkbox" selector="[name='bundle_options[bundle_options][{{option}}][bundle_selections][{{product}}][selection_can_change_qty]'][type='checkbox']" parameterized="true"/>
     </section>

app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml

@@ -154,7 +154,7 @@
         </td>
         <td class="col-discont">
             <?php if ($block->canShowPriceInfo($_item)) : ?>
-                <?= $block->escapeHtml($block->displayPriceAttribute('discount_amount')) ?>
+                <?= /* @noEscape */ $block->displayPriceAttribute('discount_amount') ?>
             <?php else : ?>
                 &nbsp;
             <?php endif; ?>