From d0c0bccdfec92a7657c3d94e86f7fa13b70b4df2 Mon Sep 17 00:00:00 2001 From: suryakant Date: Sat, 8 Dec 2018 11:46:23 +0530 Subject: [PATCH 1/2] fixed-checkbox-alignment: Checkbox alignement issue. --- .../Magento/backend/web/css/source/forms/_fields.less | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less index 3503abcc30468..5e14266877c35 100644 --- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less +++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less @@ -121,6 +121,9 @@ > .admin__field-control { #mix-grid .column(@field-control-grid__column, @field-grid__columns); + input[type="checkbox"] { + margin-top: 11px; + } } > .admin__field-label { From d0d57e38a727630393f7cc6a630af81cc36cb1ee Mon Sep 17 00:00:00 2001 From: nmalevanec Date: Wed, 2 Jan 2019 13:41:02 +0200 Subject: [PATCH 2/2] Fix functional test. --- .../Adminhtml/Product/Edit/Section/Options.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/Options.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/Options.php index 2ac4fb81ae604..d591f3b44462a 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/Options.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/Options.php @@ -403,4 +403,21 @@ public function getFileOptionElements() { return $this->_rootElement->getElements($this->hintMessage); } + + /** + * @inheritdoc + */ + protected function _fill(array $fields, SimpleElement $element = null) + { + $context = ($element === null) ? $this->_rootElement : $element; + foreach ($fields as $name => $field) { + $element = $this->getElement($context, $field); + if (!$element->isDisabled()) { + $element->getContext()->hover(); + $element->setValue($field['value']); + } else { + throw new \Exception("Unable to set value to field '$name' as it's disabled."); + } + } + } }