Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Activated "Pending Reviews" menu item when merchant opens 'Pending Reviews' section #26230

Merged
merged 4 commits into from
Feb 26, 2020
Merged

Activated "Pending Reviews" menu item when merchant opens 'Pending Reviews' section #26230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dca6730
activated "Pending Reviews" menu item when merchant opens path 'Marke…
rav-redchamps Jan 2, 2020
d5cb185
added functional test for the change
rav-redchamps Jan 6, 2020
c8b80d0
Merge branch '2.4-develop' of http://github.com/magento/magento2 into…
engcom-Echo Feb 19, 2020
5898776
Add assert class, fix mftf test
engcom-Echo Feb 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/code/Magento/Review/Controller/Adminhtml/Product/Pending.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public function execute()
}
/** @var \Magento\Backend\Model\View\Result\Page $resultPage */
$resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
$resultPage->setActiveMenu('Magento_Review::catalog_reviews_ratings_pending');
$resultPage->getConfig()->getTitle()->prepend(__('Customer Reviews'));
$resultPage->getConfig()->getTitle()->prepend(__('Pending Reviews'));
$this->coreRegistry->register('usePendingFilter', true);
Expand Down
21 changes: 21 additions & 0 deletions ...ode/Magento/Review/Test/Mftf/ActionGroup/AdminAssertClassElementRelativeIdActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="AdminAssertClassElementRelativeIdActionGroup">
<arguments>
<argument name="elementId" type="string" defaultValue="{{AdminMenuSection.marketing}}"/>
<argument name="expectClass" type="string" defaultValue="{{AdminMenuUserContentPendingReviews.activeClass}}" />
</arguments>

<grabAttributeFrom selector="{{elementId}}" userInput="class" stepKey="grabClass"/>
<assertContains stepKey="assertClass">
<actualResult type="string">{$grabClass}</actualResult>
<expectedResult type="string">{{expectClass}}</expectedResult>
</assertContains>
</actionGroup>
</actionGroups>
6 changes: 6 additions & 0 deletions app/code/Magento/Review/Test/Mftf/Data/AdminMenuData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@
<data key="title">Reviews</data>
<data key="dataUiId">magento-review-catalog-reviews-ratings-reviews-all</data>
</entity>
<entity name="AdminMenuUserContentPendingReviews">
<data key="pageTitle">Pending Reviews</data>
<data key="title">Pending Reviews</data>
<data key="dataUiId">magento-review-catalog-reviews-ratings-pending</data>
<data key="dataActiveClass">_active</data>
</entity>
<entity name="AdminMenuReportsReviewsByCustomers">
<data key="pageTitle">Customer Reviews Report</data>
<data key="title">By Customers</data>
Expand Down
36 changes: 36 additions & 0 deletions ...code/Magento/Review/Test/Mftf/Test/AdminMarketingPendingReviewsNavigateMenuActiveTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
<test name="AdminMarketingPendingReviewsNavigateMenuActiveTest">
<annotations>
<features value="Pending Reviews"/>
<stories value="Menu Navigation"/>
<title value="Admin marketing pending reviews navigate menu"/>
<description value="Admin able see navigate head menu Marketing is active, when open page Marketing > Pending Reviews"/>
<group value="menu"/>
</annotations>
<before>
<actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
</before>
<after>
<actionGroup ref="logout" stepKey="logout"/>
</after>
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsViewsPage">
<argument name="menuUiId" value="{{AdminMenuMarketing.dataUiId}}"/>
<argument name="submenuUiId" value="{{AdminMenuUserContentPendingReviews.dataUiId}}"/>
</actionGroup>
<actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
<argument name="title" value="{{AdminMenuUserContentPendingReviews.pageTitle}}"/>
</actionGroup>
<actionGroup ref="AdminAssertClassElementRelativeIdActionGroup" stepKey="assertClass">
<argument name="elementId" value="{{AdminMenuSection.marketing}}"/>
<argument name="expectClass" value="{{AdminMenuUserContentPendingReviews.dataActiveClass}}"/>
</actionGroup>
</test>
</tests>