Skip to content

Commit a5eb95c

Browse files
zakdmazakdma
committed
MAGETWO-90940: SEO-friendly URL for category page not working
1 parent b09e403 commit a5eb95c

File tree

4 files changed

+25
-26
lines changed

4 files changed

+25
-26
lines changed

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminCategoryActionGroup.xml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,13 @@
4949
</arguments>
5050
<amOnPage url="{{AdminCategoryPage.url}}" stepKey="amOnCategoryPage"/>
5151
<waitForPageLoad stepKey="waitForPageLoad1"/>
52-
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree(CatName)}}" stepKey="navigateToCreatedCategory" />
52+
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree(catName)}}" stepKey="navigateToCreatedCategory" />
5353
<waitForPageLoad stepKey="waitForPageLoad2"/>
54-
<waitForLoadingMaskToDisappear stepKey="waitForSpinner"/>
5554
<scrollToTopOfPage stepKey="scrollToToggle"/>
56-
<click selector="{{AdminCategoryMainActionsSection.CategoryStoreViewDropdownToggle}}" stepKey="openStoreViewDropDown"/>
57-
<click selector="{{AdminCategoryMainActionsSection.CategoryStoreViewOption(Store)}}" stepKey="selectStoreView"/>
55+
<click selector="{{AdminCategoryMainActionsSection.categoryStoreViewDropdownToggle}}" stepKey="openStoreViewDropDown"/>
56+
<click selector="{{AdminCategoryMainActionsSection.categoryStoreViewOption(store)}}" stepKey="selectStoreView"/>
5857
<waitForPageLoad stepKey="waitForPageLoad3"/>
59-
<waitForLoadingMaskToDisappear stepKey="waitForSpinner2"/>
60-
<click selector="{{AdminCategoryMainActionsSection.CategoryStoreViewModalAccept}}" stepKey="selectStoreViewAccept"/>
58+
<click selector="{{AdminCategoryMainActionsSection.categoryStoreViewModalAccept}}" stepKey="selectStoreViewAccept"/>
6159
<waitForPageLoad stepKey="waitForStoreViewChangeLoad"/>
6260
</actionGroup>
6361
</actionGroups>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryMainActionsSection.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<section name="AdminCategoryMainActionsSection">
1212
<element name="SaveButton" type="button" selector=".page-actions-inner #save" timeout="30"/>
1313
<element name="DeleteButton" type="button" selector=".page-actions-inner #delete" timeout="30"/>
14-
<element name="CategoryStoreViewDropdownToggle" type="button" selector="#store-change-button"/>
15-
<element name="CategoryStoreViewOption" type="button" selector="//div[contains(@class, 'store-switcher')]//a[normalize-space()='{{store}}']" parameterized="true"/>
16-
<element name="CategoryStoreViewModalAccept" type="button" selector=".modal-popup.confirm._show .action-accept"/>
14+
<element name="categoryStoreViewDropdownToggle" type="button" selector="#store-change-button"/>
15+
<element name="categoryStoreViewOption" type="button" selector="//div[contains(@class, 'store-switcher')]//a[normalize-space()='{{store}}']" parameterized="true"/>
16+
<element name="categoryStoreViewModalAccept" type="button" selector=".modal-popup.confirm._show .action-accept"/>
1717
</section>
1818
</sections>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySEOSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<section name="AdminCategorySEOSection">
1212
<element name="SectionHeader" type="button" selector="div[data-index='search_engine_optimization']" timeout="30"/>
1313
<element name="UrlKeyInput" type="input" selector="input[name='url_key']"/>
14-
<element name="UrlKeyDefaultValueCheckbox" type="button" selector="input[name='use_default[url_key]']"/>
15-
<element name="UrlKeyRedirectCheckbox" type="button" selector="[data-index='url_key_create_redirect'] input[type='checkbox']"/>
14+
<element name="urlKeyDefaultValueCheckbox" type="button" selector="input[name='use_default[url_key]']"/>
15+
<element name="urlKeyRedirectCheckbox" type="button" selector="[data-index='url_key_create_redirect'] input[type='checkbox']"/>
1616
<element name="MetaTitleInput" type="input" selector="input[name='meta_title']"/>
1717
<element name="MetaKeywordsInput" type="textarea" selector="textarea[name='meta_keywords']"/>
1818
<element name="MetaDescriptionInput" type="textarea" selector="textarea[name='meta_description']"/>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminUpdateCategoryStoreUrlKeyTest.xml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,23 @@
1818
<testCaseId value="MAGETWO-92916"/>
1919
<group value="category"/>
2020
</annotations>
21+
<before>
22+
<!-- Create category, change store view to default -->
23+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
24+
<amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToCategoryPage"/>
25+
<waitForPageLoad stepKey="waitForPageLoad1"/>
26+
<actionGroup ref="CreateCategory" stepKey="createCategory">
27+
<argument name="categoryEntity" value="_defaultCategory"/>
28+
</actionGroup>
29+
</before>
2130
<after>
31+
<!-- Delete category and logout from admin account -->
2232
<actionGroup ref="DeleteCategory" stepKey="deleteCategory">
2333
<argument name="categoryEntity" value="_defaultCategory"/>
2434
</actionGroup>
2535
<amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
2636
</after>
2737

28-
<!-- Create category, change store view to default -->
29-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
30-
<amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToCategoryPage"/>
31-
<waitForPageLoad stepKey="waitForPageLoad1"/>
32-
<actionGroup ref="CreateCategory" stepKey="createCategory">
33-
<argument name="categoryEntity" value="_defaultCategory"/>
34-
</actionGroup>
35-
3638
<!--Switch to "Default Store View" scope-->
3739
<actionGroup ref="switchCategoryStoreView" stepKey="SwitchStoreView">
3840
<argument name="store" value="_defaultStore.name"/>
@@ -44,18 +46,17 @@
4446
<seeElement selector="{{AdminCategoryBasicFieldSection.categoryNameUseDefault}}" stepKey="seeUseDefaultName"/>
4547
<!-- Update SEO key, uncheck "Create Redirect", confirm in frontend -->
4648
<click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="openSeoSection"/>
47-
<uncheckOption selector="{{AdminCategorySEOSection.UrlKeyDefaultValueCheckbox}}" stepKey="uncheckUseDefaultUrlKey"/>
49+
<uncheckOption selector="{{AdminCategorySEOSection.urlKeyDefaultValueCheckbox}}" stepKey="uncheckUseDefaultUrlKey"/>
4850
<fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{_defaultCategory.name_lwr}}-hattest" stepKey="enterURLKey"/>
49-
<uncheckOption selector="{{AdminCategorySEOSection.UrlKeyRedirectCheckbox}}" stepKey="uncheckRedirect1"/>
51+
<uncheckOption selector="{{AdminCategorySEOSection.urlKeyRedirectCheckbox}}" stepKey="uncheckRedirect1"/>
5052
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategoryAfterFirstSeoUpdate"/>
5153
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccessMessage"/>
5254
<amOnPage url="" stepKey="goToStorefront"/>
5355
<waitForPageLoad stepKey="waitForFrontendLoad"/>
54-
<click stepKey="clickCategory" selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}"/>
56+
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="clickCategory"/>
5557
<see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="{{_defaultCategory.name}}" stepKey="assertCategoryOnStorefront"/>
5658
<seeInTitle userInput="{{_defaultCategory.name}}" stepKey="seeCategoryNameInTitle"/>
5759
<seeInCurrentUrl stepKey="verifyUrlKey" url="{{_defaultCategory.name_lwr}}-hattest.html"/>
58-
5960
<!-- Update SEO key to original, uncheck "Create Redirect", confirm in frontend, delete category -->
6061
<!--Switch to "Default Store View" scope-->
6162
<actionGroup ref="switchCategoryStoreView" stepKey="SwitchStoreView2">
@@ -64,14 +65,14 @@
6465
</actionGroup>
6566
<click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="openSeoSection2"/>
6667
<fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{_defaultCategory.name_lwr}}" stepKey="enterOriginalURLKey"/>
67-
<uncheckOption selector="{{AdminCategorySEOSection.UrlKeyRedirectCheckbox}}" stepKey="uncheckRedirect2"/>
68+
<uncheckOption selector="{{AdminCategorySEOSection.urlKeyRedirectCheckbox}}" stepKey="uncheckRedirect2"/>
6869
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategoryAfterOriginalSeoKey"/>
6970
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccessMessageAfterOriginalSeoKey"/>
7071
<amOnPage url="" stepKey="goToStorefrontAfterOriginalSeoKey"/>
7172
<waitForPageLoad stepKey="waitForFrontendLoadAfterOriginalSeoKey"/>
72-
<click stepKey="clickCategoryAfterOriginalSeoKey" selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}"/>
73+
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="clickCategoryAfterOriginalSeoKey"/>
7374
<see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="{{_defaultCategory.name}}" stepKey="assertCategoryOnStorefront2"/>
7475
<seeInTitle userInput="{{_defaultCategory.name}}" stepKey="seeCategoryNameInTitle2"/>
75-
<seeInCurrentUrl stepKey="verifyUrlKeyAfterOriginalSeoKey" url="{{_defaultCategory.name_lwr}}.html"/>
76+
<seeInCurrentUrl url="{{_defaultCategory.name_lwr}}.html" stepKey="verifyUrlKeyAfterOriginalSeoKey"/>
7677
</test>
7778
</tests>

0 commit comments

Comments
 (0)