Skip to content

Commit c126e6f

Browse files
aplapanaaplapana
committed
ACP2E-2501: Broken AdminSimpleProductwithTextandVisualSwatchTest test
- addressed conflicts
1 parent a09a5c9 commit c126e6f

File tree

1 file changed

+34
-16
lines changed

1 file changed

+34
-16
lines changed

‎app/code/Magento/Swatches/Test/Mftf/Test/AdminSimpleProductwithTextandVisualSwatchTest.xml

Lines changed: 34 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,13 @@
5050
<argument name="product" value="SimpleProduct"/>
5151
</actionGroup>
5252
<!-- Add text swatch product to category -->
53-
<searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory"/>
53+
<searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}"
54+
parameterArray="[$$createCategory.name$$]" stepKey="fillCategory"/>
5455
<click selector="{{AdminProductFormSection.saveCategory}}" stepKey="saveCategory"/>
5556
<scrollToTopOfPage stepKey="scrollToTop0"/>
56-
<selectOption selector="{{AdminProductFormSection.attributeRequiredInputField(textSwatchAttribute.attribute_code)}}" userInput="textSwatchOption1" stepKey="fillTheAttributeRequiredInputField"/>
57+
<selectOption
58+
selector="{{AdminProductFormSection.attributeRequiredInputField(textSwatchAttribute.attribute_code)}}"
59+
userInput="textSwatchOption1" stepKey="fillTheAttributeRequiredInputField"/>
5760
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
5861
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
5962
<argument name="indices" value=""/>
@@ -68,31 +71,40 @@
6871
<argument name="product" value="DownloadableProduct"/>
6972
</actionGroup>
7073
<!-- Add visual swatch product to category -->
71-
<searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory1"/>
74+
<searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}"
75+
parameterArray="[$$createCategory.name$$]" stepKey="fillCategory1"/>
7276
<click selector="{{AdminProductFormSection.saveCategory}}" stepKey="saveCategory1"/>
7377
<scrollToTopOfPage stepKey="scrollToTop1"/>
74-
<selectOption selector="{{AdminProductFormSection.attributeRequiredInputField(ProductAttributeFrontendLabel.label)}}" userInput="visualSwatchOption2" stepKey="fillTheAttributeRequiredInputField1"/>
78+
<selectOption
79+
selector="{{AdminProductFormSection.attributeRequiredInputField(ProductAttributeFrontendLabel.label)}}"
80+
userInput="visualSwatchOption2" stepKey="fillTheAttributeRequiredInputField1"/>
7581
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton1"/>
7682
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex1">
7783
<argument name="indices" value=""/>
7884
</actionGroup>
7985
</before>
8086
<after>
8187
<!-- Delete text and visual swatch attributes -->
82-
<actionGroup ref="OpenProductAttributeFromSearchResultInGridActionGroup" stepKey="openProductAttributeFromSearchResultInGrid0">
88+
<actionGroup ref="OpenProductAttributeFromSearchResultInGridActionGroup"
89+
stepKey="openProductAttributeFromSearchResultInGrid0">
8390
<argument name="productAttributeCode" value="{{textSwatchAttribute.attribute_code}}"/>
8491
</actionGroup>
85-
<actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup" stepKey="deleteProductAttributeByAttributeCode0">
92+
<actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup"
93+
stepKey="deleteProductAttributeByAttributeCode0">
8694
<argument name="productAttributeCode" value="{{textSwatchAttribute.attribute_code}}"/>
8795
</actionGroup>
88-
<actionGroup ref="AssertProductAttributeRemovedSuccessfullyActionGroup" stepKey="deleteProductAttributeSuccess0"/>
89-
<actionGroup ref="OpenProductAttributeFromSearchResultInGridActionGroup" stepKey="openProductAttributeFromSearchResultInGrid1">
96+
<actionGroup ref="AssertProductAttributeRemovedSuccessfullyActionGroup"
97+
stepKey="deleteProductAttributeSuccess0"/>
98+
<actionGroup ref="OpenProductAttributeFromSearchResultInGridActionGroup"
99+
stepKey="openProductAttributeFromSearchResultInGrid1">
90100
<argument name="productAttributeCode" value="{{ProductAttributeFrontendLabel.label}}"/>
91101
</actionGroup>
92-
<actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup" stepKey="deleteProductAttributeByAttributeCode1">
102+
<actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup"
103+
stepKey="deleteProductAttributeByAttributeCode1">
93104
<argument name="productAttributeCode" value="{{ProductAttributeFrontendLabel.label}}"/>
94105
</actionGroup>
95-
<actionGroup ref="AssertProductAttributeRemovedSuccessfullyActionGroup" stepKey="deleteProductAttributeSuccess1"/>
106+
<actionGroup ref="AssertProductAttributeRemovedSuccessfullyActionGroup"
107+
stepKey="deleteProductAttributeSuccess1"/>
96108
<actionGroup ref="AdminOpenProductAttributePageActionGroup" stepKey="navigateToProductAttributeGrid"/>
97109
<click selector="{{AdminProductAttributeGridSection.ResetFilter}}" stepKey="resetFiltersOnGrid"/>
98110
<!-- Delete category -->
@@ -109,38 +121,44 @@
109121
<!--Assert that attribute values present in layered navigation -->
110122
<amOnPage url="$$createCategory.custom_attributes[url_key]$$.html" stepKey="amOnCategoryPage"/>
111123
<waitForPageLoad stepKey="waitForCategoryPageLoad"/>
112-
<click selector="{{StorefrontCategorySidebarSection.seeLayeredNavigationCategoryTextSwatch}}" stepKey="clickTextSwatch"/>
124+
<click selector="{{StorefrontCategorySidebarSection.seeLayeredNavigationCategoryTextSwatch}}"
125+
stepKey="clickTextSwatch"/>
113126
<click selector="{{StorefrontCategorySidebarSection.seeTextSwatchOption}}" stepKey="seeTextSwatch"/>
114127
<see userInput="{{SimpleProduct.name}}" stepKey="assertTextSwatchProduct"/>
115128
<!--Assert that attribute values present in layered navigation -->
116129
<amOnPage url="$$createCategory.custom_attributes[url_key]$$.html" stepKey="amOnCategoryPage1"/>
117130
<waitForPageLoad stepKey="waitForCategoryPageLoad1"/>
118-
<click selector="{{StorefrontCategorySidebarSection.seeLayeredNavigationCategoryVisualSwatch}}" stepKey="clickVisualSwatch"/>
131+
<click selector="{{StorefrontCategorySidebarSection.seeLayeredNavigationCategoryVisualSwatch}}"
132+
stepKey="clickVisualSwatch"/>
119133
<click selector="{{StorefrontCategorySidebarSection.seeVisualSwatchOption}}" stepKey="seeVisualSwatch"/>
120134
<see userInput="{{DownloadableProduct.name}}" stepKey="assertVisualSwatchProduct"/>
121135
<!--Verfiy the text swatch attribute product appears in search option with option one -->
122136
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStorefrontPage"/>
123137
<actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchForOptionOne">
124138
<argument name="phrase" value="textSwatchOption1"/>
125139
</actionGroup>
126-
<see selector="{{StorefrontCategoryMainSection.productName}}" userInput="{{SimpleProduct.name}}" stepKey="seeTextSwatchAttributeProductName"/>
140+
<see selector="{{StorefrontCategoryMainSection.productName}}" userInput="{{SimpleProduct.name}}"
141+
stepKey="seeTextSwatchAttributeProductName"/>
127142
<!--Verfiy the text swatch attribute product does not appears in search option with option two -->
128143
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStorefrontPage1"/>
129144
<actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchForOptionTwo">
130145
<argument name="phrase" value="textSwatchOption2"/>
131146
</actionGroup>
132-
<dontSee selector="{{StorefrontCatalogSearchMainSection.searchResults}}" userInput="{{SimpleProduct.name}}" stepKey="doNotSeeProduct"/>
147+
<dontSee selector="{{StorefrontCatalogSearchMainSection.searchResults}}" userInput="{{SimpleProduct.name}}"
148+
stepKey="doNotSeeProduct"/>
133149
<!--Verfiy the visual swatch attribute product appears in search option with option two -->
134150
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStorefrontPage2"/>
135151
<actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchForOptionTwo1">
136152
<argument name="phrase" value="visualSwatchOption2"/>
137153
</actionGroup>
138-
<waitForText selector="{{StorefrontCategoryMainSection.productName}}" userInput="{{DownloadableProduct.name}}" stepKey="seeVisualSwatchAttributeProductName"/>
154+
<waitForText selector="{{StorefrontCategoryMainSection.productName}}" userInput="{{DownloadableProduct.name}}"
155+
stepKey="seeVisualSwatchAttributeProductName"/>
139156
<!--Verfiy the visual swatch attribute product does not appear in search option with option one -->
140157
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStorefrontPage3"/>
141158
<actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchForOptionOne1">
142159
<argument name="phrase" value="visualSwatchOption1"/>
143160
</actionGroup>
144-
<dontSee selector="{{StorefrontCatalogSearchMainSection.searchResults}}" userInput="{{DownloadableProduct.name}}" stepKey="doNotSeeProduct1"/>
161+
<dontSee selector="{{StorefrontCatalogSearchMainSection.searchResults}}"
162+
userInput="{{DownloadableProduct.name}}" stepKey="doNotSeeProduct1"/>
145163
</test>
146164
</tests>

0 commit comments

Comments
 (0)