Skip to content

Commit 9cc36ea

Browse files
committed
MAGETWO-94819: Swatch validation breaks the whole attribute form
1 parent b33c4b2 commit 9cc36ea

File tree

4 files changed

+6
-2
lines changed

4 files changed

+6
-2
lines changed

app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<element name="useInLayeredNavigation" type="select" selector="#is_filterable"/>
2525
</section>
2626
<section name="StorefrontPropertiesSection">
27+
<element name="PageTitle" type="text" selector="//span[text()='Storefront Properties']" />
2728
<element name="StoreFrontPropertiesTab" selector="#product_attribute_tabs_front" type="button"/>
2829
<element name="EnableWYSIWYG" type="select" selector="#enabled"/>
2930
<element name="useForPromoRuleConditions" type="select" selector="#is_used_for_promo_rules"/>

app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateVisualSwatchWithNonValidOptionsTest.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,11 @@
6666
<fillField selector="{{AdminManageSwatchSection.adminInputByIndex('0')}}"
6767
userInput="red" stepKey="fillAdmin1"/>
6868

69+
<!-- Go to Storefront Properties tab -->
70+
<scrollToTopOfPage stepKey="scrollToTop"/>
71+
<click selector="{{StorefrontPropertiesSection.StoreFrontPropertiesTab}}" stepKey="goToStorefrontPropertiesTab"/>
72+
<waitForElementVisible selector="{{StorefrontPropertiesSection.PageTitle}}" stepKey="waitTabLoad"/>
73+
6974
<!-- Save the new product attribute -->
7075
<click selector="{{AttributePropertiesSection.Save}}" stepKey="clickSave2"/>
7176
<waitForElementVisible selector="{{AdminProductMessagesSection.successMessage}}"

dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,6 @@ protected function _getAttributeData()
392392
'used_for_sort_by' => '0',
393393
'apply_to' => ['simple'],
394394
'frontend_label' => [\Magento\Store\Model\Store::DEFAULT_STORE_ID => 'string to translate'],
395-
'serialized_options' => '[]',
396395
];
397396
}
398397
}

dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Product/AttributeTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ private function getAttributePreset() : array
133133
{
134134
return [
135135
'form_key' => 'XxtpPYjm2YPYUlAt',
136-
'serialized_options' => '[]',
137136
'frontend_label' => [
138137
0 => 'asdasd',
139138
1 => '',

0 commit comments

Comments
 (0)