Merge branch '2.4-develop' into B2B-2053

Author: danmooney2

app/code/Magento/AdminAnalytics/Test/Mftf/Test/AdminCheckAnalyticsTrackingTest.xml

@@ -15,6 +15,7 @@
             <description value="AdminAnalytics Check Tracking."/>
             <severity value="MINOR"/>
             <testCaseId value="MC-36869"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationNavigateMenuTest.xml

@@ -18,6 +18,7 @@
             <testCaseId value="MC-14125"/>
             <group value="menu"/>
             <group value="mtf_migrated"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

app/code/Magento/AdvancedSearch/Test/Mftf/Test/AdminAddSearchTermTest.xml

@@ -16,6 +16,7 @@
             <description value="Admin should be able to create a new search term using search terms grid"/>
             <severity value="CRITICAL"/>
             <group value="AdvancedSearch"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingButtonTest.xml

@@ -17,6 +17,7 @@
             <testCaseId value="MC-28376"/>
             <group value="analytics"/>
             <group value="mtf_migrated"/>
+            <group value="pr_exclude"/>
         </annotations>
 
         <before>

app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingNavigateMenuTest.xml

@@ -18,6 +18,7 @@
             <testCaseId value="MC-14152"/>
             <group value="menu"/>
             <group value="mtf_migrated"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationBlankIndustryTest.xml

@@ -16,6 +16,7 @@
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-63981"/>
             <group value="analytics"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml

@@ -16,6 +16,7 @@
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-66465"/>
             <group value="analytics"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml

@@ -17,6 +17,7 @@
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-63898"/>
             <group value="analytics"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationPermissionTest.xml

@@ -17,6 +17,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-82648"/>
             <group value="analytics"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <createData entity="adminNoReportRole" stepKey="noReportUserRole"/>

app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationTimeToSendDataTest.xml

@@ -17,6 +17,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-66464"/>
             <group value="analytics"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3ExportTaxRatesTest.xml

@@ -25,6 +25,7 @@
             <group value="importExport"/>
             <group value="tax"/>
             <group value="remote_storage_aws_s3"/>
+            <group value="pr_exclude"/>
         </annotations>
 
         <before>

app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3ImportSimpleProductImagesDuplicationTest.xml

@@ -20,6 +20,7 @@
             <group value="catalog_import_export"/>
             <group value="remote_storage_aws_s3"/>
             <group value="remote_storage_disabled"/>
+            <group value="pr_exclude"/>
         </annotations>
 
         <before>

app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3ImportTaxRatesTest.xml

@@ -21,6 +21,7 @@
             <group value="importExport"/>
             <group value="tax"/>
             <group value="remote_storage_aws_s3"/>
+            <group value="pr_exclude"/>
         </annotations>
 
         <before>

app/code/Magento/AwsS3/Test/Mftf/Test/AwsS3AdminAddRemoveDefaultVideoSimpleProductTest.xml

@@ -19,6 +19,7 @@
             <skip>
                 <issueId value="MC-33903"/>
             </skip>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>

app/code/Magento/AwsS3/Test/Mftf/Test/AwsS3StorefrontPrintOrderGuestTest.xml

@@ -19,6 +19,7 @@
                 <issueId value="MQE-2834" />
             </skip>
             <group value="remote_storage_aws_s3"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php

@@ -138,9 +138,10 @@ public function renderHeader()
     {
         if (false !== $this->getColumn()->getSortable()) {
             $className = 'not-sort';
-            $dir = strtolower($this->getColumn()->getDir());
+            $dir = is_string($this->getColumn()->getDir()) ? strtolower($this->getColumn()->getDir()) : '';
             $nDir = $dir == 'asc' ? 'desc' : 'asc';
-            if ($this->getColumn()->getDir()) {
+
+            if ($dir) {
                 $className = '_' . $dir . 'end';
             }
             $out = '<th data-sort="' .

app/code/Magento/Backend/Test/Mftf/Test/AdminCatalogEmailToFriendSettingsTest.xml

@@ -17,6 +17,7 @@
             <group value="backend"/>
             <severity value="MINOR"></severity>
             <testCaseId value="MC-35895"/>
+            <group value="pr_exclude"/>
         </annotations>
 
         <before>

app/code/Magento/Backend/Test/Mftf/Test/AdminCheckDashboardWithChartsTest.xml

@@ -18,6 +18,7 @@
             <testCaseId value="MAGETWO-98934"/>
             <useCaseId value="MAGETWO-98584"/>
             <group value="backend"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <magentoCLI command="config:set admin/dashboard/enable_charts 1" stepKey="setEnableCharts"/>

app/code/Magento/Backend/Test/Mftf/Test/AdminCheckLocaleAndDeveloperConfigInDeveloperModeTest.xml

@@ -19,6 +19,7 @@
             <testCaseId value="MC-20374"/>
             <group value="developer_mode_only"/>
             <group value="mtf_migrated"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/Backend/Test/Mftf/Test/AdminCheckLocaleAndDeveloperConfigInProductionModeTest.xml

@@ -19,6 +19,7 @@
             <group value="backend"/>
             <group value="production_mode_only"/>
             <group value="mtf_migrated"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/Backend/Test/Mftf/Test/AdminContentScheduleNavigateMenuTest.xml

@@ -18,6 +18,7 @@
             <testCaseId value="MC-14117"/>
             <group value="menu"/>
             <group value="mtf_migrated"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardNavigateMenuTest.xml

@@ -18,6 +18,7 @@
             <testCaseId value="MC-14116"/>
             <group value="menu"/>
             <group value="mtf_migrated"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml

@@ -21,6 +21,7 @@
             <skip>
                 <issueId value="DEPRECATED">Use AdminCheckDashboardWithChartsTest instead</issueId>
             </skip> 
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <magentoCLI command="config:set admin/dashboard/enable_charts 1" stepKey="setEnableCharts"/>

app/code/Magento/Backend/Test/Mftf/Test/AdminExpireAdminSessionTest.xml

@@ -18,6 +18,7 @@
             <testCaseId value="MC-14111"/>
             <group value="Backend"/>
             <group value="mtf_migrated"/>
+            <group value="pr_exclude"/>
         </annotations>
         <after>
             <!-- 4. Restore default configuration settings. -->

app/code/Magento/Backend/Test/Mftf/Test/AdminLoginAfterChangeCookieDomainTest.xml

@@ -18,6 +18,7 @@
             <testCaseId value="MC-17847"/>
             <useCaseId value="MC-17275"/>
             <group value="backend"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <magentoCLI command="config:set {{ChangedCookieDomainForMainWebsiteConfigData.path}} --scope={{ChangedCookieDomainForMainWebsiteConfigData.scope}} --scope-code={{ChangedCookieDomainForMainWebsiteConfigData.scope_code}} {{ChangedCookieDomainForMainWebsiteConfigData.value}}" stepKey="changeDomainForMainWebsiteBeforeTestRun"/>

app/code/Magento/Backend/Test/Mftf/Test/AdminLoginAfterJSMinificationTest.xml

@@ -18,6 +18,7 @@
             <severity value="MAJOR"/>
             <group value="backend"/>
             <group value="mtf_migrated"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <magentoCLI command="config:set {{MinifyJavaScriptFilesEnableConfigData.path}} {{MinifyJavaScriptFilesEnableConfigData.value}}" stepKey="enableJsMinification"/>

app/code/Magento/Backend/Test/Mftf/Test/AdminLoginFailedTest.xml

@@ -18,6 +18,7 @@
             <testCaseId value="MAGETWO-71572"/>
             <group value="example"/>
             <group value="login"/>
+            <group value="pr_exclude"/>
         </annotations>
 
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin">

app/code/Magento/Backend/Test/Mftf/Test/AdminLoginSuccessfulWithRewritesDisabledTest.xml

@@ -19,6 +19,7 @@
             <severity value="CRITICAL"/>
             <group value="example"/>
             <group value="login"/>
+            <group value="pr_exclude"/>
         </annotations>
 
         <before>

app/code/Magento/Backend/Test/Mftf/Test/AdminLoginWithRestrictPermissionTest.xml

@@ -17,6 +17,7 @@
             <severity value="MAJOR" />
             <description value="Check login with restrict role."/>
             <group value="login"/>
+            <group value="pr_exclude"/>
         </annotations>
 
         <before>

app/code/Magento/Backend/Test/Mftf/Test/AdminRedirectToStartupPageAfterLoginIfSecretKeyEnabledTest.xml

@@ -18,6 +18,7 @@
             <testCaseId value="AC-1145"/>
             <useCaseId value="MC-43161"/>
             <group value="backend"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <!-- Add Secret Key to URLs -->

app/code/Magento/Backend/Test/Mftf/Test/AdminSearchHotkeyTest.xml

@@ -17,6 +17,7 @@
             <severity value="MINOR"/>
             <group value="backend"/>
             <group value="search"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

app/code/Magento/Backend/Test/Mftf/Test/AdminStoresAllStoresNavigateMenuTest.xml

@@ -18,6 +18,7 @@
             <testCaseId value="MC-14118"/>
             <group value="menu"/>
             <group value="mtf_migrated"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

app/code/Magento/Backend/Test/Mftf/Test/AdminStoresConfigurationNavigateMenuTest.xml

@@ -18,6 +18,7 @@
             <testCaseId value="MC-14119"/>
             <group value="menu"/>
             <group value="mtf_migrated"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

app/code/Magento/Backend/Test/Mftf/Test/AdminSystemCacheManagementNavigateMenuTest.xml

@@ -18,6 +18,7 @@
             <testCaseId value="MC-14120"/>
             <group value="menu"/>
             <group value="mtf_migrated"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

app/code/Magento/Backend/Test/Mftf/Test/AdminUserLoginWithStoreCodeInUrlTest.xml

@@ -18,6 +18,7 @@
             <severity value="CRITICAL"/>
             <group value="backend"/>
             <group value="mtf_migrated"/>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <magentoCLI command="config:set {{StorefrontEnableAddStoreCodeToUrls.path}} {{StorefrontEnableAddStoreCodeToUrls.value}}" stepKey="addStoreCodeToUrlEnable"/>

app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Renderer/CurrencyTest.php

@@ -72,7 +72,7 @@ protected function setUp(): void
 
         $this->_curLocatorMock = $this->createMock(DefaultLocator::class);
         $this->_columnMock = $this->getMockBuilder(Column::class)
-            ->addMethods(['getIndex'])
+            ->addMethods(['getIndex', 'getCurrency', 'getRateField'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->_columnMock->expects($this->any())->method('getIndex')->willReturn('columnIndex');
@@ -115,45 +115,25 @@ protected function tearDown(): void
      */
     public function testRenderWithDefaultCurrency()
     {
-        $this->_currencyMock->expects(
-            $this->once()
-        )->method(
-            'getRate'
-        )->with(
-            'defaultCurrency'
-        )->willReturn(
-            1.5
-        );
-
-        $this->_curLocatorMock->expects(
-            $this->any()
-        )->method(
-            'getDefaultCurrency'
-        )->with(
-            $this->_requestMock
-        )->willReturn(
-            'defaultCurrency'
-        );
-
+        $this->_currencyMock->expects($this->once())
+            ->method('getRate')
+            ->with('defaultCurrency')
+            ->willReturn(1.5);
+        $this->_curLocatorMock->expects($this->any())
+            ->method('getDefaultCurrency')
+            ->with($this->_requestMock)
+            ->willReturn('defaultCurrency');
         $currLocaleMock = $this->createMock(\Zend_Currency::class);
-        $currLocaleMock->expects(
-            $this->once()
-        )->method(
-            'toCurrency'
-        )->with(
-            15.0000
-        )->willReturn(
-            '15USD'
-        );
-        $this->_localeMock->expects(
-            $this->once()
-        )->method(
-            'getCurrency'
-        )->with(
-            'defaultCurrency'
-        )->willReturn(
-            $currLocaleMock
-        );
+        $currLocaleMock->expects($this->once())
+            ->method('toCurrency')
+            ->with(15.0000)
+            ->willReturn('15USD');
+        $this->_localeMock->expects($this->once())
+            ->method('getCurrency')
+            ->with('defaultCurrency')
+            ->willReturn($currLocaleMock);
+        $this->_columnMock->method('getCurrency')->willReturn('USD');
+        $this->_columnMock->method('getRateField')->willReturn('test_rate_field');
 
         $this->assertEquals('15USD', $this->_blockCurrency->render($this->_row));
     }