Skip to content

Commit 90b3eb0

Browse files
author
Dmytro Aponasenko
committed
Merge remote-tracking branch 'origin/MTA-1249' into develop
2 parents 697c2b8 + a9dd67d commit 90b3eb0

30 files changed

+1588
-2
lines changed

‎dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest/test.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"description";"catalogSearch/data/query_text/value";"constraint";"tag"
2-
"MAGETWO-12420: Use Quick Search to Find the Product";"catalogProductSimple::default::sku";"","bamboo_plan:BAT"
2+
"MAGETWO-12420: Use Quick Search to Find the Product";"catalogProductSimple::default::sku";"assertProductCanBeOpenedFromSearchResult";"bamboo_plan:BAT"
33
"Search simple product";"catalogProductSimple::default::simple";"assertCatalogSearchResult";""
44
"Search virtual product";"catalogProductVirtual::default::virtual";"assertCatalogSearchResult";""
55
"Search configurable product";"configurableProductInjectable::default::configurable";"assertCatalogSearchResult";""

‎dev/tests/functional/tests/app/Magento/CatalogSearch/Test/etc/constraint.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
<browser class="Mtf\Client\Browser" />
120120
</require>
121121
</assertSearchSynonymMassActionNotOnFrontend>
122-
<assertProductCanBeOpenedFromSearchResult>
122+
<assertProductCanBeOpenedFromSearchResult module="Magento_CatalogSearch">
123123
<severity>high</severity>
124124
<require>
125125
<catalogSearch class="Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery" />

‎dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.php

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?php
2+
/**
3+
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
4+
*/
5+
6+
namespace Magento\Install\Test\Block;
7+
8+
use Mtf\Block\Form;
9+
use Mtf\Client\Element\Locator;
10+
11+
/**
12+
* Create Admin Account block.
13+
*/
14+
class CreateAdmin extends Form
15+
{
16+
/**
17+
* 'Next' button.
18+
*
19+
* @var string
20+
*/
21+
protected $next = "[ng-click*='next']";
22+
23+
/**
24+
* Click on 'Next' button.
25+
*
26+
* @return void
27+
*/
28+
public function clickNext()
29+
{
30+
$this->_rootElement->find($this->next, Locator::SELECTOR_CSS)->click();
31+
}
32+
}

‎dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" ?>
2+
<!--
3+
/**
4+
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
5+
*/
6+
-->
7+
<mapping strict="0">
8+
<fields>
9+
<username>
10+
<selector>[name='adminUsername']</selector>
11+
</username>
12+
<email>
13+
<selector>[name='adminEmail']</selector>
14+
</email>
15+
<password>
16+
<selector>[name='adminPassword']</selector>
17+
</password>
18+
<password_confirmation>
19+
<selector>[name='adminConfirm']</selector>
20+
</password_confirmation>
21+
</fields>
22+
</mapping>

‎dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.php

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?php
2+
/**
3+
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
4+
*/
5+
6+
namespace Magento\Install\Test\Block;
7+
8+
use Mtf\Block\Form;
9+
use Mtf\Client\Element\Locator;
10+
11+
/**
12+
* Customize Your Store block.
13+
*/
14+
class CustomizeStore extends Form
15+
{
16+
/**
17+
* 'Next' button.
18+
*
19+
* @var string
20+
*/
21+
protected $next = "[ng-click*='next']";
22+
23+
/**
24+
* Click on 'Next' button.
25+
*
26+
* @return void
27+
*/
28+
public function clickNext()
29+
{
30+
$this->_rootElement->find($this->next, Locator::SELECTOR_CSS)->click();
31+
}
32+
}

‎dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" ?>
2+
<!--
3+
/**
4+
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
5+
*/
6+
-->
7+
<mapping strict="0">
8+
<fields>
9+
<currency>
10+
<selector>[ng-model*='currency']</selector>
11+
<input>select</input>
12+
</currency>
13+
<language>
14+
<selector>[ng-model*='language']</selector>
15+
<input>select</input>
16+
</language>
17+
</fields>
18+
</mapping>

‎dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.php

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<?php
2+
/**
3+
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
4+
*/
5+
6+
namespace Magento\Install\Test\Block;
7+
8+
use Mtf\Block\Form;
9+
use Mtf\Client\Element\Locator;
10+
11+
/**
12+
* Database form.
13+
*/
14+
class Database extends Form
15+
{
16+
/**
17+
* 'Test connection successful.' message.
18+
*
19+
* @var string
20+
*/
21+
protected $successConnectionMessage = ".text-success";
22+
23+
/**
24+
* 'Next' button.
25+
*
26+
* @var string
27+
*/
28+
protected $next = "[ng-click*='testConnection']";
29+
30+
/**
31+
* Get 'Test connection successful.' message.
32+
*
33+
* @return string
34+
*/
35+
public function getSuccessConnectionMessage()
36+
{
37+
return $this->_rootElement->find($this->successConnectionMessage, Locator::SELECTOR_CSS)->getText();
38+
}
39+
40+
/**
41+
* Click on 'Next' button.
42+
*
43+
* @return void
44+
*/
45+
public function clickNext()
46+
{
47+
$this->_rootElement->find($this->next, Locator::SELECTOR_CSS)->click();
48+
}
49+
}

‎dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" ?>
2+
<!--
3+
/**
4+
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
5+
*/
6+
-->
7+
<mapping strict="0">
8+
<fields>
9+
<dbHost />
10+
<dbUser />
11+
<dbPassword />
12+
<dbName>
13+
<selector>[name="dbname"]</selector>
14+
</dbName>
15+
<dbTablePrefix />
16+
</fields>
17+
</mapping>

‎dev/tests/functional/tests/app/Magento/Install/Test/Block/Install.php

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
<?php
2+
/**
3+
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
4+
*/
5+
6+
namespace Magento\Install\Test\Block;
7+
8+
use Mtf\Block\Block;
9+
use Mtf\Client\Element\Locator;
10+
11+
/**
12+
* Install block.
13+
*/
14+
class Install extends Block
15+
{
16+
/**
17+
* 'Install Now' button.
18+
*
19+
* @var string
20+
*/
21+
protected $installNow = "//*[@ng-show='!isStarted']/button";
22+
23+
/**
24+
* Admin info block.
25+
*
26+
* @var string
27+
*/
28+
protected $adminInfo = "//*[@id='admin-info']";
29+
30+
/**
31+
* Database info block.
32+
*
33+
* @var string
34+
*/
35+
protected $dbInfo = "//*[@id='db-info']";
36+
37+
/**
38+
* 'Launch Magento Admin' button.
39+
*
40+
* @var string
41+
*/
42+
protected $launchAdmin = "//*[@type='button']";
43+
44+
/**
45+
* Click on 'Install Now' button.
46+
*
47+
* @return void
48+
*/
49+
public function clickInstallNow()
50+
{
51+
$this->_rootElement->find($this->installNow, Locator::SELECTOR_XPATH)->click();
52+
$this->waitForElementVisible($this->launchAdmin, Locator::SELECTOR_XPATH);
53+
}
54+
55+
/**
56+
* Get admin info.
57+
*
58+
* @return string
59+
*/
60+
public function getAdminInfo()
61+
{
62+
$adminData = [];
63+
$rows = $this->_rootElement->find('#admin-info .row')->getElements();
64+
foreach ($rows as $row) {
65+
$dataRow = $row->find('div')->getElements();
66+
$key = strtolower(str_replace(' ', '_', str_replace(':', '', $dataRow[0]->getText())));
67+
$adminData[$key] = $dataRow[1]->getText();
68+
}
69+
70+
return $adminData;
71+
}
72+
73+
/**
74+
* Get database info.
75+
*
76+
* @return string
77+
*/
78+
public function getDbInfo()
79+
{
80+
$dbData = [];
81+
$rows = $this->_rootElement->find('#db-info .row')->getElements();
82+
foreach ($rows as $row) {
83+
$dataRow = $row->find('div')->getElements();
84+
$key = strtolower(str_replace(' ', '_', str_replace(':', '', $dataRow[0]->getText())));
85+
$dbData[$key] = $dataRow[1]->getText();
86+
}
87+
88+
return $dbData;
89+
}
90+
91+
/**
92+
* Click on 'Launch Magento Admin' button.
93+
*
94+
* @return void
95+
*/
96+
public function clickLaunchAdmin()
97+
{
98+
$this->_rootElement->find($this->launchAdmin, Locator::SELECTOR_XPATH)->click();
99+
}
100+
}

‎dev/tests/functional/tests/app/Magento/Install/Test/Block/Landing.php

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<?php
2+
/**
3+
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
4+
*/
5+
6+
namespace Magento\Install\Test\Block;
7+
8+
use Mtf\Block\Block;
9+
use Mtf\Client\Element\Locator;
10+
11+
/**
12+
* Landing block.
13+
*/
14+
class Landing extends Block
15+
{
16+
/**
17+
* 'Agree and Set up Magento' button.
18+
*
19+
* @var string
20+
*/
21+
protected $agreeAndSetup = '.btn-lg.btn-primary';
22+
23+
/**
24+
* 'Terms & Agreement' link.
25+
*
26+
* @var string
27+
*/
28+
protected $termsAndAgreement = "[ng-click*='previous']";
29+
30+
/**
31+
* Click on 'Agree and Set up Magento' button.
32+
*
33+
* @return void
34+
*/
35+
public function clickAgreeAndSetup()
36+
{
37+
$this->_rootElement->find($this->agreeAndSetup, Locator::SELECTOR_CSS)->click();
38+
}
39+
40+
/**
41+
* Click on 'Terms & Agreement' link.
42+
*
43+
* @return void
44+
*/
45+
public function clickTermsAndAgreement()
46+
{
47+
$this->_rootElement->find($this->termsAndAgreement, Locator::SELECTOR_CSS)->click();
48+
}
49+
}

0 commit comments

Comments
 (0)