Skip to content

Commit 1c051ff

Browse files
irenelagnoirenelagno
committed
Merge branch '2.3-develop-main' into MAGETWO-71404
2 parents ae90570 + 2f888a3 commit 1c051ff

13 files changed

+71
-71
lines changed

‎dev/tests/acceptance/composer.lock‎

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationEnableDisableAnalyticsCest.xml‎

Lines changed: 35 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -6,41 +6,39 @@
66
*/
77
-->
88

9-
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
11-
<test name="EnableDisableAdvancedReporting">
12-
<annotations>
13-
<features value="Analytics"/>
14-
<stories value="Enable/disable Advanced Reporting"/>
15-
<title value="Enable Disable Advanced Reporting"/>
16-
<description value="An admin user can enable/disable Advanced Reporting."/>
17-
<severity value="NORMAL"/>
18-
<testCaseId value="MAGETWO-66465"/>
19-
<group value="analytics"/>
20-
</annotations>
21-
<after>
22-
<amOnPage stepKey="amOnLogoutPage" url="admin/admin/auth/logout/"/>
23-
</after>
24-
<actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
25-
<!--Goto admin stores configure page -->
26-
<amOnPage stepKey="amOnAdminConfig" url="{{AdminConfigPage.url}}"/>
27-
<!--Enable Advanced Reporting-->
28-
<click stepKey="clickAdvancedReportingConfigMenu" selector="{{AdminConfigSection.advancedReportingMenuItem}}"/>
29-
<see stepKey="seeAdvancedReportingServiceLabel" selector="{{AdminConfigSection.advancedReportingServiceLabel}}" userInput="Advanced Reporting Service"/>
30-
<selectOption stepKey="selectAdvancedReportingService" selector="{{AdminConfigSection.advancedReportingService}}" userInput="Enable"/>
31-
<see stepKey="seeAdvancedReportingIndustryLabel" selector="{{AdminConfigSection.advancedReportingIndustryLabel}}" userInput="Industry"/>
32-
<selectOption stepKey="selectAdvancedReportingIndustry" selector="{{AdminConfigSection.advancedReportingIndustry}}" userInput="Apps and Games"/>
33-
<click stepKey="clickSaveConfigButton" selector="{{AdminConfigSection.saveButton}}"/>
34-
<see stepKey="seeSaveConfigurationMessage" selector="{{AdminConfigSection.advancedReportingSuccessMessage}}" userInput="You saved the configuration."/>
35-
<see stepKey="seeAdvancedReportingService" selector="{{AdminConfigSection.advancedReportingService}}" userInput="Enable"/>
36-
<see stepKey="seeAdvancedReportingServiceStatus" selector="{{AdminConfigSection.advancedReportingServiceStatus}}" userInput="Subscription status: Pending"/>
37-
<!--Disable Advanced Reporting-->
38-
<see stepKey="seeAdvancedReportingServiceLabel" selector="{{AdminConfigSection.advancedReportingServiceLabel}}" userInput="Advanced Reporting Service"/>
39-
<selectOption stepKey="selectAdvancedReportingService" selector="{{AdminConfigSection.advancedReportingService}}" userInput="Disable"/>
40-
<click stepKey="clickSaveConfigButton" selector="{{AdminConfigSection.saveButton}}"/>
41-
<see stepKey="seeSaveConfigurationMessage" selector="{{AdminConfigSection.advancedReportingSuccessMessage}}" userInput="You saved the configuration."/>
42-
<see stepKey="seeAdvancedReportingService" selector="{{AdminConfigSection.advancedReportingService}}" userInput="Disable"/>
43-
<see stepKey="seeAdvancedReportingServiceStatus" selector="{{AdminConfigSection.advancedReportingServiceStatus}}" userInput="Subscription status: Disabled"/>
44-
45-
</test>
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
10+
<test name="EnableDisableAdvancedReporting">
11+
<annotations>
12+
<features value="Analytics"/>
13+
<stories value="Enable/disable Advanced Reporting"/>
14+
<title value="Enable Disable Advanced Reporting"/>
15+
<description value="An admin user can enable/disable Advanced Reporting."/>
16+
<severity value="NORMAL"/>
17+
<testCaseId value="MAGETWO-66465"/>
18+
<group value="analytics"/>
19+
</annotations>
20+
<after>
21+
<amOnPage stepKey="amOnLogoutPage" url="admin/admin/auth/logout/"/>
22+
</after>
23+
<actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
24+
<!--Goto admin stores configure page -->
25+
<amOnPage stepKey="amOnAdminConfig" url="{{AdminConfigPage.url}}"/>
26+
<!--Enable Advanced Reporting-->
27+
<click stepKey="clickAdvancedReportingConfigMenu" selector="{{AdminConfigSection.advancedReportingMenuItem}}"/>
28+
<see stepKey="seeAdvancedReportingServiceLabelEnabled" selector="{{AdminConfigSection.advancedReportingServiceLabel}}" userInput="Advanced Reporting Service"/>
29+
<selectOption stepKey="selectAdvancedReportingServiceEnabled" selector="{{AdminConfigSection.advancedReportingService}}" userInput="Enable"/>
30+
<see stepKey="seeAdvancedReportingIndustryLabel" selector="{{AdminConfigSection.advancedReportingIndustryLabel}}" userInput="Industry"/>
31+
<selectOption stepKey="selectAdvancedReportingIndustry" selector="{{AdminConfigSection.advancedReportingIndustry}}" userInput="Apps and Games"/>
32+
<click stepKey="clickSaveConfigButtonEnabled" selector="{{AdminConfigSection.saveButton}}"/>
33+
<see stepKey="seeSaveConfigurationMessageEnabled" selector="{{AdminConfigSection.advancedReportingSuccessMessage}}" userInput="You saved the configuration."/>
34+
<see stepKey="seeAdvancedReportingServiceEnabled" selector="{{AdminConfigSection.advancedReportingService}}" userInput="Enable"/>
35+
<see stepKey="seeAdvancedReportingServiceStatusEnabled" selector="{{AdminConfigSection.advancedReportingServiceStatus}}" userInput="Subscription status: Pending"/>
36+
<!--Disable Advanced Reporting-->
37+
<see stepKey="seeAdvancedReportingServiceLabelDisabled" selector="{{AdminConfigSection.advancedReportingServiceLabel}}" userInput="Advanced Reporting Service"/>
38+
<selectOption stepKey="selectAdvancedReportingServiceDisabled" selector="{{AdminConfigSection.advancedReportingService}}" userInput="Disable"/>
39+
<click stepKey="clickSaveConfigButtonDisabled" selector="{{AdminConfigSection.saveButton}}"/>
40+
<see stepKey="seeSaveConfigurationMessageDisabled" selector="{{AdminConfigSection.advancedReportingSuccessMessage}}" userInput="You saved the configuration."/>
41+
<see stepKey="seeAdvancedReportingServiceDisabled" selector="{{AdminConfigSection.advancedReportingService}}" userInput="Disable"/>
42+
<see stepKey="seeAdvancedReportingServiceStatusDisabled" selector="{{AdminConfigSection.advancedReportingServiceStatus}}" userInput="Subscription status: Disabled"/>
43+
</test>
4644
</tests>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationPermissionCest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<fillField stepKey="fillUsernameNoReport" selector="{{AdminLoginFormSection.username}}" userInput="$$noReportUser.username$$"/>
5656
<fillField stepKey="fillPasswordNoReport" selector="{{AdminLoginFormSection.password}}" userInput="$$noReportUser.password$$"/>
5757
<click stepKey="clickOnSignIn2" selector="{{AdminLoginFormSection.signIn}}"/>
58-
<waitForPageLoad stepKey="wait3" time="10"/>
58+
<waitForPageLoad stepKey="wait5" time="10"/>
5959
<amOnPage stepKey="amOnAdminConfig2" url="{{AdminConfigPage.url}}"/>
6060
<dontSee stepKey="dontSeeAdvancedReportingConfigMenuItem" selector="{{AdminConfigSection.advancedReportingMenuItem}}" userInput="Advanced Reporting"/>
6161
</test>

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
<conditionalClick selector="{{ProductDescriptionWYSIWYGToolbarSection.StorageRootArrow}}" dependentSelector="{{ProductDescriptionWYSIWYGToolbarSection.checkIfArrowExpand}}" stepKey="clickArrowIfCloses1" visible="true"/>
4949
<waitForText userInput="{{ImageFolder.name}}" stepKey="waitForNewFolder1" />
5050
<click userInput="{{ImageFolder.name}}" stepKey="clickOnCreatedFolder1" />
51-
<waitForLoadingMaskToDisappear stepKey="waitForLoading5" />
51+
<waitForLoadingMaskToDisappear stepKey="waitForLoading4" />
5252
<attachFile selector="{{ProductDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload.file}}" stepKey="uploadImage1"/>
53-
<waitForLoadingMaskToDisappear stepKey="waitForLoading6" />
53+
<waitForLoadingMaskToDisappear stepKey="waitForLoading5" />
5454
<waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload.file)}}" stepKey="waitForUploadImage1" />
5555
<seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.imageSelected(ImageUpload.file)}}" stepKey="seeImageSelected1" />
5656
<see selector="{{ProductDescriptionWYSIWYGToolbarSection.DeleteSelectedBtn}}" userInput="Delete Selected" stepKey="seeDeleteBtn1"/>
@@ -60,10 +60,10 @@
6060
<waitForElementNotVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload.file)}}" stepKey="waitForImageDeleted1" />
6161
<dontSeeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload.file)}}" stepKey="dontSeeImage1" />
6262
<attachFile selector="{{ProductDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload.file}}" stepKey="uploadImage2"/>
63-
<waitForLoadingMaskToDisappear stepKey="waitForLoading7" />
63+
<waitForLoadingMaskToDisappear stepKey="waitForLoading6" />
6464
<waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload.file)}}" stepKey="waitForUploadImage2" />
6565
<click selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="clickInsertBtn1" />
66-
<waitForLoadingMaskToDisappear stepKey="waitForLoading8" />
66+
<waitForLoadingMaskToDisappear stepKey="waitForLoading7" />
6767
<waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.OkBtn}}" stepKey="waitForOkBtn1" />
6868
<fillField selector="{{ProductDescriptionWYSIWYGToolbarSection.ImageDescription}}" userInput="{{ImageUpload.content}}" stepKey="fillImageDescription1" />
6969
<fillField selector="{{ProductDescriptionWYSIWYGToolbarSection.Height}}" userInput="{{ImageUpload.height}}" stepKey="fillImageHeight1" />
@@ -74,34 +74,33 @@
7474
<waitForPageLoad stepKey="waitForPageLoad4" />
7575
<click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.Browse}}" stepKey="clickBrowse2" />
7676
<waitForPageLoad stepKey="waitForPageLoad5" />
77-
<waitForLoadingMaskToDisappear stepKey="waitForLoading9" />
78-
<waitForLoadingMaskToDisappear stepKey="waitForLoading10" />
77+
<waitForLoadingMaskToDisappear stepKey="waitForLoading8" />
7978
<see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.CancelBtn}}" userInput="Cancel" stepKey="seeCancelBtn2" />
8079
<see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.CreateFolder}}" userInput="Create Folder" stepKey="seeCreateFolderBtn2" />
8180
<see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertFile}}" userInput="Add Selected" stepKey="seeAddSelectedBtn2" />
8281
<attachFile selector="{{ProductShortDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload1.file}}" stepKey="uploadImage3"/>
8382
<waitForElementVisible selector="{{ProductShortDescriptionWYSIWYGToolbarSection.image(ImageUpload1.file)}}" stepKey="waitForUploadImage3" />
84-
<waitForLoadingMaskToDisappear stepKey="waitForLoading13" />
83+
<waitForLoadingMaskToDisappear stepKey="waitForLoading9" />
8584
<wait time="3" stepKey="waitMore" />
8685
<waitForElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.DeleteSelectedBtn}}" stepKey="waitForDeletebtn" />
8786
<see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.DeleteSelectedBtn}}" userInput="Delete Selected" stepKey="seeDeleteBtn2"/>
8887
<click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.DeleteSelectedBtn}}" stepKey="clickDeleteSelected2" />
8988
<waitForText userInput="OK" stepKey="waitForConfirm3" />
9089
<click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.confirmDelete}}" stepKey="confirmDelete2" />
9190
<attachFile selector="{{ProductShortDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload1.file}}" stepKey="uploadImage4"/>
92-
<waitForLoadingMaskToDisappear stepKey="waitForLoading14" />
91+
<waitForLoadingMaskToDisappear stepKey="waitForLoading10" />
9392
<waitForElementVisible selector="{{ProductShortDescriptionWYSIWYGToolbarSection.image(ImageUpload1.file)}}" stepKey="waitForUploadImage4" />
9493
<click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="clickInsertBtn" />
95-
<waitForLoadingMaskToDisappear stepKey="waitForLoading15" />
94+
<waitForLoadingMaskToDisappear stepKey="waitForLoading11" />
9695
<waitForElementVisible selector="{{ProductShortDescriptionWYSIWYGToolbarSection.OkBtn}}" stepKey="waitForOkBtn2" />
9796
<fillField selector="{{ProductShortDescriptionWYSIWYGToolbarSection.ImageDescription}}" userInput="{{ImageUpload1.content}}" stepKey="fillImageDescription2" />
9897
<fillField selector="{{ProductShortDescriptionWYSIWYGToolbarSection.Height}}" userInput="{{ImageUpload1.height}}" stepKey="fillImageHeight2" />
9998
<click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.OkBtn}}" stepKey="clickOkBtn2" />
10099
<waitForPageLoad stepKey="waitForPageLoad6"/>
101100
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
102-
<waitForLoadingMaskToDisappear stepKey="waitForLoading13" />
101+
<waitForLoadingMaskToDisappear stepKey="waitForLoading12" />
103102
<amOnPage url="{{_defaultProduct.name}}.html" stepKey="navigateToProductPage"/>
104-
<waitForPageLoad stepKey="waitForPageLoad2"/>
103+
<waitForPageLoad stepKey="waitForPageLoad7"/>
105104
<seeElement selector="{{StorefrontProductInfoMainSection.mediaDescription}}" stepKey="assertMediaDescription"/>
106105
<seeElement selector="{{StorefrontProductInfoMainSection.mediaShortDescription}}" stepKey="assertMediaShortDescription"/>
107106
<after>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertLink}}" stepKey="assertInfo25"/>
8181
<seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertImageIcon}}" stepKey="assertInfo26"/>
8282
<seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertTable}}" stepKey="assertInfo27"/>
83-
<seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.SpecialCharacter}}" stepKey="assertInfo27"/>
83+
<seeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.SpecialCharacter}}" stepKey="assertInfo28"/>
8484
<after>
8585
<actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
8686
<actionGroup ref="logout" stepKey="logout"/>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddImageToWYSIWYGBlockCest.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<click selector="{{CmsPagesPageActionsSection.FilterBtn}}" stepKey="clickFiltersBtn" />
7777
<fillField selector="{{CmsPagesPageActionsSection.URLKey}}" userInput="$$createCMSPage.identifier$$" stepKey="fillOutURLKey" />
7878
<click selector="{{CmsPagesPageActionsSection.ApplyFiltersBtn}}" stepKey="clickApplyBtn" />
79-
<waitForLoadingMaskToDisappear stepKey="waitForLoading9" />
79+
<waitForLoadingMaskToDisappear stepKey="waitForLoading7" />
8080
<actionGroup ref="SortByIdDescendingActionGroup" stepKey="sortByIdDescending" />
8181
<waitForElementVisible selector="{{CmsPagesPageActionsSection.select('$$createCMSPage.identifier$$')}}" stepKey="waitForCMSPageGrid" />
8282
<click selector="{{CmsPagesPageActionsSection.select('$$createCMSPage.identifier$$')}}" stepKey="clickSelect" />
@@ -89,16 +89,16 @@
8989
<click selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="clickInsertWidgetIcon" />
9090
<waitForPageLoad stepKey="waitForPageLoad8" />
9191
<selectOption selector="{{WidgetSection.WidgetType}}" userInput="CMS Static Block" stepKey="selectCMSStaticBlock" />
92-
<waitForLoadingMaskToDisappear stepKey="waitForLoading7" />
92+
<waitForLoadingMaskToDisappear stepKey="waitForLoading8" />
9393
<selectOption selector="{{WidgetSection.WidgetTemplate}}" userInput="CMS Static Block Default Template" stepKey="selectTemplate" />
9494
<click selector="{{WidgetSection.BtnChooser}}" stepKey="clickSelectPageBtn" />
95-
<waitForLoadingMaskToDisappear stepKey="waitForLoading8" />
95+
<waitForLoadingMaskToDisappear stepKey="waitForLoading9" />
9696
<actionGroup ref="SortByIdDescendingActionGroup" stepKey="sortByIdDescending2" />
9797
<waitForElementVisible selector="{{WidgetSection.BlockPage(_defaultBlock.identifier)}}" stepKey="waitForBlockTitle" />
9898
<click selector="{{WidgetSection.BlockPage(_defaultBlock.identifier)}}" stepKey="selectPreCreateBlock" />
9999
<wait time="3" stepKey="wait1" />
100100
<click selector="{{WidgetSection.InsertWidget}}" stepKey="clickInsertWidgetBtn" />
101-
<waitForLoadingMaskToDisappear stepKey="waitForLoading9" />
101+
<waitForLoadingMaskToDisappear stepKey="waitForLoading10" />
102102
<waitForPageLoad stepKey="waitForPageLoad9" />
103103
<click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
104104
<waitForPageLoad stepKey="waitForPageLoad10"/>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddVariableToWYSIWYGCMSCest.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,9 @@
8686
<see userInput="{{customVariable.html}}" stepKey="seeCustomVariable2" />
8787
<!--Delete Custom Variable-->
8888
<actionGroup ref="DeleteCustomVariableActionGroup" stepKey="deleteCustomVariable" />
89+
<actionGroup ref="ClearCacheActionGroup" stepKey="clearCache" />
8990
<!--Refresh Storefront-->
90-
<amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
91+
<amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPageRefresh"/>
9192
<waitForPageLoad stepKey="waitForPageLoad7" />
9293
<!--see custom variable blank-->
9394
<dontSee userInput="{{customVariable.html}}" stepKey="dontSeeCustomVariableName" />

0 commit comments

Comments
 (0)