Skip to content

Commit 27bee9d

Browse files
author
ybohaienko
committed
Merge branch '2.3-develop' into MAGETWO-93786
2 parents 648821e + b6c47a2 commit 27bee9d

File tree

434 files changed

+7997
-7498
lines changed

Some content is hidden

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

434 files changed

+7997
-7498
lines changed

app/code/Magento/AdminNotification/Test/Mftf/composer.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

app/code/Magento/AdvancedPricingImportExport/Test/Mftf/composer.json

Lines changed: 0 additions & 23 deletions
This file was deleted.

app/code/Magento/AdvancedSearch/Test/Mftf/composer.json

Lines changed: 0 additions & 22 deletions
This file was deleted.

app/code/Magento/AdvancedSearch/composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
},
1818
"type": "magento2-module",
1919
"license": [
20-
"proprietary"
20+
"OSL-3.0",
21+
"AFL-3.0"
2122
],
2223
"autoload": {
2324
"files": [

app/code/Magento/Amqp/Test/Mftf/composer.json

Lines changed: 0 additions & 17 deletions
This file was deleted.

app/code/Magento/Amqp/composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
},
1313
"type": "magento2-module",
1414
"license": [
15-
"proprietary"
15+
"OSL-3.0",
16+
"AFL-3.0"
1617
],
1718
"autoload": {
1819
"files": [

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
</after>
2323
<actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
2424
<amOnPage stepKey="amOnAdminConfig" url="{{AdminConfigPage.url}}"/>
25+
<waitForPageLoad stepKey="waitForAdminConfig"/>
2526
<click stepKey="clickAdvancedReportingConfigMenu" selector="{{AdminConfigSection.advancedReportingMenuItem}}"/>
2627
<see stepKey="seeAdvancedReportingIndustryLabel" selector="{{AdminConfigSection.advancedReportingIndustryLabel}}" userInput="Industry"/>
2728
<selectOption stepKey="selectAdvancedReportingIndustry" selector="{{AdminConfigSection.advancedReportingIndustry}}" userInput="--Please Select--"/>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
<severity value="MAJOR"/>
1717
<testCaseId value="MAGETWO-66465"/>
1818
<group value="analytics"/>
19-
<!-- MAGETWO-90659 -->
20-
<group value="skip"/>
19+
<skip>
20+
<issueId value="MAGETWO-90659"/>
21+
</skip>
2122
</annotations>
2223
<after>
2324
<amOnPage stepKey="amOnLogoutPage" url="admin/admin/auth/logout/"/>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
<severity value="MAJOR"/>
1818
<testCaseId value="MAGETWO-63898"/>
1919
<group value="analytics"/>
20-
<!-- MAGETWO-90659 -->
21-
<group value="skip"/>
20+
<skip>
21+
<issueId value="MAGETWO-90659"/>
22+
</skip>
2223
</annotations>
2324

2425
<actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-82648"/>
1919
<group value="analytics"/>
20-
<!-- MAGETWO-90659 -->
21-
<group value="skip"/>
20+
<skip>
21+
<issueId value="MAGETWO-90659"/>
22+
</skip>
2223
</annotations>
2324
<before>
2425
<createData stepKey="noReportUserRole" entity="adminNoReportRole"/>

0 commit comments

Comments
 (0)