Skip to content

Commit 1907d7c

Browse files
author
Joan He
committed
Merge remote-tracking branch 'trigger/MC-5461' into BugFixPR
2 parents 5b9c216 + 5fc59d6 commit 1907d7c

File tree

3 files changed

+88
-10
lines changed

3 files changed

+88
-10
lines changed

‎app/code/Magento/Cms/Block/Adminhtml/Page/Grid/Renderer/Action/UrlBuilder.php

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,25 @@ public function __construct(\Magento\Framework\UrlInterface $frontendUrlBuilder)
3333
*/
3434
public function getUrl($routePath, $scope, $store)
3535
{
36-
$this->frontendUrlBuilder->setScope($scope);
37-
$href = $this->frontendUrlBuilder->getUrl(
38-
$routePath,
39-
[
40-
'_current' => false,
41-
'_nosid' => true,
42-
'_query' => [\Magento\Store\Model\StoreManagerInterface::PARAM_NAME => $store]
43-
]
44-
);
36+
if ($scope) {
37+
$this->frontendUrlBuilder->setScope($scope);
38+
$href = $this->frontendUrlBuilder->getUrl(
39+
$routePath,
40+
[
41+
'_current' => false,
42+
'_nosid' => true,
43+
'_query' => [\Magento\Store\Model\StoreManagerInterface::PARAM_NAME => $store]
44+
]
45+
);
46+
} else {
47+
$href = $this->frontendUrlBuilder->getUrl(
48+
$routePath,
49+
[
50+
'_current' => false,
51+
'_nosid' => true
52+
]
53+
);
54+
}
4555

4656
return $href;
4757
}

‎app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<element name="addNewPageButton" type="button" selector="#add" timeout="30"/>
1818
<element name="select" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//button[text()='Select']" parameterized="true"/>
1919
<element name="edit" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='Edit']" parameterized="true"/>
20-
<element name="preview" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='Preview']" parameterized="true"/>
20+
<element name="preview" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='View']" parameterized="true"/>
2121
<element name="clearAllButton" type="button" selector="//div[@class='admin__data-grid-header']//button[contains(text(), 'Clear all')]"/>
2222
<element name="activeFilters" type="button" selector="//div[@class='admin__data-grid-header']//span[contains(text(), 'Active filters:')]" />
2323
<element name="spinner" type="input" selector='//div[@data-component="cms_page_listing.cms_page_listing.cms_page_columns"]'/>

‎app/code/Magento/Widget/Test/Mftf/Test/ProductsListWidgetTest.xml

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="ProductsListWidgetTest">
12+
<annotations>
13+
<features value="Widget"/>
14+
<stories value="Products list widget"/>
15+
<title value="Admin should be able to set Products List Widget"/>
16+
<description value="Admin should be able to set Products List Widget"/>
17+
<severity value="CRITICAL"/>
18+
<testCaseId value="MAGETWO-97041"/>
19+
<group value="Widget"/>
20+
<group value="WYSIWYGDisabled"/>
21+
</annotations>
22+
<before>
23+
<createData entity="ApiCategory" stepKey="createCategory"/>
24+
<createData entity="ApiSimpleProduct" stepKey="createSimpleProduct">
25+
<requiredEntity createDataKey="createCategory"/>
26+
</createData>
27+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
28+
</before>
29+
<after>
30+
<conditionalClick selector="{{CmsPagesPageActionsSection.clearAllButton}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
31+
<actionGroup ref="logout" stepKey="logout"/>
32+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
33+
<deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
34+
</after>
35+
<!-- Create a CMS page containing the Products List widget -->
36+
<amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnCmsList"/>
37+
<waitForPageLoad stepKey="waitForCmsList"/>
38+
<click selector="{{CmsPagesPageActionsSection.addNewPageButton}}" stepKey="clickAddNewPageButton"/>
39+
<fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_newDefaultCmsPage.title}}" stepKey="fillPageTitle"/>
40+
<click selector="{{CmsNewPagePageContentSection.header}}" stepKey="expandContentSection"/>
41+
<waitForPageLoad stepKey="waitForContentSection"/>
42+
<click selector="{{CmsWYSIWYGSection.InsertWidgetBtn}}" stepKey="clickInsertWidgetButton"/>
43+
<waitForPageLoad stepKey="waitForSlideOut"/>
44+
<selectOption selector="{{WidgetSection.WidgetType}}" userInput="Catalog Products List" stepKey="selectWidgetType"/>
45+
<waitForPageLoad stepKey="waitForWidgetOptions"/>
46+
<click selector="{{AdminNewWidgetSection.addNewCondition}}" stepKey="clickAddNewCondition"/>
47+
<selectOption selector="{{AdminNewWidgetSection.selectCondition}}" userInput="Magento\CatalogWidget\Model\Rule\Condition\Product|category_ids" stepKey="selectCondition"/>
48+
<waitForElement selector="{{AdminNewWidgetSection.ruleParameter}}" stepKey="waitRuleParameter"/>
49+
<click selector="{{AdminNewWidgetSection.ruleParameter}}" stepKey="clickRuleParameter"/>
50+
<click selector="{{AdminNewWidgetSection.openChooser}}" stepKey="clickChooser"/>
51+
<waitForAjaxLoad stepKey="waitForAjaxLoad"/>
52+
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}" stepKey="clickCategoryToEditInitial"/>
53+
<click selector="{{AdminNewWidgetSection.applyParameter}}" stepKey="clickApplyRuleParameter"/>
54+
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidget"/>
55+
<click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandSplitBtn"/>
56+
<click selector="{{CmsNewPagePageActionsSection.saveAndClose}}" stepKey="clickSaveAndClose"/>
57+
<waitForPageLoad stepKey="waitForCmsList2"/>
58+
<see userInput="You saved the page." stepKey="seeSuccessMessage"/>
59+
<!-- Verify CMS page on storefront -->
60+
<waitForElementVisible selector="{{CmsPagesPageActionsSection.select(_newDefaultCmsPage.title)}}" stepKey="waitForCMSPageListItem" />
61+
<click selector="{{CmsPagesPageActionsSection.select(_newDefaultCmsPage.title)}}" stepKey="clickSelect" />
62+
<waitForElementVisible selector="{{CmsPagesPageActionsSection.edit(_newDefaultCmsPage.title)}}" stepKey="waitForEditLink" />
63+
<click selector="{{CmsPagesPageActionsSection.preview(_newDefaultCmsPage.title)}}" stepKey="clickEdit" />
64+
<waitForPageLoad stepKey="waitForCMSPage"/>
65+
<seeInTitle userInput="{{_newDefaultCmsPage.title}}" stepKey="seePageTitle"/>
66+
<see userInput="{{_newDefaultCmsPage.title}}" stepKey="seeProduct"/>
67+
</test>
68+
</tests>

0 commit comments

Comments
 (0)