Skip to content

Commit aad6d8b

Browse files
sivaschenkosivaschenko
committed
Merge branch 'MAGETWO-32079-2' of https://github.corp.ebay.com/magento-firedrakes/magento2ce into MAGETWO-32081
Conflicts: dev/tests/functional/composer.json dev/tests/functional/lib/Mtf/Util/Generate/Factory/AbstractFactory.php
2 parents c858595 + b104ff2 commit aad6d8b

File tree

287 files changed

+1041
-1044
lines changed

Some content is hidden

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

287 files changed

+1041
-1044
lines changed

‎dev/tests/functional/composer.json

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
{
2-
"require": {
3-
"magento/mtf": "1.0.0-rc11",
4-
"php": ">=5.4.0",
5-
"phpunit/phpunit": "4.1.0",
6-
"phpunit/phpunit-selenium": ">=1.2",
7-
"netwing/selenium-server-standalone": ">=2.35"
8-
},
9-
"autoload": {
10-
"psr-4": {
11-
"Mtf\\": ["lib/Mtf/", "generated/Mtf/", "testsuites/Mtf/"],
12-
"Magento\\": ["generated/Magento/", "tests/app/Magento/"],
13-
"Test\\": "generated/Test/"
2+
"require": {
3+
"magento/mtf": "1.0.0-rc11",
4+
"php": ">=5.4.0",
5+
"phpunit/phpunit": "4.1.0",
6+
"phpunit/phpunit-selenium": ">=1.2",
7+
"netwing/selenium-server-standalone": ">=2.35",
8+
"facebook/webdriver": "dev-master"
9+
},
10+
"autoload": {
11+
"psr-4": {
12+
"Mtf\\": ["lib/Mtf/", "generated/Mtf/", "testsuites/Mtf/"],
13+
"Magento\\": ["generated/Magento/", "tests/app/Magento/"],
14+
"Test\\": "generated/Test/"
15+
}
1416
}
15-
}
1617
}

‎dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/OptgroupselectElement.php

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

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

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@
33
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
44
*/
55

6-
namespace Mtf\Client\Driver\Selenium\Element;
6+
namespace Mtf\Client\Element;
77

8-
use Mtf\Client\Driver\Selenium\Element as AbstractElement;
9-
use Mtf\Client\Element;
10-
use Mtf\Client\Element\Locator;
118
use Mtf\ObjectManager;
9+
use Mtf\Client\Locator;
1210

1311
/**
1412
* Class ConditionsElement
@@ -36,7 +34,7 @@
3634
*
3735
* @SuppressWarnings(PHPMD.TooManyFields)
3836
*/
39-
class ConditionsElement extends AbstractElement
37+
class ConditionsElement extends SimpleElement
4038
{
4139
/**
4240
* Main condition
@@ -186,10 +184,10 @@ public function setValue($value)
186184
* Add condition combination
187185
*
188186
* @param string $condition
189-
* @param Element $context
190-
* @return Element
187+
* @param SimpleElement $context
188+
* @return SimpleElement
191189
*/
192-
protected function addConditionsCombination($condition, Element $context)
190+
protected function addConditionsCombination($condition, SimpleElement $context)
193191
{
194192
$condition = $this->parseCondition($condition);
195193
$newCondition = $context->find($this->newCondition, Locator::SELECTOR_XPATH);
@@ -209,10 +207,10 @@ protected function addConditionsCombination($condition, Element $context)
209207
* Add conditions
210208
*
211209
* @param array $conditions
212-
* @param Element $context
210+
* @param SimpleElement $context
213211
* @return void
214212
*/
215-
protected function addMultipleCondition(array $conditions, Element $context)
213+
protected function addMultipleCondition(array $conditions, SimpleElement $context)
216214
{
217215
foreach ($conditions as $key => $condition) {
218216
$elementContext = is_numeric($key) ? $context : $this->addConditionsCombination($key, $context);
@@ -228,10 +226,10 @@ protected function addMultipleCondition(array $conditions, Element $context)
228226
* Add single Condition
229227
*
230228
* @param string $condition
231-
* @param Element $context
229+
* @param SimpleElement $context
232230
* @return void
233231
*/
234-
protected function addSingleCondition($condition, Element $context)
232+
protected function addSingleCondition($condition, SimpleElement $context)
235233
{
236234
$condition = $this->parseCondition($condition);
237235

@@ -255,14 +253,15 @@ function () use ($newCondition, $typeNew) {
255253
* Fill single condition
256254
*
257255
* @param array $rules
258-
* @param Element $element
256+
* @param SimpleElement $element
259257
* @return void
260258
* @throws \Exception
261259
*/
262-
protected function fillCondition(array $rules, Element $element)
260+
protected function fillCondition(array $rules, SimpleElement $element)
263261
{
264262
$this->resetKeyParam();
265263
foreach ($rules as $rule) {
264+
/** @var SimpleElement $param */
266265
$param = $this->findNextParam($element);
267266
$param->find('a')->click();
268267

@@ -286,13 +285,13 @@ function () use ($param, $input) {
286285
return $element->isVisible() ? true : null;
287286
}
288287
);
289-
$value = $param->find('select', Locator::SELECTOR_CSS, 'select');
288+
$value = $param->find('select', Locator::SELECTOR_TAG_NAME, 'select');
290289
if ($value->isVisible()) {
291290
$value->setValue($rule);
292291
$this->click();
293292
continue;
294293
}
295-
$value = $param->find('input');
294+
$value = $param->find('input', Locator::SELECTOR_TAG_NAME);
296295
if ($value->isVisible()) {
297296
$value->setValue($rule);
298297

@@ -355,11 +354,11 @@ protected function parseCondition($condition)
355354
/**
356355
* Find next param of condition for fill
357356
*
358-
* @param Element $context
359-
* @return Element
357+
* @param SimpleElement $context
358+
* @return SimpleElement
360359
* @throws \Exception
361360
*/
362-
protected function findNextParam(Element $context)
361+
protected function findNextParam(SimpleElement $context)
363362
{
364363
do {
365364
if (!isset($this->mapParams[$this->findKeyParam])) {

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@
33
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
44
*/
55

6-
namespace Mtf\Client\Driver\Selenium\Element;
6+
namespace Mtf\Client\Element;
77

8-
use Mtf\Client\Driver\Selenium\Element;
9-
use Mtf\Client\Element\Locator;
8+
use Mtf\Client\Locator;
109

1110
/**
1211
* General class for datepicker elements.
1312
*/
14-
class DatepickerElement extends Element
13+
class DatepickerElement extends SimpleElement
1514
{
1615
/**
1716
* DatePicker button.

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

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,21 @@
33
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
44
*/
55

6-
namespace Mtf\Client\Driver\Selenium\Element;
6+
namespace Mtf\Client\Element;
77

8-
use Mtf\Client\Element\Locator;
9-
use Mtf\Client\Driver\Selenium\Element;
8+
use Mtf\Client\Locator;
9+
use Mtf\Client\ElementInterface;
1010

1111
/**
1212
* Typified element class for global search element.
1313
*/
14-
class GlobalsearchElement extends Element
14+
class GlobalsearchElement extends SimpleElement
1515
{
16+
/**
17+
* "Backspace" key code.
18+
*/
19+
const BACKSPACE = "\xEE\x80\x83";
20+
1621
/**
1722
* Search icon selector.
1823
*
@@ -48,11 +53,6 @@ class GlobalsearchElement extends Element
4853
*/
4954
protected $resultItem = 'li';
5055

51-
/**
52-
* "Backspace" key code.
53-
*/
54-
const BACKSPACE = "\xEE\x80\x83";
55-
5656
/**
5757
* Set value.
5858
*
@@ -61,7 +61,7 @@ class GlobalsearchElement extends Element
6161
*/
6262
public function setValue($value)
6363
{
64-
$this->_eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
64+
$this->eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
6565

6666
$this->waitInitElement();
6767

@@ -70,7 +70,7 @@ public function setValue($value)
7070
}
7171
$this->selectWindow();
7272
$this->clear();
73-
$this->find($this->searchInput)->_getWrappedElement()->value($value);
73+
$this->find($this->searchInput)->setValue($value);
7474
$this->selectWindow();
7575

7676
$this->waitResult();
@@ -85,7 +85,7 @@ protected function clear()
8585
{
8686
$element = $this->find($this->searchInput);
8787
while ('' != $element->getValue()) {
88-
$element->keys([self::BACKSPACE]);
88+
$element->setValue([self::BACKSPACE]);
8989
}
9090
}
9191

@@ -96,8 +96,7 @@ protected function clear()
9696
*/
9797
protected function selectWindow()
9898
{
99-
$windowHandles = $this->_driver->windowHandles();
100-
$this->_driver->window(end($windowHandles));
99+
$this->driver->closeWindow();
101100
}
102101

103102
/**
@@ -108,10 +107,10 @@ protected function selectWindow()
108107
*/
109108
protected function waitInitElement()
110109
{
111-
$browser = clone $this;
112110
$selector = $this->initializedSuggest;
113111

114-
$browser->waitUntil(
112+
$browser = $this->driver;
113+
$this->driver->waitUntil(
115114
function () use ($browser, $selector) {
116115
return $browser->find($selector, Locator::SELECTOR_XPATH)->isVisible() ? true : null;
117116
}
@@ -125,10 +124,10 @@ function () use ($browser, $selector) {
125124
*/
126125
public function waitResult()
127126
{
128-
$browser = clone $this;
129127
$selector = $this->searchResult;
128+
$browser = $this->driver;
130129

131-
$browser->waitUntil(
130+
$this->driver->waitUntil(
132131
function () use ($browser, $selector) {
133132
if ($browser->find($selector)->isVisible()) {
134133
return true;
@@ -173,12 +172,12 @@ public function isExistValueInSearchResult($value)
173172
*/
174173
protected function getSearchResults()
175174
{
176-
/** @var Element $searchResult */
175+
/** @var ElementInterface $searchResult */
177176
$searchResult = $this->find($this->searchResult);
178-
$resultItems = $searchResult->find($this->resultItem)->getElements();
177+
$resultItems = $searchResult->getElements($this->resultItem);
179178
$resultArray = [];
180179

181-
/** @var Element $resultItem */
180+
/** @var SimpleElement $resultItem */
182181
foreach ($resultItems as $resultItem) {
183182
$resultItemLink = $resultItem->find('a');
184183
$resultText = $resultItemLink->isVisible()

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,11 @@
33
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
44
*/
55

6-
namespace Mtf\Client\Driver\Selenium\Element;
7-
8-
use Mtf\Client\Element;
6+
namespace Mtf\Client\Element;
97

108
/**
119
* Class JquerytreeElement
1210
* Typified element class for JqueryTree elements
13-
*
14-
* @package Mtf\Client\Element
1511
*/
1612
class JquerytreeElement extends Tree
1713
{
@@ -63,11 +59,11 @@ public function getStructure()
6359
/**
6460
* Recursive walks tree
6561
*
66-
* @param Element $node
62+
* @param SimpleElement $node
6763
* @param string $parentCssClass
6864
* @return array
6965
*/
70-
protected function _getNodeContent($node, $parentCssClass)
66+
protected function _getNodeContent(SimpleElement $node, $parentCssClass)
7167
{
7268
$counter = 1;
7369
$nextNodeSelector = $parentCssClass . " > " . $this->nodeSelector . ":nth-of-type($counter)";

0 commit comments

Comments
 (0)