Skip to content

Commit f1bccb2

Browse files
author
Denys Rul
committed
MAGETWO-38269: PR preparation & processing
- Cms page test fixes
1 parent 338ef47 commit f1bccb2

File tree

2 files changed

+6
-5
lines changed
  • app/code/Magento/Ui/view/base/web/js/grid/columns
  • dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Page

2 files changed

+6
-5
lines changed

app/code/Magento/Ui/view/base/web/js/grid/columns/actions.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ define([
1515
defaults: {
1616
bodyTmpl: 'ui/grid/cells/actions',
1717
actions: [],
18-
templates: {},
18+
templates: {
19+
actions: {}
20+
},
1921
rowsProvider: '${ $.parentName }',
2022
imports: {
2123
rows: '${ $.rowsProvider }:rows'
@@ -42,7 +44,7 @@ define([
4244
* or all action objects associated with it.
4345
*
4446
* @param {Number} rowIndex - Index of a row.
45-
* @param {String} [actionIndex]
47+
* @param {String} [actionIndex] - Action identifier.
4648
* @returns {Array|Object}
4749
*/
4850
getAction: function (rowIndex, actionIndex) {
@@ -107,9 +109,9 @@ define([
107109
* @returns {Array}
108110
*/
109111
_formatActions: function (row, rowIndex) {
110-
var rowActions = row[this.index],
112+
var rowActions = row[this.index] || {},
111113
recordId = row[this.indexField],
112-
customActions = this.templates.customActions;
114+
customActions = this.templates.actions;
113115

114116
/**
115117
* Actions iterator.

dev/tests/functional/tests/app/Magento/Cms/Test/Block/Adminhtml/Page/Grid.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ public function searchAndPreview(array $filter)
8383
if ($rowItem->isVisible()) {
8484
$rowItem->find('.action-select')->click();
8585
$rowItem->find(sprintf($this->previewCmsPage, $itemName), Locator::SELECTOR_XPATH)->click();
86-
$this->waitForElement();
8786
} else {
8887
throw new \Exception('Searched item was not found.');
8988
}

0 commit comments

Comments
 (0)