File tree Expand file tree Collapse file tree 4 files changed +19
-8
lines changed
dev/tests/functional/tests/app/Magento/Setup/Test/Block/Extension Expand file tree Collapse file tree 4 files changed +19
-8
lines changed Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ abstract class AbstractGrid extends Block
27
27
*
28
28
* @var string
29
29
*/
30
- protected $ dataGrid = '.admin__data-grid-outer-wrap ' ;
30
+ protected $ dataGrid = '#installExtensionGrid ' ;
31
31
32
32
/**
33
33
* Container that contains name of the extension.
Original file line number Diff line number Diff line change @@ -63,6 +63,13 @@ class Grid extends AbstractGrid
63
63
*/
64
64
protected $ notFoundMessage = '.not-found ' ;
65
65
66
+ /**
67
+ * Grid that contains the list of extensions.
68
+ *
69
+ * @var string
70
+ */
71
+ protected $ dataGrid = '#extensionGrid ' ;
72
+
66
73
/**
67
74
* Click to 'Install' button.
68
75
*
@@ -132,8 +139,6 @@ public function findExtensionOnGrid(Extension $extension)
132
139
{
133
140
$ this ->_rootElement ->waitUntil (
134
141
function () {
135
- //TODO: Sleep will be removed after MAGETWO-52137
136
- sleep (10 );
137
142
$ message = $ this ->_rootElement ->find ($ this ->notFoundMessage )->isVisible ();
138
143
$ grid = $ this ->_rootElement ->find ($ this ->dataGrid )->isVisible ();
139
144
Original file line number Diff line number Diff line change 34
34
<div class="item-title">Products<br />Ready to Install</div>
35
35
<div class="item-install">
36
36
<button ui-sref="root.install" href="#install-extension-grid"
37
- ng-class="{'disabled' : !enabledInstall}"
37
+ ng-class="{'disabled' : !enabledInstall, 'goInstall' : enabledInstall }"
38
38
type="button" class="btn">
39
39
Review and Install
40
40
</button>
41
41
</div>
42
42
</li>
43
43
<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>
45
47
<div ng-hide="isOutOfSync" class="item-date">
46
48
{{lastSyncDate}}
47
49
</div>
64
66
65
67
<div class="row" ng-show="$root.isMarketplaceAuthorized && extensionsProcessed && total == 0">
66
68
<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/>
68
71
</label>
69
72
</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
+ >
71
77
<div class="admin__data-grid-header">
72
78
<div class="admin__data-grid-header-row row row-gutter">
73
79
<div class="col-xs-3 module-summary">
Original file line number Diff line number Diff line change 13
13
</span>
14
14
</div>
15
15
</div>
16
- <div class="admin__data-grid-outer-wrap">
16
+ <div class="admin__data-grid-outer-wrap" id="installExtensionGrid" >
17
17
<div class="admin__data-grid-header">
18
18
<div class="admin__data-grid-header-row row row-gutter">
19
19
<div class="col-xs-3">
You can’t perform that action at this time.
0 commit comments