Skip to content

Commit caf00c3

Browse files
author
Bohdan Korablov
committed
MAGETWO-55983: Stabilize Extension Manager functional test
1 parent 894b31b commit caf00c3

File tree

4 files changed

+19
-8
lines changed

4 files changed

+19
-8
lines changed

dev/tests/functional/tests/app/Magento/Setup/Test/Block/Extension/AbstractGrid.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ abstract class AbstractGrid extends Block
2727
*
2828
* @var string
2929
*/
30-
protected $dataGrid = '.admin__data-grid-outer-wrap';
30+
protected $dataGrid = '#installExtensionGrid';
3131

3232
/**
3333
* Container that contains name of the extension.

dev/tests/functional/tests/app/Magento/Setup/Test/Block/Extension/Grid.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,13 @@ class Grid extends AbstractGrid
6363
*/
6464
protected $notFoundMessage = '.not-found';
6565

66+
/**
67+
* Grid that contains the list of extensions.
68+
*
69+
* @var string
70+
*/
71+
protected $dataGrid = '#extensionGrid';
72+
6673
/**
6774
* Click to 'Install' button.
6875
*
@@ -132,8 +139,6 @@ public function findExtensionOnGrid(Extension $extension)
132139
{
133140
$this->_rootElement->waitUntil(
134141
function () {
135-
//TODO: Sleep will be removed after MAGETWO-52137
136-
sleep(10);
137142
$message = $this->_rootElement->find($this->notFoundMessage)->isVisible();
138143
$grid = $this->_rootElement->find($this->dataGrid)->isVisible();
139144

setup/view/magento/setup/extension-grid.phtml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,16 @@
3434
<div class="item-title">Products<br />Ready to Install</div>
3535
<div class="item-install">
3636
<button ui-sref="root.install" href="#install-extension-grid"
37-
ng-class="{'disabled' : !enabledInstall}"
37+
ng-class="{'disabled' : !enabledInstall, 'goInstall' : enabledInstall}"
3838
type="button" class="btn">
3939
Review and Install
4040
</button>
4141
</div>
4242
</li>
4343
<li class="item col-m-4">
44-
<div ng-hide="isOutOfSync" class="item-title item-date-title">Last Refresh at {{lastSyncTime}} on </div>
44+
<div ng-hide="isOutOfSync"
45+
class="item-title item-date-title"
46+
>Last Refresh at {{lastSyncTime}} on </div>
4547
<div ng-hide="isOutOfSync" class="item-date">
4648
{{lastSyncDate}}
4749
</div>
@@ -64,10 +66,14 @@
6466

6567
<div class="row" ng-show="$root.isMarketplaceAuthorized && extensionsProcessed && total == 0">
6668
<label class="form-label not-found">
67-
<b>You haven't purchased any extensions yet. Visit <a href="https://marketplace.magento.com">Marketplace</a> for purchasing extensions.</b><br/>
69+
<b>You haven't purchased any extensions yet. Visit <a href="https://marketplace.magento.com">Marketplace</a>
70+
for purchasing extensions.</b><br/>
6871
</label>
6972
</div>
70-
<div class="admin__data-grid-outer-wrap" ng-show="$root.isMarketplaceAuthorized && extensionsProcessed && total > 0">
73+
<div class="admin__data-grid-outer-wrap"
74+
ng-show="$root.isMarketplaceAuthorized && extensionsProcessed && total > 0"
75+
id="extensionGrid"
76+
>
7177
<div class="admin__data-grid-header">
7278
<div class="admin__data-grid-header-row row row-gutter">
7379
<div class="col-xs-3 module-summary">

setup/view/magento/setup/install-extension-grid.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</span>
1414
</div>
1515
</div>
16-
<div class="admin__data-grid-outer-wrap">
16+
<div class="admin__data-grid-outer-wrap" id="installExtensionGrid">
1717
<div class="admin__data-grid-header">
1818
<div class="admin__data-grid-header-row row row-gutter">
1919
<div class="col-xs-3">

0 commit comments

Comments
 (0)