Skip to content

Commit 112677e

Browse files
engcom-Charlieengcom-Charlie
committed
33326-Merged 2.4-develop and resolved conflicts
2 parents bf01b67 + 00cc5b4 commit 112677e

File tree

1,968 files changed

+91903
-77020
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,968 files changed

+91903
-77020
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<description value="AdminAnalytics Check Tracking."/>
1616
<severity value="MINOR"/>
1717
<testCaseId value="MC-36869"/>
18+
<group value="pr_exclude"/>
1819
</annotations>
1920
<before>
2021
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

‎app/code/Magento/AdminNotification/Model/InboxInterface.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,20 @@ interface InboxInterface
1818
*
1919
* @param int|null $severity
2020
* @return array|string|null
21-
* @api
2221
*/
2322
public function getSeverities($severity = null);
2423

2524
/**
2625
* Retrieve Latest Notice
2726
*
2827
* @return $this
29-
* @api
3028
*/
3129
public function loadLatestNotice();
3230

3331
/**
3432
* Retrieve notice statuses
3533
*
3634
* @return array
37-
* @api
3835
*/
3936
public function getNoticeStatus();
4037
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<testCaseId value="MC-14125"/>
1919
<group value="menu"/>
2020
<group value="mtf_migrated"/>
21+
<group value="pr_exclude"/>
2122
</annotations>
2223
<before>
2324
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<description value="Admin should be able to create a new search term using search terms grid"/>
1717
<severity value="CRITICAL"/>
1818
<group value="AdvancedSearch"/>
19+
<group value="pr_exclude"/>
1920
</annotations>
2021
<before>
2122
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<testCaseId value="MC-28376"/>
1818
<group value="analytics"/>
1919
<group value="mtf_migrated"/>
20+
<group value="pr_exclude"/>
2021
</annotations>
2122

2223
<before>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<testCaseId value="MC-14152"/>
1919
<group value="menu"/>
2020
<group value="mtf_migrated"/>
21+
<group value="pr_exclude"/>
2122
</annotations>
2223
<before>
2324
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<severity value="MAJOR"/>
1717
<testCaseId value="MAGETWO-63981"/>
1818
<group value="analytics"/>
19+
<group value="pr_exclude"/>
1920
</annotations>
2021
<before>
2122
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<severity value="MAJOR"/>
1717
<testCaseId value="MAGETWO-66465"/>
1818
<group value="analytics"/>
19+
<group value="pr_exclude"/>
1920
</annotations>
2021
<before>
2122
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<severity value="MAJOR"/>
1818
<testCaseId value="MAGETWO-63898"/>
1919
<group value="analytics"/>
20+
<group value="pr_exclude"/>
2021
</annotations>
2122
<before>
2223
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-82648"/>
1919
<group value="analytics"/>
20+
<group value="pr_exclude"/>
2021
</annotations>
2122
<before>
2223
<createData entity="adminNoReportRole" stepKey="noReportUserRole"/>

0 commit comments

Comments
 (0)