Skip to content

Commit 252c85f

Browse files
sivaschenkosivaschenko
committed
Merge pull request #199 from magento-firedrakes/MAGETWO-33616
[Firedrakes] MTF Configuration code clean up
2 parents bee1a30 + 0dbafb0 commit 252c85f

File tree

87 files changed

+127
-143
lines changed

Some content is hidden

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

87 files changed

+127
-143
lines changed

‎dev/tests/functional/bootstrap.php

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

7-
session_start();
87
defined('MTF_BOOT_FILE') || define('MTF_BOOT_FILE', __FILE__);
98
defined('MTF_BP') || define('MTF_BP', str_replace('\\', '/', (__DIR__)));
109
require_once __DIR__ . '/../../../app/bootstrap.php';

‎dev/tests/functional/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"require": {
3-
"magento/mtf": "1.0.0-rc20",
3+
"magento/mtf": "1.0.0-rc21",
44
"php": "~5.5.0|~5.6.0",
55
"phpunit/phpunit": "4.1.0",
66
"phpunit/phpunit-selenium": ">=1.2",

‎dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/BackendDecorator.php

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace Magento\Mtf\Util\Protocol\CurlTransport;
88

9-
use Magento\Mtf\Config;
9+
use Magento\Mtf\Config\DataInterface;
1010
use Magento\Mtf\Util\Protocol\CurlInterface;
1111
use Magento\Mtf\Util\Protocol\CurlTransport;
1212

@@ -40,17 +40,17 @@ class BackendDecorator implements CurlInterface
4040
/**
4141
* System config
4242
*
43-
* @var Config
43+
* @var DataInterface
4444
*/
4545
protected $configuration;
4646

4747
/**
4848
* Constructor
4949
*
5050
* @param CurlTransport $transport
51-
* @param Config $configuration
51+
* @param DataInterface $configuration
5252
*/
53-
public function __construct(CurlTransport $transport, Config $configuration)
53+
public function __construct(CurlTransport $transport, DataInterface $configuration)
5454
{
5555
$this->transport = $transport;
5656
$this->configuration = $configuration;
@@ -65,11 +65,10 @@ public function __construct(CurlTransport $transport, Config $configuration)
6565
*/
6666
protected function authorize()
6767
{
68-
$url = $_ENV['app_backend_url'] .
69-
$this->configuration->getParameter('application/backendLoginUrl');
68+
$url = $_ENV['app_backend_url'] . $this->configuration->get('application/0/backendLoginUrl/0/value');
7069
$data = [
71-
'login[username]' => $this->configuration->getParameter('application/backendLogin'),
72-
'login[password]' => $this->configuration->getParameter('application/backendPassword'),
70+
'login[username]' => $this->configuration->get('application/0/backendLogin/0/value'),
71+
'login[password]' => $this->configuration->get('application/0/backendPassword/0/value'),
7372
];
7473
$this->transport->write(CurlInterface::POST, $url, '1.0', [], $data);
7574
$response = $this->read();

‎dev/tests/functional/phpunit.xml.dist

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
</arguments>
2727
</listener>
2828
<listener class="Magento\Mtf\System\Event\StateListener" />
29-
<listener class="Magento\Mtf\System\JUnit"/>
3029
</listeners>
3130

3231
<php>
@@ -37,7 +36,6 @@
3736
<env name="log_directory" value="var/log" />
3837
<env name="events_preset" value="base" />
3938
<env name="module_whitelist" value="Magento_Install,Magento_Core" />
40-
<env name="report_file_name" value="test-cases-report.xml"/>
4139
<env name="basedir" value="var/log" />
4240
<env name="credentials_file_path" value="./credentials.xml.dist" />
4341
</php>

‎dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/Admin/SuperAdmin.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ protected function _initData()
2222
$this->_data = [
2323
'fields' => [
2424
'username' => [
25-
'value' => $this->_configuration->getParameter('application/backendLogin'),
25+
'value' => $this->_configuration->get('application/0/backendLogin/0/value'),
2626
],
2727
'password' => [
28-
'value' => $this->_configuration->getParameter('application/backendPassword'),
28+
'value' => $this->_configuration->get('application/0/backendPassword/0/value'),
2929
],
3030
],
3131
];

‎dev/tests/functional/tests/app/Magento/Backend/Test/Fixture/GlobalSearch.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
99
<fixture name="globalSearch" module="Magento_Backend" class="Magento\Backend\Test\Fixture\GlobalSearch">
1010
<dataset name="default">
1111
<field name="query" xsi:type="string">catalogProductSimple::default::name</field>

‎dev/tests/functional/tests/app/Magento/Backend/Test/Handler/Extractor.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
namespace Magento\Backend\Test\Handler;
99

10-
use Magento\Mtf\Config;
1110
use Magento\Mtf\Util\Protocol\CurlInterface;
1211
use Magento\Mtf\Util\Protocol\CurlTransport;
1312
use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
@@ -62,8 +61,8 @@ public function __construct($url, $regExpPattern, $isAll = false)
6261
*/
6362
public function getData()
6463
{
65-
/** @var \Magento\Mtf\Config $config */
66-
$config = \Magento\Mtf\ObjectManagerFactory::getObjectManager()->get('Magento\Mtf\Config');
64+
/** @var \Magento\Mtf\Config\DataInterface $config */
65+
$config = \Magento\Mtf\ObjectManagerFactory::getObjectManager()->get('Magento\Mtf\Config\DataInterface');
6766
$url = $_ENV['app_backend_url'] . $this->url;
6867
$curl = new BackendDecorator(new CurlTransport(), $config);
6968
$curl->addOption(CURLOPT_HEADER, 1);

‎dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
99
<fixture name="bundleProduct" module="Magento_Bundle" type="eav" entity_type="catalog_product" product_type="bundle" collection="Magento\Catalog\Model\Resource\Product\Collection" identifier="sku" repository_class="Magento\Bundle\Test\Repository\BundleProduct" handler_interface="Magento\Bundle\Test\Handler\BundleProduct\BundleProductInterface" class="Magento\Bundle\Test\Fixture\BundleProduct">
1010
<dataset name="default">
1111
<field name="name" xsi:type="string">BundleProduct %isolation%</field>

‎dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/BundleProduct/Curl.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
use Magento\Bundle\Test\Fixture\BundleProduct;
1010
use Magento\Catalog\Test\Handler\CatalogProductSimple\Curl as ProductCurl;
1111
use Magento\Mtf\Fixture\FixtureInterface;
12-
use Magento\Mtf\Config;
12+
use Magento\Mtf\Config\DataInterface;
13+
use Magento\Mtf\System\Event\EventManagerInterface;
1314

1415
/**
1516
* Create new bundle product via curl.
@@ -25,11 +26,12 @@ class Curl extends ProductCurl implements BundleProductInterface
2526

2627
/**
2728
* @constructor
28-
* @param Config $configuration
29+
* @param DataInterface $configuration
30+
* @param EventManagerInterface $eventManager
2931
*/
30-
public function __construct(Config $configuration)
32+
public function __construct(DataInterface $configuration, EventManagerInterface $eventManager)
3133
{
32-
parent::__construct($configuration);
34+
parent::__construct($configuration, $eventManager);
3335

3436
$this->mappingData += [
3537
'selection_can_change_qty' => [

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogAttributeSet.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
99
<fixture name="catalogAttributeSet" module="Magento_Catalog" type="flat" entity_type="eav_attribute_set" collection="Magento\Catalog\Model\Resource\Product\Link\Product\Collection" repository_class="Magento\Catalog\Test\Repository\CatalogAttributeSet" handler_interface="Magento\Catalog\Test\Handler\CatalogAttributeSet\CatalogAttributeSetInterface" class="Magento\Catalog\Test\Fixture\CatalogAttributeSet">
1010
<dataset name="default">
1111
<field name="attribute_set_name" xsi:type="string">Default_attribute_set_%isolation%</field>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
99
<fixture name="catalogProductAttribute" module="Magento_Catalog" type="composite" collection="Magento\Catalog\Model\Resource\Attribute" repository_class="Magento\Catalog\Test\Repository\CatalogProductAttribute" handler_interface="Magento\Catalog\Test\Handler\CatalogProductAttribute\CatalogProductAttributeInterface" class="Magento\Catalog\Test\Fixture\CatalogProductAttribute">
1010
<dataset name="default">
1111
<field name="frontend_label" xsi:type="string">attribute_label%isolation%</field>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
99
<fixture name="catalogProductSimple" module="Magento_Catalog" type="eav" entity_type="catalog_product" product_type="simple" collection="Magento\Catalog\Model\Resource\Product\Collection" identifier="sku" repository_class="Magento\Catalog\Test\Repository\CatalogProductSimple" handler_interface="Magento\Catalog\Test\Handler\CatalogProductSimple\CatalogProductSimpleInterface" class="Magento\Catalog\Test\Fixture\CatalogProductSimple">
1010
<dataset name="default">
1111
<field name="name" xsi:type="string">Test simple product %isolation%</field>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/TaxClass.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
use Magento\Tax\Test\Fixture\TaxClass as FixtureTaxClass;
1010
use Magento\Mtf\Fixture\FixtureFactory;
1111
use Magento\Mtf\Fixture\FixtureInterface;
12-
use Magento\Mtf\Config;
1312
use Magento\Mtf\Util\Protocol\CurlInterface;
1413
use Magento\Mtf\Util\Protocol\CurlTransport;
1514
use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
@@ -89,7 +88,7 @@ public function __construct(FixtureFactory $fixtureFactory, array $params, $data
8988
protected function setTaxClassId($taxClassName)
9089
{
9190
$url = $_ENV['app_backend_url'] . 'tax/rule/new/';
92-
$config = \Magento\Mtf\ObjectManagerFactory::getObjectManager()->create('Magento\Mtf\Config');
91+
$config = \Magento\Mtf\ObjectManagerFactory::getObjectManager()->create('Magento\Mtf\Config\DataInterface');
9392
$curl = new BackendDecorator(new CurlTransport(), $config);
9493
$curl->addOption(CURLOPT_HEADER, 1);
9594
$curl->write(CurlInterface::POST, $url, '1.0', [], []);

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
99
<fixture name="catalogProductVirtual" module="Magento_Catalog" type="eav" entity_type="catalog_product" product_type="virtual" collection="Magento\Catalog\Model\Resource\Product\Collection" identifier="sku" repository_class="Magento\Catalog\Test\Repository\CatalogProductVirtual" handler_interface="Magento\Catalog\Test\Handler\CatalogProductVirtual\CatalogProductVirtualInterface" class="Magento\Catalog\Test\Fixture\CatalogProductVirtual">
1010
<dataset name="default">
1111
<field name="name" xsi:type="string">Test virtual product %isolation%</field>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
99
<fixture name="category" module="Magento_Catalog" type="eav" entity_type="catalog_category_entity" collection="Magento\Catalog\Model\Resource\Category\Collection" repository_class="Magento\Catalog\Test\Repository\Category" handler_interface="Magento\Catalog\Test\Handler\Category\CategoryInterface" class="Magento\Catalog\Test\Fixture\Category">
1010
<dataset name="default">
1111
<field name="name" xsi:type="string">Category%isolation%</field>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogAttributeSet/Curl.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
1010
use Magento\Mtf\Fixture\FixtureInterface;
1111
use Magento\Mtf\Handler\Curl as AbstractCurl;
12-
use Magento\Mtf\Config;
1312
use Magento\Mtf\Util\Protocol\CurlInterface;
1413
use Magento\Mtf\Util\Protocol\CurlTransport;
1514
use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Curl.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,8 @@ protected function createProduct(array $data, array $config)
405405
$curl->close();
406406

407407
if (!strpos($response, 'data-ui-id="messages-message-success"')) {
408-
throw new \Exception("Product creation by curl handler was not successful! Response: $response");
408+
$this->_eventManager->dispatchEvent(['curl_failed'], [$response]);
409+
throw new \Exception('Product creation by curl handler was not successful!');
409410
}
410411

411412
return $this->parseResponse($response);

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Category/Curl.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
use Magento\Mtf\Fixture\FixtureInterface;
1010
use Magento\Mtf\Handler\Curl as AbstractCurl;
11-
use Magento\Mtf\Config;
1211
use Magento\Mtf\Util\Protocol\CurlInterface;
1312
use Magento\Mtf\Util\Protocol\CurlTransport;
1413
use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Curl/CreateProductAttribute.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
use Magento\Catalog\Test\Fixture\ProductAttribute;
1010
use Magento\Mtf\Fixture\FixtureInterface;
1111
use Magento\Mtf\Handler\Curl;
12-
use Magento\Mtf\Config;
1312
use Magento\Mtf\Util\Protocol\CurlInterface;
1413
use Magento\Mtf\Util\Protocol\CurlTransport;
1514
use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;

‎dev/tests/functional/tests/app/Magento/CatalogRule/Test/Fixture/CatalogRule.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
99
<fixture name="catalogRule" module="Magento_CatalogRule" type="eav" entity_type="catalog_rule" collection="Magento\CatalogRule\Model\Resource\Rule\Product\Price\Collection" repository_class="Magento\CatalogRule\Test\Repository\CatalogRule" handler_interface="Magento\CatalogRule\Test\Handler\CatalogRule\CatalogRuleInterface" class="Magento\CatalogRule\Test\Fixture\CatalogRule">
1010
<dataset name="default">
1111
<field name="name" xsi:type="string">CatalogPriceRule %isolation%</field>

‎dev/tests/functional/tests/app/Magento/CatalogRule/Test/Handler/CatalogRule/Curl.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
use Magento\Backend\Test\Handler\Conditions;
1010
use Magento\CatalogRule\Test\Handler\CatalogRule;
1111
use Magento\Mtf\Fixture\FixtureInterface;
12-
use Magento\Mtf\Config;
1312
use Magento\Mtf\Util\Protocol\CurlInterface;
1413
use Magento\Mtf\Util\Protocol\CurlTransport;
1514
use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;

‎dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Fixture/CatalogSearchQuery.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
99
<fixture name="catalogSearchQuery" module="Magento_CatalogSearch" type="flat" entity_type="search_query" collection="Magento\Search\Model\Resource\Query\Collection" repository_class="Magento\CatalogSearch\Test\Repository\CatalogSearchQuery" handler_interface="Magento\CatalogSearch\Test\Handler\CatalogSearchQuery\CatalogSearchQueryInterface" class="Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery">
1010
<field name="query_id" is_required="1">
1111
<default_value xsi:type="null"/>

‎dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Handler/CatalogSearchQuery/Curl.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
use Magento\Mtf\Fixture\FixtureInterface;
1010
use Magento\Mtf\Handler\Curl as AbstractCurl;
11-
use Magento\Mtf\Config;
1211
use Magento\Mtf\Util\Protocol\CurlInterface;
1312
use Magento\Mtf\Util\Protocol\CurlTransport;
1413
use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;

‎dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
99
<fixture name="cart" module="Magento_Checkout" type="flat" entity_type="quote" repository_class="Magento\Checkout\Test\Repository\Cart" handler_interface="Magento\Checkout\Test\Handler\Cart\CartInterface" class="Magento\Checkout\Test\Fixture\Cart">
1010
<field name="entity_id" is_required="1">
1111
<default_value xsi:type="null"/>

‎dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Fixture/CheckoutAgreement.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
99
<fixture name="checkoutAgreement" module="Magento_CheckoutAgreements"
1010
type="flat" entity_type="checkout_agreement" collection="Magento\CheckoutAgreements\Model\Resource\Agreement\Collection"
1111
repository_class="Magento\CheckoutAgreements\Test\Repository\CheckoutAgreement"

‎dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Handler/CheckoutAgreement/Curl.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
use Magento\Mtf\Fixture\FixtureInterface;
1010
use Magento\Mtf\Handler\Curl as AbstractCurl;
11-
use Magento\Mtf\Config;
1211
use Magento\Mtf\Util\Protocol\CurlInterface;
1312
use Magento\Mtf\Util\Protocol\CurlTransport;
1413
use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;

‎dev/tests/functional/tests/app/Magento/Cms/Test/Fixture/CmsBlock.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
99
<fixture name="cmsBlock" module="Magento_Cms" type="flat" entity_type="cms_block" collection="Magento\Cms\Model\Resource\Block\Grid\Collection" identifier="identifier"
1010
handler_interface="Magento\Cms\Test\Handler\CmsBlock\CmsBlockInterface" class="Magento\Cms\Test\Fixture\CmsBlock">
1111
<dataset name="default">

‎dev/tests/functional/tests/app/Magento/Cms/Test/Fixture/CmsPage.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
99
<fixture name="cmsPage" module="Magento_Cms" type="flat" entity_type="cms_page" collection="Magento\Cms\Model\Resource\Page\Grid\Collection" identifier="identifier"
1010
repository_class="Magento\Cms\Test\Repository\CmsPage" handler_interface="Magento\Cms\Test\Handler\CmsPage\CmsPageInterface" class="Magento\Cms\Test\Fixture\CmsPage">
1111
<dataset name="default">

‎dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsBlock/Curl.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
use Magento\Mtf\Fixture\FixtureInterface;
1010
use Magento\Mtf\Handler\Curl as AbstractCurl;
11-
use Magento\Mtf\Config;
1211
use Magento\Mtf\Util\Protocol\CurlInterface;
1312
use Magento\Mtf\Util\Protocol\CurlTransport;
1413
use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;

‎dev/tests/functional/tests/app/Magento/Cms/Test/Handler/CmsPage/Curl.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
use Magento\Backend\Test\Handler\Conditions;
1010
use Magento\Mtf\Fixture\FixtureInterface;
11-
use Magento\Mtf\Config;
11+
use Magento\Mtf\Config\DataInterface;
12+
use Magento\Mtf\System\Event\EventManagerInterface;
1213
use Magento\Mtf\Util\Protocol\CurlInterface;
1314
use Magento\Mtf\Util\Protocol\CurlTransport;
1415
use Magento\Mtf\Util\Protocol\CurlTransport\BackendDecorator;
@@ -55,12 +56,13 @@ class Curl extends Conditions implements CmsPageInterface
5556

5657
/**
5758
* @constructor
58-
* @param Config $configuration
59+
* @param DataInterface $configuration
60+
* @param EventManagerInterface $eventManager
5961
*/
60-
public function __construct(Config $configuration)
62+
public function __construct(DataInterface $configuration, EventManagerInterface $eventManager)
6163
{
6264
$this->mappingData = array_merge($this->mappingData, $this->additionalMappingData);
63-
parent::__construct($configuration);
65+
parent::__construct($configuration, $eventManager);
6466
}
6567

6668
/**

0 commit comments

Comments
 (0)