Skip to content

Commit 11a30c1

Browse files
dkvashninbaydkvashninbay
committed
Merge remote-tracking branch 'main_ce/develop' into static_tests
2 parents c148d22 + b3c9fff commit 11a30c1

File tree

1,145 files changed

+2124
-2087
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,145 files changed

+2124
-2087
lines changed

‎dev/tests/functional/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
!/config/isolation.yml.dist
99
!/config/server.yml.dist
1010
phpunit.xml
11-
/lib/Mtf/Util/Generate/testcase.xml
11+
/lib/Magento/Mtf/Util/Generate/testcase.xml

‎dev/tests/functional/composer.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"require": {
3-
"magento/mtf": "1.0.0-rc13",
3+
"magento/mtf": "1.0.0-rc14",
44
"php": ">=5.4.0",
55
"phpunit/phpunit": "4.1.0",
66
"phpunit/phpunit-selenium": ">=1.2",
@@ -11,8 +11,7 @@
1111
},
1212
"autoload": {
1313
"psr-4": {
14-
"Mtf\\": ["lib/Mtf/", "generated/Mtf/", "testsuites/Mtf/"],
15-
"Magento\\": ["generated/Magento/", "tests/app/Magento/"],
14+
"Magento\\": ["lib/Magento/", "testsuites/Magento", "generated/Magento/", "tests/app/Magento/"],
1615
"Test\\": "generated/Test/"
1716
}
1817
}

‎dev/tests/functional/composer.json.dist

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@
66
"phpunit/phpunit-selenium": ">=1.2",
77
"netwing/selenium-server-standalone": ">=2.35"
88
},
9+
"suggest": {
10+
"facebook/webdriver": "dev-master"
11+
},
912
"autoload": {
1013
"psr-4": {
11-
"Mtf\\": ["lib/Mtf/", "generated/Mtf/", "testsuites/Mtf/"],
12-
"Magento\\": ["generated/Magento/", "tests/app/Magento/"],
14+
"Magento\\": ["lib/Magento/", "testsuites/Magento", "generated/Magento/", "tests/app/Magento/"],
1315
"Test\\": "generated/Test/"
1416
}
1517
}

‎dev/tests/functional/etc/global/di.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
9-
<preference for="Mtf\Util\Generate\Fixture\FieldsProviderInterface" type="Mtf\Util\Generate\Fixture\FieldsProvider" />
10-
<preference for="Mtf\Util\Generate\Repository\CollectionProviderInterface" type="Mtf\Util\Generate\Repository\CollectionProvider" />
9+
<preference for="Magento\Mtf\Util\Generate\Fixture\FieldsProviderInterface" type="Magento\Mtf\Util\Generate\Fixture\FieldsProvider" />
10+
<preference for="Magento\Mtf\Util\Generate\Repository\CollectionProviderInterface" type="Magento\Mtf\Util\Generate\Repository\CollectionProvider" />
1111
</config>

‎dev/tests/functional/lib/Mtf/App/State/AbstractState.php renamed to ‎dev/tests/functional/lib/Magento/Mtf/App/State/AbstractState.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
namespace Mtf\App\State;
7+
namespace Magento\Mtf\App\State;
88

99
use Magento\Framework\App\DeploymentConfig\DbConfig;
1010
use Magento\Framework\App\Filesystem\DirectoryList;
@@ -39,7 +39,8 @@ public function apply()
3939
*/
4040
public function clearInstance()
4141
{
42-
$dirList = \Mtf\ObjectManagerFactory::getObjectManager()->get('Magento\Framework\Filesystem\DirectoryList');
42+
$dirList = \Magento\Mtf\ObjectManagerFactory::getObjectManager()
43+
->get('Magento\Framework\Filesystem\DirectoryList');
4344
$deploymentConfig = new \Magento\Framework\App\DeploymentConfig(
4445
new \Magento\Framework\App\DeploymentConfig\Reader($dirList),
4546
[]

‎dev/tests/functional/lib/Mtf/App/State/State1.php renamed to ‎dev/tests/functional/lib/Magento/Mtf/App/State/State1.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
namespace Mtf\App\State;
7+
namespace Magento\Mtf\App\State;
88

9-
use Mtf\ObjectManager;
10-
use Mtf\Fixture\FixtureFactory;
9+
use Magento\Mtf\ObjectManager;
10+
use Magento\Mtf\Fixture\FixtureFactory;
1111
use Magento\Core\Test\Fixture\ConfigData;
1212

1313
/**

‎dev/tests/functional/lib/Mtf/Client/Element/ConditionsElement.php renamed to ‎dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
namespace Mtf\Client\Element;
7+
namespace Magento\Mtf\Client\Element;
88

9-
use Mtf\ObjectManager;
10-
use Mtf\Client\Locator;
11-
use Mtf\Client\ElementInterface;
9+
use Magento\Mtf\ObjectManager;
10+
use Magento\Mtf\Client\Locator;
11+
use Magento\Mtf\Client\ElementInterface;
1212

1313
/**
1414
* Class ConditionsElement

‎dev/tests/functional/lib/Mtf/Client/Element/DatepickerElement.php renamed to ‎dev/tests/functional/lib/Magento/Mtf/Client/Element/DatepickerElement.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
namespace Mtf\Client\Element;
7+
namespace Magento\Mtf\Client\Element;
88

9-
use Mtf\Client\Locator;
9+
use Magento\Mtf\Client\Locator;
1010

1111
/**
1212
* General class for datepicker elements.

‎dev/tests/functional/lib/Mtf/Client/Element/GlobalsearchElement.php renamed to ‎dev/tests/functional/lib/Magento/Mtf/Client/Element/GlobalsearchElement.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
namespace Mtf\Client\Element;
7+
namespace Magento\Mtf\Client\Element;
88

9-
use Mtf\Client\Locator;
10-
use Mtf\Client\ElementInterface;
9+
use Magento\Mtf\Client\Locator;
10+
use Magento\Mtf\Client\ElementInterface;
1111

1212
/**
1313
* Typified element class for global search element.

‎dev/tests/functional/lib/Mtf/Client/Element/JquerytreeElement.php renamed to ‎dev/tests/functional/lib/Magento/Mtf/Client/Element/JquerytreeElement.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
namespace Mtf\Client\Element;
7+
namespace Magento\Mtf\Client\Element;
88

9-
use Mtf\Client\ElementInterface;
9+
use Magento\Mtf\Client\ElementInterface;
1010

1111
/**
1212
* Class JquerytreeElement

0 commit comments

Comments
 (0)