Skip to content

Commit 9838f83

Browse files
author
Bohdan Korablov
committed
Merge remote-tracking branch 'mainline/2.3-develop' into MAGETWO-92986
2 parents ff19419 + 113bf62 commit 9838f83

File tree

2,415 files changed

+18258
-13935
lines changed

Some content is hidden

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

2,415 files changed

+18258
-13935
lines changed

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/LICENSE.txt renamed to ‎app/code/Magento/AdminNotification/Test/Mftf/LICENSE.txt

File renamed without changes.

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/LICENSE_AFL.txt renamed to ‎app/code/Magento/AdminNotification/Test/Mftf/LICENSE_AFL.txt

File renamed without changes.

‎app/code/Magento/AdminNotification/Test/Mftf/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Admin Notification Functional Tests
2+
3+
The Functional Test Module for **Magento Admin Notification** module.

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"name": "magento/functional-test-module-admin-notification",
3+
"description": "N/A",
4+
"config": {
5+
"sort-packages": true
6+
},
7+
"require": {
8+
"php": "~7.1.3||~7.2.0",
9+
"magento/magento2-functional-testing-framework": "2.2.0",
10+
"magento/functional-test-module-backend": "100.0.0-dev",
11+
"magento/functional-test-module-media-storage": "100.0.0-dev",
12+
"magento/functional-test-module-store": "100.0.0-dev",
13+
"magento/functional-test-module-ui": "100.0.0-dev"
14+
},
15+
"type": "magento2-test",
16+
"license": [
17+
"OSL-3.0",
18+
"AFL-3.0"
19+
]
20+
}

‎app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/CacheOutdatedTest.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ public function testGetIdentity($expectedSum, $cacheTypes)
6262
$this->assertEquals($expectedSum, $this->_messageModel->getIdentity());
6363
}
6464

65+
/**
66+
* @return array
67+
*/
6568
public function getIdentityDataProvider()
6669
{
6770
$cacheTypeMock1 = $this->createPartialMock(\stdClass::class, ['getCacheType']);
@@ -95,6 +98,9 @@ public function testIsDisplayed($expected, $allowed, $cacheTypes)
9598
$this->assertEquals($expected, $this->_messageModel->isDisplayed());
9699
}
97100

101+
/**
102+
* @return array
103+
*/
98104
public function isDisplayedDataProvider()
99105
{
100106
$cacheTypesMock = $this->createPartialMock(\stdClass::class, ['getCacheType']);

‎app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/ErrorTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ public function testIsDisplayed($expectedFirstRun, $data)
7272
$this->assertEquals($expectedFirstRun, $model->isDisplayed());
7373
}
7474

75+
/**
76+
* @return array
77+
*/
7578
public function isDisplayedDataProvider()
7679
{
7780
return [

‎app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/SecurityTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ public function testIsDisplayed($expectedResult, $cached, $response)
7676
$this->assertEquals($expectedResult, $this->_messageModel->isDisplayed());
7777
}
7878

79+
/**
80+
* @return array
81+
*/
7982
public function isDisplayedDataProvider()
8083
{
8184
return [

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/LICENSE.txt renamed to ‎app/code/Magento/AdvancedPricingImportExport/Test/Mftf/LICENSE.txt

File renamed without changes.

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/LICENSE_AFL.txt renamed to ‎app/code/Magento/AdvancedPricingImportExport/Test/Mftf/LICENSE_AFL.txt

File renamed without changes.

‎app/code/Magento/AdvancedPricingImportExport/Test/Mftf/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Advanced Pricing Import Export Functional Tests
2+
3+
The Functional Test Module for **Magento Advanced Pricing Import Export** module.

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"name": "magento/functional-test-module-advanced-pricing-import-export",
3+
"description": "N/A",
4+
"config": {
5+
"sort-packages": true
6+
},
7+
"require": {
8+
"php": "~7.1.3||~7.2.0",
9+
"magento/magento2-functional-testing-framework": "2.2.0",
10+
"magento/functional-test-module-catalog": "100.0.0-dev",
11+
"magento/functional-test-module-catalog-import-export": "100.0.0-dev",
12+
"magento/functional-test-module-catalog-inventory": "100.0.0-dev",
13+
"magento/functional-test-module-customer": "100.0.0-dev",
14+
"magento/functional-test-module-eav": "100.0.0-dev",
15+
"magento/functional-test-module-import-export": "100.0.0-dev",
16+
"magento/functional-test-module-store": "100.0.0-dev"
17+
},
18+
"type": "magento2-test",
19+
"license": [
20+
"OSL-3.0",
21+
"AFL-3.0"
22+
]
23+
}

‎app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTest.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,9 @@ public function testIsValidAddMessagesCall($value, $hasEmptyColumns, $customerGr
181181
$this->tierPrice->isValid($value);
182182
}
183183

184+
/**
185+
* @return array
186+
*/
184187
public function isValidResultFalseDataProvider()
185188
{
186189
return [
@@ -286,6 +289,9 @@ public function isValidResultFalseDataProvider()
286289
];
287290
}
288291

292+
/**
293+
* @return array
294+
*/
289295
public function isValidAddMessagesCallDataProvider()
290296
{
291297
return [

‎app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,9 @@ public function testGetAllWebsitesValue()
114114
$this->assertEquals($expectedResult, $result);
115115
}
116116

117+
/**
118+
* @return array
119+
*/
117120
public function isValidReturnDataProvider()
118121
{
119122
return [

‎app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/ValidatorTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ public function testInit()
7777
$this->validator->init(null);
7878
}
7979

80+
/**
81+
* @return array
82+
*/
8083
public function isValidDataProvider()
8184
{
8285
return [

‎app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -768,6 +768,9 @@ public function testSaveProductPrices($priceData, $oldSkus, $priceIn, $callNum)
768768
$this->invokeMethod($this->advancedPricing, 'saveProductPrices', [$priceData, 'table']);
769769
}
770770

771+
/**
772+
* @return array
773+
*/
771774
public function saveProductPricesDataProvider()
772775
{
773776
return [
@@ -839,6 +842,9 @@ public function testDeleteProductTierPrices(
839842
);
840843
}
841844

845+
/**
846+
* @return array
847+
*/
842848
public function deleteProductTierPricesDataProvider()
843849
{
844850
return [
@@ -921,6 +927,9 @@ public function testProcessCountExistingPrices(
921927
$this->invokeMethod($this->advancedPricing, 'processCountExistingPrices', [$prices, 'table']);
922928
}
923929

930+
/**
931+
* @return array
932+
*/
924933
public function processCountExistingPricesDataProvider()
925934
{
926935
return [

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/LICENSE.txt renamed to ‎app/code/Magento/AdvancedSearch/Test/Mftf/LICENSE.txt

File renamed without changes.

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/LICENSE_AFL.txt renamed to ‎app/code/Magento/AdvancedSearch/Test/Mftf/LICENSE_AFL.txt

File renamed without changes.

‎app/code/Magento/AdvancedSearch/Test/Mftf/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Advanced Search Functional Tests
2+
3+
The Functional Test Module for **Magento Advanced Search** module.

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"name": "magento/functional-test-module-advanced-search",
3+
"description": "N/A",
4+
"config": {
5+
"sort-packages": true
6+
},
7+
"require": {
8+
"magento/magento2-functional-testing-framework": "2.2.0",
9+
"magento/functional-test-module-backend": "100.0.0-dev",
10+
"magento/functional-test-module-catalog": "100.0.0-dev",
11+
"magento/functional-test-module-catalog-search": "100.0.0-dev",
12+
"magento/functional-test-module-config": "100.0.0-dev",
13+
"magento/functional-test-module-customer": "100.0.0-dev",
14+
"magento/functional-test-module-search": "100.0.0-dev",
15+
"magento/functional-test-module-store": "100.0.0-dev",
16+
"php": "~7.1.3||~7.2.0"
17+
},
18+
"type": "magento2-test",
19+
"license": [
20+
"proprietary"
21+
]
22+
}

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/LICENSE.txt renamed to ‎app/code/Magento/Amqp/Test/Mftf/LICENSE.txt

File renamed without changes.

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/LICENSE_AFL.txt renamed to ‎app/code/Magento/Amqp/Test/Mftf/LICENSE_AFL.txt

File renamed without changes.

‎app/code/Magento/Amqp/Test/Mftf/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Amqp Functional Tests
2+
3+
The Functional Test Module for **Magento Amqp** module.

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"name": "magento/functional-test-module-amqp",
3+
"description": "N/A",
4+
"config": {
5+
"sort-packages": true
6+
},
7+
"require": {
8+
"magento/magento2-functional-testing-framework": "2.2.0",
9+
"magento/framework-amqp": "100.0.0-dev",
10+
"magento/framework-message-queue": "100.0.0-dev",
11+
"php": "~7.1.3||~7.2.0"
12+
},
13+
"type": "magento2-test",
14+
"license": [
15+
"proprietary"
16+
]
17+
}

‎app/code/Magento/Amqp/Test/Unit/Setup/ConfigOptionsListTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,9 @@ public function testValidateNoOptions()
163163
$this->assertEquals($expectedResult, $this->model->validate($options, $this->deploymentConfigMock));
164164
}
165165

166+
/**
167+
* @return array
168+
*/
166169
public function getCreateConfigDataProvider()
167170
{
168171
return [

‎app/code/Magento/Analytics/Test/Mftf/Data/UserData.xml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="adminNoReport" type="user">
12+
<data key="username" unique="suffix">noreport</data>
13+
<data key="firstname">No</data>
14+
<data key="lastname">Report</data>
15+
<data key="email" unique="prefix">[email protected]</data>
16+
<data key="password">123123q</data>
17+
<data key="password_confirmation">123123q</data>
18+
<data key="interface_local">en_US</data>
19+
<data key="is_active">true</data>
20+
<data key="current_password">123123q</data>
21+
</entity>
22+
<entity name="restrictedWebUser" type="user">
23+
<data key="username" unique="suffix">restrictedWebUser</data>
24+
<data key="firstname">restricted</data>
25+
<data key="lastname">webUser</data>
26+
<data key="email" unique="prefix">[email protected]</data>
27+
<data key="password">123123q</data>
28+
<data key="password_confirmation">123123q</data>
29+
<data key="interface_local">en_US</data>
30+
<data key="is_active">true</data>
31+
<data key="current_password">123123q</data>
32+
</entity>
33+
</entities>

0 commit comments

Comments
 (0)