Skip to content

Commit e294325

Browse files
author
Dmytro Aponasenko
committed
Merge branch 'MTA-2651' of https://github.corp.ebay.com/magento-qmt/magento2ce into develop
2 parents 62a5577 + 62ae6fb commit e294325

File tree

19 files changed

+183
-134
lines changed

19 files changed

+183
-134
lines changed

‎dev/tests/functional/etc/events.xml

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,39 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="events.xsd">
99
<preset name="base">
1010
<observer class="Magento\Mtf\System\Observer\WebapiResponse">
11-
<tag name="webapi_failed"/>
11+
<tag name="webapi_failed" />
12+
</observer>
13+
</preset>
14+
<preset name="coverage" extends="base">
15+
<observer class="Magento\Mtf\System\Observer\PageUrl">
16+
<tag name="click_after"/>
17+
<tag name="accept_alert_after"/>
18+
<tag name="dismiss_alert_after"/>
19+
<tag name="open_after"/>
20+
<tag name="forward"/>
21+
<tag name="back"/>
22+
</observer>
23+
<observer class="Magento\Mtf\System\Observer\AppState">
24+
<tag name="app_state_applied"/>
25+
</observer>
26+
<observer class="Magento\Mtf\System\Observer\Log">
27+
<tag name="exception"/>
28+
<tag name="failure"/>
29+
<tag name="execution" />
30+
</observer>
31+
<observer class="Magento\Mtf\System\Observer\SourceCode">
32+
<tag name="exception"/>
33+
<tag name="failure"/>
34+
</observer>
35+
<observer class="Magento\Mtf\System\Observer\Screenshot">
36+
<tag name="exception"/>
37+
<tag name="failure"/>
38+
</observer>
39+
<observer class="Magento\Mtf\System\Observer\CurlResponse">
40+
<tag name="curl_failed"/>
41+
</observer>
42+
<observer class="Magento\Mtf\System\Observer\WebapiResponse">
43+
<tag name="webapi_failed" />
1244
</observer>
1345
</preset>
1446
</config>

‎dev/tests/functional/lib/Magento/Mtf/Page/BackendPage.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use Magento\Mtf\Factory\Factory;
99

1010
/**
11-
* Class BackendPage
11+
* Admin backend page.
1212
*
1313
* @SuppressWarnings(PHPMD.NumberOfChildren)
1414
*/
@@ -19,13 +19,13 @@ class BackendPage extends Page
1919
*
2020
* @return void
2121
*/
22-
protected function _init()
22+
protected function initUrl()
2323
{
24-
$this->_url = $_ENV['app_backend_url'] . static::MCA;
24+
$this->url = $_ENV['app_backend_url'] . static::MCA;
2525
}
2626

2727
/**
28-
* Open backend page and log in if needed
28+
* Open backend page and log in if needed.
2929
*
3030
* @param array $params
3131
* @return $this

‎dev/tests/functional/tests/app/Magento/Backend/Test/Page/AdminAuthLogin.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ class AdminAuthLogin extends Page
4343
/**
4444
* Constructor.
4545
*/
46-
protected function _init()
46+
protected function initUrl()
4747
{
48-
$this->_url = $_ENV['app_backend_url'] . self::MCA;
48+
$this->url = $_ENV['app_backend_url'] . self::MCA;
4949
}
5050

5151
/**
@@ -56,7 +56,7 @@ protected function _init()
5656
public function getLoginBlock()
5757
{
5858
return Factory::getBlockFactory()->getMagentoBackendAdminLogin(
59-
$this->_browser->find($this->loginBlock, Locator::SELECTOR_CSS)
59+
$this->browser->find($this->loginBlock, Locator::SELECTOR_CSS)
6060
);
6161
}
6262

@@ -68,7 +68,7 @@ public function getLoginBlock()
6868
public function getHeaderBlock()
6969
{
7070
return Factory::getBlockFactory()->getMagentoBackendPageHeader(
71-
$this->_browser->find($this->headerBlock, Locator::SELECTOR_CSS)
71+
$this->browser->find($this->headerBlock, Locator::SELECTOR_CSS)
7272
);
7373
}
7474

@@ -79,7 +79,7 @@ public function getHeaderBlock()
7979
*/
8080
public function getMessagesBlock()
8181
{
82-
return Factory::getBlockFactory()->getMagentoBackendMessages($this->_browser->find($this->messagesBlock));
82+
return Factory::getBlockFactory()->getMagentoBackendMessages($this->browser->find($this->messagesBlock));
8383
}
8484

8585
/**
@@ -89,7 +89,7 @@ public function getMessagesBlock()
8989
*/
9090
public function waitForHeaderBlock()
9191
{
92-
$browser = $this->_browser;
92+
$browser = $this->browser;
9393
$selector = $this->headerBlock;
9494
$browser->waitUntil(
9595
function () use ($browser, $selector) {

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/Search/Grid.php

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,26 @@
99
use Magento\Backend\Test\Block\Widget\Grid as GridInterface;
1010

1111
/**
12-
* Class Grid
12+
* Associated products grid.
1313
*/
1414
class Grid extends GridInterface
1515
{
1616
/**
17-
* 'Add Selected Products' button
17+
* 'Add Selected Products' button.
1818
*
1919
* @var string
2020
*/
2121
protected $addProducts = 'button.add';
2222

2323
/**
24-
* Filters array mapping
24+
* An element locator which allows to select entities in grid.
25+
*
26+
* @var string
27+
*/
28+
protected $selectItem = '[data-column=entity_id] input';
29+
30+
/**
31+
* Filters array mapping.
2532
*
2633
* @var array
2734
*/
@@ -35,18 +42,7 @@ class Grid extends GridInterface
3542
];
3643

3744
/**
38-
* Initialize block elements
39-
*
40-
* @return void
41-
*/
42-
protected function _init()
43-
{
44-
parent::_init();
45-
$this->selectItem = "[data-column=entity_id] input";
46-
}
47-
48-
/**
49-
* Press 'Add Selected Products' button
45+
* Press 'Add Selected Products' button.
5046
*
5147
* @return void
5248
*/

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategory.php

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,12 @@ class CatalogCategory extends Page
5050

5151
/**
5252
* Init page. Set page url.
53+
*
54+
* @return void
5355
*/
54-
protected function _init()
56+
protected function initUrl()
5557
{
56-
$this->_url = $_ENV['app_backend_url'] . self::MCA;
58+
$this->url = $_ENV['app_backend_url'] . self::MCA;
5759
}
5860

5961
/**
@@ -78,7 +80,7 @@ public function open(array $params = [])
7880
public function getFormBlock()
7981
{
8082
return Factory::getBlockFactory()->getMagentoCatalogAdminhtmlCategoryEditCategoryForm(
81-
$this->_browser->find($this->formBlock, Locator::SELECTOR_CSS)
83+
$this->browser->find($this->formBlock, Locator::SELECTOR_CSS)
8284
);
8385
}
8486

@@ -90,7 +92,7 @@ public function getFormBlock()
9092
public function getTreeBlock()
9193
{
9294
return Factory::getBlockFactory()->getMagentoCatalogAdminhtmlCategoryTree(
93-
$this->_browser->find($this->treeBlock, Locator::SELECTOR_CSS, 'tree'),
95+
$this->browser->find($this->treeBlock, Locator::SELECTOR_CSS, 'tree'),
9496
$this->getTemplateBlock()
9597
);
9698
}
@@ -103,7 +105,7 @@ public function getTreeBlock()
103105
public function getMessagesBlock()
104106
{
105107
return Factory::getBlockFactory()->getMagentoBackendMessages(
106-
$this->_browser->find($this->messagesBlock, Locator::SELECTOR_CSS)
108+
$this->browser->find($this->messagesBlock, Locator::SELECTOR_CSS)
107109
);
108110
}
109111

@@ -115,7 +117,7 @@ public function getMessagesBlock()
115117
public function getTemplateBlock()
116118
{
117119
return Factory::getBlockFactory()->getMagentoBackendTemplate(
118-
$this->_browser->find($this->templateBlock, Locator::SELECTOR_CSS)
120+
$this->browser->find($this->templateBlock, Locator::SELECTOR_CSS)
119121
);
120122
}
121123
}

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Category/CatalogCategoryEdit.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ class CatalogCategoryEdit extends Page
6161
*
6262
* @return void
6363
*/
64-
protected function _init()
64+
protected function initUrl()
6565
{
66-
$this->_url = $_ENV['app_backend_url'] . self::MCA;
66+
$this->url = $_ENV['app_backend_url'] . self::MCA;
6767
}
6868

6969
/**
@@ -88,7 +88,7 @@ public function open(array $params = [])
8888
public function getFormBlock()
8989
{
9090
return Factory::getBlockFactory()->getMagentoCatalogAdminhtmlCategoryEditCategoryForm(
91-
$this->_browser->find($this->formBlock, Locator::SELECTOR_CSS)
91+
$this->browser->find($this->formBlock, Locator::SELECTOR_CSS)
9292
);
9393
}
9494

@@ -100,7 +100,7 @@ public function getFormBlock()
100100
public function getTreeBlock()
101101
{
102102
return Factory::getBlockFactory()->getMagentoCatalogAdminhtmlCategoryTree(
103-
$this->_browser->find($this->treeBlock, Locator::SELECTOR_CSS),
103+
$this->browser->find($this->treeBlock, Locator::SELECTOR_CSS),
104104
$this->getTemplateBlock()
105105
);
106106
}
@@ -113,7 +113,7 @@ public function getTreeBlock()
113113
public function getMessagesBlock()
114114
{
115115
return Factory::getBlockFactory()->getMagentoBackendMessages(
116-
$this->_browser->find($this->messagesBlock, Locator::SELECTOR_CSS)
116+
$this->browser->find($this->messagesBlock, Locator::SELECTOR_CSS)
117117
);
118118
}
119119

@@ -125,7 +125,7 @@ public function getMessagesBlock()
125125
public function getTemplateBlock()
126126
{
127127
return Factory::getBlockFactory()->getMagentoBackendTemplate(
128-
$this->_browser->find($this->templateBlock, Locator::SELECTOR_CSS)
128+
$this->browser->find($this->templateBlock, Locator::SELECTOR_CSS)
129129
);
130130
}
131131

@@ -137,7 +137,7 @@ public function getTemplateBlock()
137137
public function getPageActionsBlock()
138138
{
139139
return Factory::getBlockFactory()->getMagentoBackendFormPageActions(
140-
$this->_browser->find($this->pageActionsBlock)
140+
$this->browser->find($this->pageActionsBlock)
141141
);
142142
}
143143
}

‎dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertEstimateShippingAndTax.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use Magento\Checkout\Test\Page\CheckoutCart;
1111
use Magento\Mtf\Constraint\AbstractConstraint;
1212
use Magento\Mtf\ObjectManager;
13+
use Magento\Mtf\System\Event\EventManagerInterface;
1314

1415
/**
1516
* Assert that grand total is equal to expected.
@@ -54,19 +55,21 @@ class AssertEstimateShippingAndTax extends AbstractConstraint
5455
/**
5556
* @constructor
5657
* @param ObjectManager $objectManager
58+
* @param EventManagerInterface $eventManager
5759
* @param AssertSubtotalInShoppingCart $assertSubtotalInShoppingCart
5860
* @param AssertGrandTotalInShoppingCart $assertGrandTotalInShoppingCart
5961
* @param AssertTaxInShoppingCart $assertTaxInShoppingCart
6062
* @param AssertShippingInShoppingCart $assertShippingInShoppingCart
6163
*/
6264
public function __construct(
6365
ObjectManager $objectManager,
66+
EventManagerInterface $eventManager,
6467
AssertSubtotalInShoppingCart $assertSubtotalInShoppingCart,
6568
AssertGrandTotalInShoppingCart $assertGrandTotalInShoppingCart,
6669
AssertTaxInShoppingCart $assertTaxInShoppingCart,
6770
AssertShippingInShoppingCart $assertShippingInShoppingCart
6871
) {
69-
parent::__construct($objectManager);
72+
parent::__construct($objectManager, $eventManager);
7073
$this->assertSubtotalInShoppingCart = $assertSubtotalInShoppingCart;
7174
$this->assertGrandTotalInShoppingCart = $assertGrandTotalInShoppingCart;
7275
$this->assertTaxInShoppingCart = $assertTaxInShoppingCart;

‎dev/tests/functional/tests/app/Magento/Customer/Test/Page/Address/DefaultAddress.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,31 @@
1111
use Magento\Mtf\Page\Page;
1212

1313
/**
14-
* Class DefaultAddress
15-
* Default address page
14+
* Default address page.
1615
*/
1716
class DefaultAddress extends Page
1817
{
1918
/**
20-
* URL for customer Dashboard
19+
* URL for customer Dashboard.
2120
*/
2221
const MCA = 'customer/address/index';
2322

2423
/**
25-
* Selector for default address block
24+
* Selector for default address block.
2625
*
2726
* @var string
2827
*/
2928
protected $defaultAddressesSelector = '.block-addresses-default';
3029

3130
/**
32-
* Get default addresses block
31+
* Get default addresses block.
3332
*
3433
* @return \Magento\Customer\Test\Block\Account\AddressesDefault
3534
*/
3635
public function getDefaultAddresses()
3736
{
3837
return Factory::getBlockFactory()->getMagentoCustomerAccountAddressesDefault(
39-
$this->_browser->find($this->defaultAddressesSelector, Locator::SELECTOR_CSS)
38+
$this->browser->find($this->defaultAddressesSelector, Locator::SELECTOR_CSS)
4039
);
4140
}
4241
}

‎dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountForgotPassword.php

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,36 +11,41 @@
1111
use Magento\Mtf\Page\Page;
1212

1313
/**
14+
* Customer forgot password page.
1415
*/
1516
class CustomerAccountForgotPassword extends Page
1617
{
1718
/**
18-
* URL for reset customer password
19+
* URL for reset customer password.
1920
*/
2021
const MCA = 'customer/account/forgotpassword';
2122

2223
/**
24+
* Forgot password form.
25+
*
2326
* @var string
2427
*/
2528
protected $forgotPasswordForm = '#form-validate';
2629

2730
/**
28-
* Custom constructor
31+
* Init page. Set page url.
32+
*
33+
* @return void
2934
*/
30-
protected function _init()
35+
protected function initUrl()
3136
{
32-
$this->_url = $_ENV['app_frontend_url'] . self::MCA;
37+
$this->url = $_ENV['app_frontend_url'] . self::MCA;
3338
}
3439

3540
/**
36-
* Get Customer Forgot Password form
41+
* Get Customer Forgot Password form.
3742
*
3843
* @return \Magento\Customer\Test\Block\Form\ForgotPassword
3944
*/
4045
public function getForgotPasswordForm()
4146
{
4247
return Factory::getBlockFactory()->getMagentoCustomerFormForgotPassword(
43-
$this->_browser->find(
48+
$this->browser->find(
4449
$this->forgotPasswordForm,
4550
Locator::SELECTOR_CSS
4651
)

0 commit comments

Comments
 (0)