Skip to content

Commit 7fe0496

Browse files
kate-kyzymakate-kyzyma
committed
Refactoring the test
1 parent a46a885 commit 7fe0496

File tree

2 files changed

+52
-116
lines changed

2 files changed

+52
-116
lines changed

‎app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminChangeCategoryNameOnStoreViewLevelActionGroup.xml renamed to ‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminChangeCategoryNameOnStoreViewLevelActionGroup.xml

File renamed without changes.

‎app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest/AdminCheckUrlRewritesMultipleStoreviewsProductImportTest.xml

Lines changed: 52 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -47,89 +47,55 @@
4747
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFiltersIfSet"/>
4848
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4949
</after>
50+
<!--Change category name and URL key for EN Store View-->
5051
<actionGroup ref="SwitchCategoryStoreViewActionGroup" stepKey="switchToStoreViewEn">
5152
<argument name="Store" value="customStoreENNotUnique.name"/>
5253
<argument name="CatName" value="$$createCategory.name$$"/>
5354
</actionGroup>
54-
<!--<uncheckOption selector="{{AdminCategoryBasicFieldSection.categoryNameUseDefault}}" stepKey="uncheckUseDefaultValueENStoreView"/>-->
55-
<!--<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="category-english" stepKey="changeNameField"/>-->
56-
<!--<click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="clickOnSectionHeader"/>-->
5755
<actionGroup ref="AdminChangeCategoryNameOnStoreViewLevelActionGroup" stepKey="changeCategoryNameForENStoreView">
58-
<argument name="categoryName" value="categoryenglish"/>
56+
<argument name="categoryName" value="categoryEN"/>
5957
</actionGroup>
6058
<actionGroup ref="ChangeSeoUrlKeyForSubCategoryActionGroup" stepKey="changeSeoUrlKeyENStoreView">
6159
<argument name="value" value="category-english"/>
6260
</actionGroup>
61+
62+
<!--Change category name and URL key for NL Store View-->
6363
<actionGroup ref="SwitchCategoryStoreViewActionGroup" stepKey="switchToStoreViewNl">
6464
<argument name="Store" value="customStoreNLNotUnique.name"/>
6565
<argument name="CatName" value="$$createCategory.name$$"/>
6666
</actionGroup>
67-
<!--<uncheckOption selector="{{AdminCategoryBasicFieldSection.categoryNameUseDefault}}" stepKey="uncheckUseDefaultValue1"/>-->
68-
<!--<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="category-dutch" stepKey="changeNameFieldNLStoreView"/>-->
69-
<!--<click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="clickOnSectionHeader2"/>-->
7067
<actionGroup ref="AdminChangeCategoryNameOnStoreViewLevelActionGroup" stepKey="changeCategoryNameForNLStoreView">
71-
<argument name="categoryName" value="categorydutch"/>
68+
<argument name="categoryName" value="categoryNL"/>
7269
</actionGroup>
7370
<actionGroup ref="ChangeSeoUrlKeyForSubCategoryActionGroup" stepKey="changeSeoUrlKeyNLStoreView">
7471
<argument name="value" value="category-dutch"/>
7572
</actionGroup>
76-
<!--<amOnPage url="{{AdminImportIndexPage.url}}" stepKey="navigateToSystemImport"/>-->
77-
<!--<selectOption selector="{{AdminImportMainSection.entityType}}" userInput="Products" stepKey="selectProductsOption"/>-->
78-
<!--<waitForElementVisible selector="{{AdminImportMainSection.importBehavior}}" stepKey="waitForImportBehaviorElementVisible"/>-->
79-
<!--<selectOption selector="{{AdminImportMainSection.importBehavior}}" userInput="Add/Update" stepKey="selectAddUpdateOption"/>-->
80-
<!--<attachFile selector="{{AdminImportMainSection.selectFileToImport}}" userInput="import_updated.csv" stepKey="attachFileForImport"/>-->
81-
<!--<click selector="{{AdminImportHeaderSection.checkDataButton}}" stepKey="clickCheckDataButton"/>-->
82-
<!--<see selector="{{AdminImportValidationMessagesSection.notice}}" userInput="Checked rows: 3, checked entities: 1, invalid rows: 0, total errors: 0" stepKey="assertNotice"/>-->
83-
<!--<see selector="{{AdminImportValidationMessagesSection.success}}" userInput="File is valid! To start import process press &quot;Import&quot; button" stepKey="assertSuccessMessage"/>-->
84-
<!--<click selector="{{AdminImportMainSection.importButton}}" stepKey="clickImportButton"/>-->
85-
<!--<see selector="{{AdminImportValidationMessagesSection.success}}" userInput="Import successfully done" stepKey="assertSuccessMessage1"/>-->
86-
<!--<see selector="{{AdminImportValidationMessagesSection.notice}}" userInput="Created: 1, Updated: 0, Deleted: 0" stepKey="assertNotice1"/>-->
8773

74+
<!-- Import products with add/update behavior -->
8875
<actionGroup ref="AdminImportProductsWithCheckValidationResultActionGroup" stepKey="importProduct">
8976
<argument name="behavior" value="Add/Update"/>
9077
<argument name="importFile" value="import_updated.csv"/>
9178
<argument name="importNoticeMessage" value="Created: 1, Updated: 0, Deleted: 0"/>
9279
<argument name="validationNoticeMessage" value="Checked rows: 3, checked entities: 1, invalid rows: 0, total errors: 0"/>
9380
</actionGroup>
9481

95-
<!--<actionGroup ref="SearchForProductOnBackendByNameActionGroup" stepKey="searchForProductOnBackend">-->
96-
<!--<argument name="productName" value="productformagetwo68980"/>-->
97-
<!--</actionGroup>-->
98-
<!--<click selector="{{AdminProductGridSection.productRowBySku('productformagetwo68980')}}" stepKey="clickOnProductRow"/>-->
99-
10082
<!--Filter Product in product page and get the Product ID -->
10183
<actionGroup ref="FilterAndSelectProductActionGroup" stepKey="filterProduct">
10284
<argument name="productSku" value="productformagetwo68980"/>
10385
</actionGroup>
10486
<grabFromCurrentUrl regex="~/id/(\d+)/~" stepKey="grabProductIdFromUrl"/>
10587

106-
<!--<amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="goToUrlRewritesIndexPage"/>-->
107-
108-
<!--<click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openUrlRewriteGridFilters"/>-->
109-
<!--<fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('request_path')}}" userInput="category-english.html" stepKey="inputCategoryUrlForENStoreView"/>-->
110-
<!--<click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickOrderApplyFilters"/>-->
111-
<!--<waitForPageLoad stepKey="waitForPageToLoad"/>-->
112-
<!--<seeElement selector="{{AdminUrlRewriteIndexSection.gridCellByColumnValue('Request Path', 'category-english.html')}}" stepKey="seeUrlInRequestPathColumn"/>-->
113-
<!--<seeElement selector="{{AdminUrlRewriteIndexSection.gridCellByColumnValue('Target Path', catalog/category/view/id/$$createCategory.id$$)}}" stepKey="seeUrlInTargetPathColumn"/>-->
114-
115-
<!--Open Marketing - SEO & Search - URL Rewrites -->
116-
<!--<actionGroup ref="AdminSearchUrlRewriteByRequestPathActionGroup" stepKey="searchingCategoryUrlRewriteForENStoreView">-->
117-
<!--<argument name="requestPath" value="category-english.html"/>-->
118-
<!--</actionGroup>-->
119-
<!--<actionGroup ref="AssertAdminRequestPathInUrlRewriteGrigActionGroup" stepKey="seeCategoryUrlInRequestPathColumnForENStoreView">-->
120-
<!--<argument name="requestPath" value="category-english.html"/>-->
121-
<!--</actionGroup>-->
122-
<!--<actionGroup ref="AssertAdminTargetPathInUrlRewriteGrigActionGroup" stepKey="seeCategoryUrlInTargetPathColumnForENStoreView">-->
123-
<!--<argument name="targetPath" value="catalog/category/view/id/$$createCategory.id$$"/>-->
124-
<!--</actionGroup>-->
88+
<!--Open Marketing - SEO & Search - URL Rewrites-->
89+
<actionGroup ref="AdminSearchUrlRewriteByRequestPathActionGroup" stepKey="searchingCategoryUrlRewriteForENStoreView">
90+
<argument name="requestPath" value="category-english.html"/>
91+
</actionGroup>
92+
<actionGroup ref="AssertAdminRequestPathInUrlRewriteGrigActionGroup" stepKey="seeCategoryUrlInRequestPathColumnForENStoreView">
93+
<argument name="requestPath" value="category-english.html"/>
94+
</actionGroup>
95+
<actionGroup ref="AssertAdminTargetPathInUrlRewriteGrigActionGroup" stepKey="seeCategoryUrlInTargetPathColumnForENStoreView">
96+
<argument name="targetPath" value="catalog/category/view/id/$$createCategory.id$$"/>
97+
</actionGroup>
12598

126-
<!--<click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openUrlRewriteGridFilters1"/>-->
127-
<!--<fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('request_path')}}" userInput="category-dutch.html" stepKey="inputCategoryUrlForNLStoreView"/>-->
128-
<!--<click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickOrderApplyFilters1"/>-->
129-
<!--<waitForPageLoad stepKey="waitForPageToLoad1"/>-->
130-
<!--<seeElement selector="{{AdminUrlRewriteIndexSection.gridCellByColumnValue('Request Path', 'category-dutch.html')}}" stepKey="seeUrlInRequestPathColumn1"/>-->
131-
<!--<seeElement selector="{{AdminUrlRewriteIndexSection.gridCellByColumnValue('Target Path', catalog/category/view/id/$$createCategory.id$$)}}" stepKey="seeUrlInTargetPathColumn1"/>-->
132-
<!---->
13399
<actionGroup ref="AdminSearchUrlRewriteByRequestPathActionGroup" stepKey="searchingCategoryUrlRewriteForNLStoreView">
134100
<argument name="requestPath" value="category-dutch.html"/>
135101
</actionGroup>
@@ -140,74 +106,44 @@
140106
<argument name="targetPath" value="catalog/category/view/id/$$createCategory.id$$"/>
141107
</actionGroup>
142108

109+
<actionGroup ref="AdminSearchUrlRewriteByRequestPathActionGroup" stepKey="searchingProductUrlRewriteForENStoreView">
110+
<argument name="requestPath" value="productformagetwo68980-english.html"/>
111+
</actionGroup>
112+
<actionGroup ref="AssertAdminRequestPathInUrlRewriteGrigActionGroup" stepKey="seeProductUrlInRequestPathColumnForENStoreView">
113+
<argument name="requestPath" value="productformagetwo68980-english.html"/>
114+
</actionGroup>
115+
<actionGroup ref="AssertAdminTargetPathInUrlRewriteGrigActionGroup" stepKey="seeProductUrlInTargetPathColumnForENStoreView">
116+
<argument name="targetPath" value="catalog/product/view/id/$grabProductIdFromUrl"/>
117+
</actionGroup>
143118

144-
<!--<click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openUrlRewriteGridFilters2"/>-->
145-
<!--<fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('request_path')}}" userInput="productformagetwo68980-english.html" stepKey="inputProductUrlForENStoreView"/>-->
146-
<!--<click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickOrderApplyFilters2"/>-->
147-
<!--<waitForPageLoad stepKey="waitForPageToLoad2"/>-->
148-
<!--<seeElement selector="{{AdminUrlRewriteIndexSection.gridCellByColumnValue('Request Path', 'productformagetwo68980-english.html')}}" stepKey="seeUrlInRequestPathColumn2"/>-->
149-
<!--<seeElement selector="{{AdminUrlRewriteIndexSection.gridCellByColumnValue('Target Path', 'catalog/product/view/id/$grabProductIdFromUrl')}}" stepKey="seeUrlInTargetPathColumn2"/>-->
150-
<!---->
151-
<!--<actionGroup ref="AdminSearchUrlRewriteByRequestPathActionGroup" stepKey="searchingProductUrlRewriteForENStoreView">-->
152-
<!--<argument name="requestPath" value="productformagetwo68980-english.html"/>-->
153-
<!--</actionGroup>-->
154-
<!--<actionGroup ref="AssertAdminRequestPathInUrlRewriteGrigActionGroup" stepKey="seeProductUrlInRequestPathColumnForENStoreView">-->
155-
<!--<argument name="requestPath" value="productformagetwo68980-english.html"/>-->
156-
<!--</actionGroup>-->
157-
<!--<actionGroup ref="AssertAdminTargetPathInUrlRewriteGrigActionGroup" stepKey="seeProductUrlInTargetPathColumnForENStoreView">-->
158-
<!--<argument name="targetPath" value="catalog/product/view/id/$grabProductIdFromUrl"/>-->
159-
<!--</actionGroup>-->
160-
161-
162-
<!--<click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openUrlRewriteGridFilters3"/>-->
163-
<!--<fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('request_path')}}" userInput="productformagetwo68980-dutch.html" stepKey="inputProductUrlForENStoreView1"/>-->
164-
<!--<click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickOrderApplyFilters3"/>-->
165-
<!--<waitForPageLoad stepKey="waitForPageToLoad3"/>-->
166-
<!--<seeElement selector="{{AdminUrlRewriteIndexSection.gridCellByColumnValue('Request Path', 'productformagetwo68980-dutch.html')}}" stepKey="seeUrlInRequestPathColumn3"/>-->
167-
<!--<seeElement selector="{{AdminUrlRewriteIndexSection.gridCellByColumnValue('Target Path', 'catalog/product/view/id/$grabProductIdFromUrl')}}" stepKey="seeUrlInTargetPathColumn3"/>-->
168-
169-
<!--<actionGroup ref="AdminSearchUrlRewriteByRequestPathActionGroup" stepKey="searchingProductUrlRewriteForNLStoreView">-->
170-
<!--<argument name="requestPath" value="productformagetwo68980-dutch.html"/>-->
171-
<!--</actionGroup>-->
172-
<!--<actionGroup ref="AssertAdminRequestPathInUrlRewriteGrigActionGroup" stepKey="seeProductUrlInRequestPathColumnForNLStoreView">-->
173-
<!--<argument name="requestPath" value="productformagetwo68980-dutch.html"/>-->
174-
<!--</actionGroup>-->
175-
<!--<actionGroup ref="AssertAdminTargetPathInUrlRewriteGrigActionGroup" stepKey="seeProductUrlInTargetPathColumnForNLStoreView">-->
176-
<!--<argument name="targetPath" value="catalog/product/view/id/$grabProductIdFromUrl"/>-->
177-
<!--</actionGroup>-->
178-
179-
<!--<click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openUrlRewriteGridFilters4"/>-->
180-
<!--<fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('request_path')}}" userInput="category-english/productformagetwo68980-english.html" stepKey="inputProductUrlForENStoreView2"/>-->
181-
<!--<click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickOrderApplyFilters4"/>-->
182-
<!--<waitForPageLoad stepKey="waitForPageToLoad4"/>-->
183-
<!--<seeElement selector="{{AdminUrlRewriteIndexSection.gridCellByColumnValue('Request Path', 'category-english/productformagetwo68980-english.html')}}" stepKey="seeUrlInRequestPathColumn4"/>-->
184-
<!--<seeElement selector="{{AdminUrlRewriteIndexSection.gridCellByColumnValue('Target Path', catalog/product/view/id/$grabProductIdFromUrl/category/$$createCategory.id$$)}}" stepKey="seeUrlInTargetPathColumn4"/>-->
185-
186-
<!--<actionGroup ref="AdminSearchUrlRewriteByRequestPathActionGroup" stepKey="searchingUrlRewriteForENStoreView">-->
187-
<!--<argument name="requestPath" value="category-english/productformagetwo68980-english.html"/>-->
188-
<!--</actionGroup>-->
189-
<!--<actionGroup ref="AssertAdminRequestPathInUrlRewriteGrigActionGroup" stepKey="seeUrlInRequestPathColumnForENStoreView">-->
190-
<!--<argument name="requestPath" value="category-english/productformagetwo68980-english.html"/>-->
191-
<!--</actionGroup>-->
192-
<!--<actionGroup ref="AssertAdminTargetPathInUrlRewriteGrigActionGroup" stepKey="seeUrlInTargetPathColumnForENStoreView">-->
193-
<!--<argument name="targetPath" value="catalog/product/view/id/$grabProductIdFromUrl/category/$$createCategory.id$$"/>-->
194-
<!--</actionGroup>-->
119+
<actionGroup ref="AdminSearchUrlRewriteByRequestPathActionGroup" stepKey="searchingProductUrlRewriteForNLStoreView">
120+
<argument name="requestPath" value="productformagetwo68980-dutch.html"/>
121+
</actionGroup>
122+
<actionGroup ref="AssertAdminRequestPathInUrlRewriteGrigActionGroup" stepKey="seeProductUrlInRequestPathColumnForNLStoreView">
123+
<argument name="requestPath" value="productformagetwo68980-dutch.html"/>
124+
</actionGroup>
125+
<actionGroup ref="AssertAdminTargetPathInUrlRewriteGrigActionGroup" stepKey="seeProductUrlInTargetPathColumnForNLStoreView">
126+
<argument name="targetPath" value="catalog/product/view/id/$grabProductIdFromUrl"/>
127+
</actionGroup>
195128

196-
<!--<click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openUrlRewriteGridFilters5"/>-->
197-
<!--<fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('request_path')}}" userInput="category-dutch/productformagetwo68980-dutch.html" stepKey="inputProductUrlForENStoreView3"/>-->
198-
<!--<click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickOrderApplyFilters5"/>-->
199-
<!--<waitForPageLoad stepKey="waitForPageToLoad5"/>-->
200-
<!--<seeElement selector="{{AdminUrlRewriteIndexSection.gridCellByColumnValue('Request Path', 'category-dutch/productformagetwo68980-dutch.html')}}" stepKey="seeUrlInRequestPathColumn5"/>-->
201-
<!--<seeElement selector="{{AdminUrlRewriteIndexSection.gridCellByColumnValue('Target Path', catalog/product/view/id/$grabProductIdFromUrl/category/$$createCategory.id$$)}}" stepKey="seeUrlInTargetPathColumn5"/>-->
129+
<actionGroup ref="AdminSearchUrlRewriteByRequestPathActionGroup" stepKey="searchingUrlRewriteForENStoreView">
130+
<argument name="requestPath" value="category-english/productformagetwo68980-english.html"/>
131+
</actionGroup>
132+
<actionGroup ref="AssertAdminRequestPathInUrlRewriteGrigActionGroup" stepKey="seeUrlInRequestPathColumnForENStoreView">
133+
<argument name="requestPath" value="category-english/productformagetwo68980-english.html"/>
134+
</actionGroup>
135+
<actionGroup ref="AssertAdminTargetPathInUrlRewriteGrigActionGroup" stepKey="seeUrlInTargetPathColumnForENStoreView">
136+
<argument name="targetPath" value="catalog/product/view/id/$grabProductIdFromUrl/category/$$createCategory.id$$"/>
137+
</actionGroup>
202138

203-
<!--<actionGroup ref="AdminSearchUrlRewriteByRequestPathActionGroup" stepKey="searchingUrlRewriteForNLStoreView">-->
204-
<!--<argument name="requestPath" value="category-dutch/productformagetwo68980-dutch.html"/>-->
205-
<!--</actionGroup>-->
206-
<!--<actionGroup ref="AssertAdminRequestPathInUrlRewriteGrigActionGroup" stepKey="seeUrlInRequestPathColumnForNLStoreView">-->
207-
<!--<argument name="requestPath" value="category-dutch/productformagetwo68980-dutch.html"/>-->
208-
<!--</actionGroup>-->
209-
<!--<actionGroup ref="AssertAdminTargetPathInUrlRewriteGrigActionGroup" stepKey="seeUrlInTargetPathColumnForNLStoreView">-->
210-
<!--<argument name="targetPath" value="catalog/product/view/id/$grabProductIdFromUrl/category/$$createCategory.id$$"/>-->
211-
<!--</actionGroup>-->
139+
<actionGroup ref="AdminSearchUrlRewriteByRequestPathActionGroup" stepKey="searchingUrlRewriteForNLStoreView">
140+
<argument name="requestPath" value="category-dutch/productformagetwo68980-dutch.html"/>
141+
</actionGroup>
142+
<actionGroup ref="AssertAdminRequestPathInUrlRewriteGrigActionGroup" stepKey="seeUrlInRequestPathColumnForNLStoreView">
143+
<argument name="requestPath" value="category-dutch/productformagetwo68980-dutch.html"/>
144+
</actionGroup>
145+
<actionGroup ref="AssertAdminTargetPathInUrlRewriteGrigActionGroup" stepKey="seeUrlInTargetPathColumnForNLStoreView">
146+
<argument name="targetPath" value="catalog/product/view/id/$grabProductIdFromUrl/category/$$createCategory.id$$"/>
147+
</actionGroup>
212148
</test>
213149
</tests>

0 commit comments

Comments
 (0)