Skip to content

Commit cc3f1d2

Browse files
author
Dmytro Vilchynskyi
committed
MAGETWO-31515: [UI] CSS styling for Installation Form
- fixed functional tests
1 parent 9d2d2a1 commit cc3f1d2

File tree

1 file changed

+14
-7
lines changed
  • dev/tests/functional/tests/app/Magento/Install/Test/Block

1 file changed

+14
-7
lines changed

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

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ class Install extends Block
2626
*
2727
* @var string
2828
*/
29-
protected $adminInfo = "//*[@id='admin-info']";
29+
protected $adminInfo = '#admin-info';
3030

3131
/**
3232
* Database info block.
3333
*
3434
* @var string
3535
*/
36-
protected $dbInfo = "//*[@id='db-info']";
36+
protected $dbInfo = '#db-info';
3737

3838
/**
3939
* 'Launch Magento Admin' button.
@@ -56,24 +56,31 @@ public function clickInstallNow()
5656
/**
5757
* Get admin info.
5858
*
59-
* @return string
59+
* @return array
6060
*/
6161
public function getAdminInfo()
6262
{
63-
return $this->getTableDataByCssLocator('#admin-info');
63+
return $this->getTableDataByCssLocator($this->adminInfo);
6464
}
6565

6666
/**
6767
* Get database info.
6868
*
69-
* @return string
69+
* @return array
7070
*/
7171
public function getDbInfo()
7272
{
73-
return $this->getTableDataByCssLocator('#db-info');
73+
return $this->getTableDataByCssLocator($this->dbInfo);
7474
}
7575

76-
private function getTableDataByCssLocator($locator)
76+
/**
77+
* Get table data by correspondent div css locator.
78+
* Data inside the table must be presented via <dt>/<dd>/<dl> tags due to actual HTML5 standard.
79+
*
80+
* @param string $locator
81+
* @return array
82+
*/
83+
protected function getTableDataByCssLocator($locator)
7784
{
7885
$data = [];
7986
$keys = [];

0 commit comments

Comments
 (0)