Skip to content

Commit cd6e39b

Browse files
author
Hwashiang Yu
committed
Merge remote-tracking branch 'upstream/develop' into MC-13964
2 parents b59da88 + 99560c5 commit cd6e39b

32 files changed

+459
-282
lines changed

‎app/code/Magento/PageBuilder/Controller/ContentType/Preview.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
namespace Magento\PageBuilder\Controller\ContentType;
1010

11+
use Magento\Framework\App\Action\HttpPostActionInterface;
1112
use Magento\Framework\Controller\ResultFactory;
1213
use Magento\Framework\App\Action\HttpPostActionInterface;
1314

‎app/code/Magento/PageBuilder/Model/Stage/Renderer/WidgetDirective.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
namespace Magento\PageBuilder\Model\Stage\Renderer;
1010

11+
use Magento\Store\Model\Store;
12+
1113
/**
1214
* Renders a widget directive for the stage
1315
*
@@ -57,9 +59,8 @@ public function render(array $params): array
5759
}
5860

5961
try {
60-
$storeId = $this->storeManager->getStore()->getId();
6162
$result['content'] = $this->directiveFilter
62-
->setStoreId($storeId)
63+
->setStoreId(Store::DEFAULT_STORE_ID)
6364
->filter($params['directive']);
6465
} catch (\Exception $e) {
6566
$result['error'] = __($e->getMessage());

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup.xml

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -32,30 +32,6 @@
3232
<waitForElementNotVisible selector="{{PageBuilderStage.stageLoading}}" stepKey="waitForStageLoadingGraphicNotVisible"/>
3333
<waitForElementVisible time="30" selector="{{RowOnStage.base(rowIndex)}}" stepKey="waitForPageBuilderRow"/>
3434
</actionGroup>
35-
<actionGroup name="saveCMSBlock">
36-
<!-- This goes in CE repo -->
37-
<waitForElementVisible selector="{{CmsNewBlockBlockActionsSection.savePage}}" stepKey="waitForSaveButton"/>
38-
<click selector="{{CmsNewBlockBlockActionsSection.savePage}}" stepKey="clickSaveButton"/>
39-
<waitForPageLoad stepKey="waitForPageLoad"/>
40-
<see userInput="You saved the block." stepKey="seeSuccessfulSaveMessage"/>
41-
</actionGroup>
42-
<actionGroup name="saveAndContinueEditCmsPage">
43-
<!-- This goes in CE repo -->
44-
<waitForElementVisible time="10" selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="waitForSaveAndContinueVisibility"/>
45-
<click selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="clickSaveAndContinueEditCmsPage"/>
46-
<waitForPageLoad stepKey="waitForCmsPageLoad"/>
47-
<waitForElementVisible time="1" selector="{{CmsNewPagePageActionsSection.cmsPageTitle}}" stepKey="waitForCmsPageSaveButton"/>
48-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
49-
</actionGroup>
50-
<actionGroup name="saveCmsPage">
51-
<!-- This goes in CE repo -->
52-
<waitForElementVisible selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="waitForSplitButton"/>
53-
<click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandSplitButton"/>
54-
<waitForElementVisible selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="waitForSaveCmsPage"/>
55-
<click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSaveCmsPage"/>
56-
<waitForElementVisible time="1" selector="{{CmsPagesPageActionsSection.addNewPageButton}}" stepKey="waitForCmsPageSaveButton"/>
57-
<see userInput="You saved the page." selector="{{CmsPagesPageActionsSection.savePageSuccessMessage}}" stepKey="assertSavePageSuccessMessage"/>
58-
</actionGroup>
5935
<actionGroup name="verifyPageBuilderVisibleOnPage">
6036
<waitForElementVisible selector="{{PageBuilderPanel.layoutGroup}}" stepKey="seePageBuilderVisible"/>
6137
<dontSee userInput="Enable Advanced CMS" stepKey="dontSeeEnableAdvancedCMSBtn"/>
@@ -69,18 +45,6 @@
6945
<dontSee userInput="Enable Advanced CMS" stepKey="dontSeeEnableAdvancedCMSBtn"/>
7046
<dontSee selector="{{PageBuilderPanel.layoutGroup}}" stepKey="seePageBuilderVisible"/>
7147
</actionGroup>
72-
<actionGroup name="setLayout">
73-
<!-- This goes in CE repo -->
74-
<arguments>
75-
<argument name="designSection"/>
76-
<argument name="layoutOption"/>
77-
</arguments>
78-
<waitForElementVisible selector="{{designSection.DesignTab}}" stepKey="waitForDesignTabVisible"/>
79-
<conditionalClick selector="{{designSection.DesignTab}}" dependentSelector="{{designSection.LayoutDropdown}}" visible="false" stepKey="clickOnDesignTab"/>
80-
<waitForPageLoad stepKey="waitForPageLoadDesignTab"/>
81-
<waitForElementVisible selector="{{designSection.LayoutDropdown}}" stepKey="waitForLayoutDropDown" />
82-
<selectOption selector="{{designSection.LayoutDropdown}}" userInput="{{layoutOption}}" stepKey="selectLayout"/>
83-
</actionGroup>
8448
<actionGroup name="verifyFullWidthLayout">
8549
<arguments>
8650
<argument name="index" defaultValue="0" type="string"/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminProductActionGroup.xml

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/CatalogProductActionGroup.xml

Lines changed: 1 addition & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -20,70 +20,4 @@
2020
<waitForPageLoad stepKey="waitForPageBuilderToOpen"/>
2121
<waitForElementVisible selector="{{pageBuilderArea}}{{PageBuilderPanel.layoutGroup}}" stepKey="waiForPageBuilderVisible"/>
2222
</actionGroup>
23-
<actionGroup name="expandAdminProductSection">
24-
<!-- This goes in CE repo -->
25-
<arguments>
26-
<argument name="sectionSelector" defaultValue="{{AdminProductContentSection.sectionHeader}}" type="string"/>
27-
<argument name="sectionDependentSelector" defaultValue="{{AdminProductContentSection.sectionHeader}}._show" type="string"/>
28-
</arguments>
29-
<scrollToTopOfPage stepKey="scrollToTopOfPage"/>
30-
<waitForElementVisible time="30" selector="{{sectionSelector}}" stepKey="waitForSection"/>
31-
<conditionalClick selector="{{sectionSelector}}" dependentSelector="{{sectionDependentSelector}}" visible="false" stepKey="expandSection"/>
32-
<waitForPageLoad time="30" stepKey="waitForSectionToExpand"/>
33-
</actionGroup>
34-
<actionGroup name="navigateToCreatedProductEditPage">
35-
<!-- This goes in CE repo -->
36-
<arguments>
37-
<argument name="product" defaultValue="_defaultProduct"/>
38-
</arguments>
39-
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToAdminProductIndexPage"/>
40-
<waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
41-
<conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
42-
<waitForPageLoad stepKey="waitForClearFilters"/>
43-
<dontSeeElement selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="dontSeeClearFilters"/>
44-
<click selector="{{AdminProductGridFilterSection.viewDropdown}}" stepKey="openViewBookmarksTab"/>
45-
<click selector="{{AdminProductGridFilterSection.viewBookmark('Default View')}}" stepKey="resetToDefaultGridView"/>
46-
<waitForPageLoad stepKey="waitForResetToDefaultView"/>
47-
<see selector="{{AdminProductGridFilterSection.viewDropdown}}" userInput="Default View" stepKey="seeDefaultViewSelected"/>
48-
<click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
49-
<fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillProductSkuFilter"/>
50-
<click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
51-
<waitForPageLoad stepKey="waitForFilterOnGrid"/>
52-
<click selector="{{AdminProductGridSection.selectRowBasedOnName(product.name)}}" stepKey="clickProduct"/>
53-
<waitForPageLoad stepKey="waitForProductEditPageLoad"/>
54-
<waitForElementVisible selector="{{AdminProductFormBundleSection.productSku}}" stepKey="waitForProductSKUField"/>
55-
<seeInField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{product.sku}}" stepKey="seeProductSKU"/>
56-
</actionGroup>
57-
<actionGroup name="NavigateToAndResetProductGridToDefaultView" extends="resetProductGridToDefaultView">
58-
<!-- This goes in CE repo -->
59-
<amOnPage url="{{AdminProductIndexPage.url}}" before="clickClearFilters" stepKey="goToAdminProductIndexPage"/>
60-
<waitForPageLoad after="goToAdminProductIndexPage" stepKey="waitForProductIndexPageToLoad"/>
61-
</actionGroup>
62-
<actionGroup name="saveProductAttribute">
63-
<!-- This goes in CE repo -->
64-
<waitForElementVisible selector="{{AttributePropertiesSection.Save}}" stepKey="waitForSaveButton"/>
65-
<click selector="{{AttributePropertiesSection.Save}}" stepKey="clickSaveButton"/>
66-
<waitForPageLoad stepKey="waitForAttributeToSave"/>
67-
<seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSuccessMessage"/>
68-
</actionGroup>
69-
<actionGroup name="confirmChangeInputTypeModal">
70-
<!-- This goes in CE repo -->
71-
<waitForElementVisible selector="{{AdminEditProductAttributesSection.ProductDataMayBeLostConfirmButton}}" stepKey="waitForChangeInputTypeButton"/>
72-
<click selector="{{AdminEditProductAttributesSection.ProductDataMayBeLostConfirmButton}}" stepKey="clickChangeInputTypeButton"/>
73-
<waitForElementNotVisible selector="{{AdminEditProductAttributesSection.ProductDataMayBeLostModal}}" stepKey="waitForChangeInputTypeModalGone"/>
74-
</actionGroup>
75-
<actionGroup name="saveProductAttributeInUse">
76-
<!-- This goes in CE repo -->
77-
<waitForElementVisible selector="{{AttributePropertiesSection.Save}}" stepKey="waitForSaveButton"/>
78-
<click selector="{{AttributePropertiesSection.Save}}" stepKey="clickSaveButton"/>
79-
<waitForPageLoad stepKey="waitForAttributeToSave"/>
80-
<seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSuccessMessage"/>
81-
</actionGroup>
82-
<actionGroup name="NavigateToAndResetProductAttributeGridToDefaultView">
83-
<!-- This goes in CE repo -->
84-
<amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
85-
<waitForPageLoad stepKey="waitForPageLoad"/>
86-
<conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
87-
<waitForPageLoad stepKey="waitForGridLoad"/>
88-
</actionGroup>
89-
</actionGroups>
23+
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup.xml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,6 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<actionGroup name="navigateToAdminContentManagementPage">
12-
<!-- This goes in CE repo -->
13-
<amOnPage url="{{AdminContentManagementPage.url}}" stepKey="navigateToConfigurationPage"/>
14-
<waitForPageLoad stepKey="waitForPageLoad1"/>
15-
</actionGroup>
16-
<actionGroup name="saveStoreConfiguration">
17-
<!-- This goes in CE repo -->
18-
<comment userInput="saveStoreConfiguration" stepKey="comment"/>
19-
<waitForElementVisible selector="{{StoreConfigSection.Save}}" stepKey="waitForSaveButton"/>
20-
<click selector="{{StoreConfigSection.Save}}" stepKey="clickSaveButton"/>
21-
<waitForPageLoad stepKey="waitForPageLoad"/>
22-
</actionGroup>
23-
<actionGroup name="saveStoreConfigurationAndValidateFieldError">
24-
<!-- This goes in CE repo -->
25-
<arguments>
26-
<argument name="inputFieldError" type="string"/>
27-
<argument name="errorMessageSelector" type="string"/>
28-
<argument name="errorMessage" type="string"/>
29-
</arguments>
30-
<comment userInput="saveStoreConfigurationAndValidateFieldError" stepKey="comment"/>
31-
<waitForElementVisible selector="{{StoreConfigSection.Save}}" stepKey="waitForSaveButton"/>
32-
<click selector="{{StoreConfigSection.Save}}" stepKey="clickSaveButton"/>
33-
<waitForElement selector="{{inputFieldError}}" stepKey="waitForErrorField"/>
34-
<waitForElementVisible selector="{{errorMessageSelector}}" stepKey="waitForErrorMessage"/>
35-
<see selector="{{errorMessageSelector}}" userInput="{{errorMessage}}" stepKey="seeErrorMessage"/>
36-
</actionGroup>
3711
<actionGroup name="enablePageBuilderSetting">
3812
<amOnPage url="{{AdminContentManagementPage.url}}" stepKey="navigateToConfigurationPage" />
3913
<waitForPageLoad stepKey="wait1"/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
<amOnPage url="{{contentType.pageNamePrefix}}{{PageBuilderPageTitle.pageName}}" stepKey="amOnStoreFrontPage"/>
1616
<waitForPageLoad time="30" stepKey="waitForPageLoad"/>
1717
</actionGroup>
18-
<actionGroup name="navigateToStorefrontForCreatedPage">
19-
<!-- This goes in CE repo -->
18+
<actionGroup name="navigateToStoreFrontWithStoreView">
2019
<arguments>
21-
<argument name="page" type="string"/>
20+
<argument name="contentType"/>
21+
<argument name="storeView"/>
2222
</arguments>
23-
<amOnPage url="{{page}}" stepKey="goToStorefront"/>
24-
<waitForPageLoad stepKey="waitForPageLoad"/>
23+
<amOnPage url="{{storeView.code}}/{{contentType.pageNamePrefix}}{{PageBuilderPageTitle.pageName}}" stepKey="amOnStoreFrontPage"/>
24+
<waitForPageLoad time="30" stepKey="waitForPageLoad"/>
2525
</actionGroup>
2626
<actionGroup name="validateContentTypeInsideContainerStorefront">
2727
<arguments>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@
8080
<waitForElementVisible selector="{{WidgetSection.WidgetType}}" stepKey="waitForWidgetType"/>
8181
<selectOption selector="{{WidgetSection.WidgetType}}" userInput="{{TinyMCEWidgetCMSPageLink.widgetType}}" stepKey="selectCMSPageLinkWidget"/>
8282
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear2"/>
83-
<waitForElementVisible selector="{{moveToCE.SelectPageButton}}" stepKey="waitForSelectPage"/>
84-
<click selector="{{moveToCE.SelectPageButton}}" stepKey="clickSelectPage"/>
83+
<waitForElementVisible selector="{{WidgetSection.SelectPageButton}}" stepKey="waitForSelectPage"/>
84+
<click selector="{{WidgetSection.SelectPageButton}}" stepKey="clickSelectPage"/>
8585
<waitForLoadingMaskToDisappear stepKey="waitForSelectPageModal"/>
86-
<waitForElementVisible selector="{{moveToCE.generalFilter('chooser_title')}}" stepKey="waitForGrid"/>
87-
<fillField selector="{{moveToCE.generalFilter('chooser_identifier')}}" userInput="{{page}}" stepKey="enterPageName"/>
86+
<waitForElementVisible selector="{{WidgetSection.SelectPageFilterInput('chooser_title')}}" stepKey="waitForGrid"/>
87+
<fillField selector="{{WidgetSection.SelectPageFilterInput('chooser_identifier')}}" userInput="{{page}}" stepKey="enterPageName"/>
8888
<click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickSearch"/>
8989
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear3"/>
9090
<waitForElementVisible selector="//td[contains(@class,'col-url')][contains(text(),'{{page}}')]" stepKey="waitForSearchResult"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Data/CatalogProductData.xml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,4 @@
1111
<entity name="EditWithPageBuilderButton" type="pagebuilder_button">
1212
<data key="value">Edit with Page Builder</data>
1313
</entity>
14-
<entity name="ProductShortDescription" type="ProductAttribute">
15-
<!-- This goes in CE repo -->
16-
<data key="attribute_code">short_description</data>
17-
</entity>
18-
<entity name="AddToDefaultSetTopOfContentSection" type="ProductAttributeSet">
19-
<!-- This goes in CE repo -->
20-
<var key="attributeCode" entityKey="attribute_code" entityType="ProductAttribute"/>
21-
<data key="attributeSetId">4</data>
22-
<data key="attributeGroupId">13</data>
23-
<data key="sortOrder">0</data>
24-
</entity>
2514
</entities>

‎app/code/Magento/PageBuilder/Test/Mftf/Data/CmsPageData.xml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,4 @@
1717
<entity name="cmsPageNonexistentDataRole" type="cms_page">
1818
<data key="content">&lt;div data-role=&quot;row&quot;&gt;&lt;div data-role=&quot;non-existent-content-type&quot;&gt;&lt;/div&gt;&lt;/div&gt;</data>
1919
</entity>
20-
<entity name="_emptyCmsPage" type="cms_page">
21-
<!-- This goes in CE repo -->
22-
<data key="title" unique="suffix">Test CMS Page</data>
23-
<data key="identifier" unique="suffix">test-page-</data>
24-
</entity>
25-
<entity name="_emptyCmsBlock" type="block">
26-
<!-- This goes in CE repo -->
27-
<data key="title" unique="suffix">Test CMS Block</data>
28-
<data key="identifier" unique="suffix" >block</data>
29-
<data key="active">true</data>
30-
</entity>
3120
</entities>

0 commit comments

Comments
 (0)