Skip to content

Commit ee610ab

Browse files
Naveen-AC24Naveen-AC24
committed
[ACQE-7280] To check whether admin is able to change the frontend logo when single store mode is enabled in the configuration.
fixed code review comments
1 parent 5490b26 commit ee610ab

File tree

2 files changed

+50
-58
lines changed

2 files changed

+50
-58
lines changed

‎app/code/Magento/Theme/Test/Mftf/Section/AdminDesignConfigSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<element name="addSelectedFromMediaGallery" type="input" selector="//button[contains(@title,'Add Selected')]"/>
1818
<element name="htmlHeaderSection" type="text" selector="[data-index='head']"/>
1919
<element name="headerSection" type="text" selector="[data-index='header']"/>
20-
<element name="deleteheaderSectionImage" type="text" selector="//button[@title='Delete image']"/>
20+
<element name="deleteHeaderSectionImage" type="text" selector="//button[@title='Delete image']"/>
2121
<element name="selectFromGalleryByFieldsetName" type="input" selector="//*[contains(@class,'fieldset-wrapper')][child::*[contains(@class,'fieldset-wrapper-title')]//*[contains(text(),'{{arg1}}')]]//*[contains(@class,'file-uploader')]//label[contains(text(), 'Select from Gallery')]" parameterized="true"/>
2222
<element name="imageUploadFromMediaGallery" type="input" selector="//input[contains(@class,'fileupload')]" />
2323
<element name="saveConfiguration" type="input" selector="//button[contains(@title, 'Save Configuration')]" />

‎app/code/Magento/Theme/Test/Mftf/Test/ChangeFrontendLogoWithSingleStoreModeTest.xml

Lines changed: 49 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -10,45 +10,42 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1111
<test name="ChangeFrontendLogoWithSingleStoreModeTest">
1212
<annotations>
13-
<features value="Content" />
14-
<stories value="Content" />
15-
<title value="AC-8825: To check whether admin is able to change the frontend logo when single store mode is enabled in the configuration." />
16-
<description value="This test validates that the admin can change the frontend logo under Single Store Mode, ensuring the original logo is saved and restored after the test." />
17-
<severity value="MAJOR" />
18-
<testCaseId value="AC-8825" />
19-
<group value="Content" />
13+
<features value="Content"/>
14+
<stories value="Frontend logo change"/>
15+
<title value="To check whether admin is able to change the frontend logo when single store mode is enabled in the configuration."/>
16+
<description value="This test validates that the admin can change the frontend logo under Single Store Mode, ensuring the original logo is saved and restored after the test."/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="AC-8825"/>
19+
<group value="Content"/>
2020
</annotations>
2121
<before>
22-
<!-- Log in as Admin -->
22+
<!--Log in as Admin-->
2323
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2424
<!-- Enable media gallery if not already enabled -->
2525
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
2626
<argument name="enabled" value="0"/>
2727
</actionGroup>
2828
</before>
2929
<after>
30-
<!-- Disable Single Store Mode -->
30+
<!--Disable Single Store Mode-->
3131
<magentoCLI command="config:set general/single_store_mode/enabled 0" stepKey="disabledSingleStoreMode"/>
3232
<!-- Disable media gallery if previously enabled -->
3333
<actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
3434
<argument name="enabled" value="1"/>
3535
</actionGroup>
36-
<!-- Log out as Admin -->
36+
<!--Log out as Admin-->
3737
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
3838
</after>
39-
<!--Edit Store View-->
40-
<comment userInput="Edit Store View" stepKey="editStoreViewComment"/>
4139
<amOnPage url="{{DesignConfigPage.url}}" stepKey="navigateToDesignConfigPage" />
42-
<waitForPageLoad stepKey="waitForPageload1"/>
40+
<waitForPageLoad stepKey="waitForDesignConfigPageLoad"/>
4341
<click selector="{{AdminDesignConfigSection.scopeRow('3')}}" stepKey="editStoreView"/>
44-
<waitForPageLoad stepKey="waitForPageload2"/>
42+
<waitForPageLoad stepKey="waitForAdminDesignConfigSectionPageLoad"/>
4543
<scrollTo selector="{{AdminDesignConfigSection.headerSection}}" stepKey="scrollToHtmlHeadSection"/>
4644
<click selector="{{AdminDesignConfigSection.headerSection}}" stepKey="openHtmlHeadSection"/>
47-
<!--Upload First Image-->
48-
<comment userInput="Upload Image" stepKey="uploadImageComment"/>
45+
<!--Upload the First Image-->
4946
<click selector="{{AdminDesignConfigSection.selectFromGalleryByFieldsetName('Head')}}" stepKey="openMediaGallery"/>
5047
<actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="verifyMediaGalleryStorageBtn"/>
51-
<comment userInput="BIC workaround" stepKey="navigateToFolder"/>
48+
<!--Navigate to Storage Folder-->
5249
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
5350
<argument name="FolderName" value="Storage Root"/>
5451
</actionGroup>
@@ -64,42 +61,40 @@
6461
<actionGroup ref="SaveImageActionGroup" stepKey="insertImage"/>
6562
<click selector="{{AdminDesignConfigSection.saveConfiguration}}" stepKey="saveConfiguration"/>
6663
<waitForElementVisible selector="{{AdminDesignConfigSection.successNotification}}" stepKey="waitForSuccessNotification"/>
67-
<waitForPageLoad stepKey="waitForPageloadSuccess"/>
64+
<waitForPageLoad stepKey="waitForPageLoadSuccess"/>
6865
<!--Clear Cache-->
69-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache1">
66+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfterFirstImageUpload">
7067
<argument name="tags" value=""/>
7168
</actionGroup>
7269
<!--Navigate to Store front home page-->
73-
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToHomePage1"/>
74-
<waitForPageLoad stepKey="waitToLoadHomePage3"/>
70+
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToHomePage"/>
71+
<waitForPageLoad stepKey="waitToLoadHomePage"/>
7572
<!--assert to check first uploaded image name-->
76-
<seeElementInDOM selector="{{StorefrontHeaderSection.logoImage(ImageUpload3.fileName)}}" stepKey="assertMediaSource1"/>
73+
<seeElementInDOM selector="{{StorefrontHeaderSection.logoImage(ImageUpload3.fileName)}}" stepKey="assertMediaSource"/>
7774
<!-- Enable Single Store Mode -->
7875
<magentoCLI command="config:set general/single_store_mode/enabled 1" stepKey="enabledSingleStoreMode"/>
7976
<!--Clear Cache-->
80-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache2">
77+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfterSingleStoreModeEnabled">
8178
<argument name="tags" value=""/>
8279
</actionGroup>
8380
<!--Edit Store View for Second Image-->
84-
<comment userInput="Edit Store View for Image2" stepKey="editStoreViewCommentForImage2"/>
85-
<amOnPage url="{{DesignConfigPage.url}}" stepKey="navigateToDesignConfigPageForImage2" />
86-
<waitForPageLoad stepKey="waitForPageload1ForImage2"/>
87-
<click selector="{{AdminDesignConfigSection.scopeRow('1')}}" stepKey="editStoreViewForImage2"/>
88-
<waitForPageLoad stepKey="waitForPageload2ForImage2"/>
89-
<scrollTo selector="{{AdminDesignConfigSection.headerSection}}" stepKey="scrollToHtmlHeadSectionForImage2"/>
90-
<click selector="{{AdminDesignConfigSection.headerSection}}" stepKey="openHtmlHeadSectionForImage2"/>
81+
<amOnPage url="{{DesignConfigPage.url}}" stepKey="navigateToDesignConfigPageForSecondImage"/>
82+
<waitForPageLoad stepKey="waitForConfigPageLoad"/>
83+
<click selector="{{AdminDesignConfigSection.scopeRow('1')}}" stepKey="editStoreViewForSecondImage"/>
84+
<waitForPageLoad stepKey="waitForPageLoadPostSelectingScopeRow"/>
85+
<scrollTo selector="{{AdminDesignConfigSection.headerSection}}" stepKey="scrollToHtmlHeadSectionForSecondImageUpload"/>
86+
<click selector="{{AdminDesignConfigSection.headerSection}}" stepKey="openHtmlHeadSectionForSecondImageUpload"/>
9187
<!-- Upload second Image-->
92-
<comment userInput="Upload Second Image" stepKey="uploadSecondImageComment"/>
9388
<click selector="{{AdminDesignConfigSection.selectFromGalleryByFieldsetName('Head')}}" stepKey="openMediaGalleryForSecondImage"/>
9489
<actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="verifyMediaGalleryStorageBtnForSecondImage"/>
95-
<comment userInput="BIC workaround" stepKey="navigateToFolderForSecondImage"/>
90+
<!--Navigate to Created Folder to Store Second Image-->
9691
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolderForSecondImage">
9792
<argument name="FolderName" value="Storage Root"/>
9893
</actionGroup>
99-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolderForSecondIamge">
94+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolderForSecondImage">
10095
<argument name="FolderName" value="wysiwyg"/>
10196
</actionGroup>
102-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="selectTheCreatedFolderForSecondIamge">
97+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="selectTheCreatedFolderForSecondImage">
10398
<argument name="FolderName" value="{{ImageFolder.name}}"/>
10499
</actionGroup>
105100
<actionGroup ref="AttachImageActionGroup" stepKey="selectSecondImageFromMediaStorage">
@@ -108,46 +103,43 @@
108103
<actionGroup ref="SaveImageActionGroup" stepKey="insertSecondImage"/>
109104
<click selector="{{AdminDesignConfigSection.saveConfiguration}}" stepKey="saveConfigurationForSecondImage"/>
110105
<waitForElementVisible selector="{{AdminDesignConfigSection.successNotification}}" stepKey="waitForSuccessNotificationForSecondImage"/>
111-
<waitForPageLoad stepKey="waitForPageloadSuccessForSecondImage"/>
106+
<waitForPageLoad stepKey="waitForPageLoadSuccessForSecondImage"/>
112107
<!--Clear Cache-->
113-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache3">
108+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfterSecondImageUpload">
114109
<argument name="tags" value=""/>
115110
</actionGroup>
116111
<!--Navigate to Store front home page-->
117-
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToHomePage"/>
118-
<waitForPageLoad stepKey="waitToLoadHomePage2"/>
112+
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStoreFrontHomePage"/>
113+
<waitForPageLoad stepKey="waitToLoadStoreFrontHomePage"/>
119114
<!--assert to check second uploaded image name-->
120-
<seeElementInDOM selector="{{StorefrontHeaderSection.logoImage(ImageUpload.fileName)}}" stepKey="assertMediaSource3"/>
115+
<seeElementInDOM selector="{{StorefrontHeaderSection.logoImage(ImageUpload.fileName)}}" stepKey="assertUploadedImage"/>
121116
<!--Navigate to Store View to delete uploaded logo-->
122-
<comment userInput="Edit Store View" stepKey="editStoreViewComment2"/>
123-
<amOnPage url="{{DesignConfigPage.url}}" stepKey="navigateToDesignConfigPageToDeleteUploadedLogo" />
124-
<waitForPageLoad stepKey="waitForDesignConfigPageload"/>
125-
<click selector="{{AdminDesignConfigSection.scopeRow('1')}}" stepKey="editStoreView2"/>
126-
<waitForPageLoad stepKey="waitForPageload3"/>
127-
<scrollTo selector="{{AdminDesignConfigSection.headerSection}}" stepKey="scrollToHtmlHeadSection2"/>
128-
<click selector="{{AdminDesignConfigSection.headerSection}}" stepKey="openHtmlHeadSection2"/>
117+
<amOnPage url="{{DesignConfigPage.url}}" stepKey="navigateToDesignConfigPageToDeleteUploadedLogo"/>
118+
<waitForPageLoad stepKey="waitForNavigateDesignConfigPageLoad"/>
119+
<click selector="{{AdminDesignConfigSection.scopeRow('1')}}" stepKey="editStoreViewForScopeRow"/>
120+
<waitForPageLoad stepKey="waitForPageLoadAfterSelectingScopeRow"/>
121+
<scrollTo selector="{{AdminDesignConfigSection.headerSection}}" stepKey="scrollToHtmlHeadSectionToDeleteImage"/>
122+
<click selector="{{AdminDesignConfigSection.headerSection}}" stepKey="openHtmlHeadSectionToDeleteImage"/>
129123
<!--Delete uploaded Image From Header-->
130-
<comment userInput="Delete Uploaded Image" stepKey="DeleteUploadedImageComment"/>
131-
<click selector="{{AdminDesignConfigSection.deleteheaderSectionImage}}" stepKey="clickUseDefault"/>
132-
<waitForElementVisible selector="{{AdminDesignConfigSection.saveConfiguration}}" stepKey="waitForWrapperToClose2"/>
133-
<click selector="{{AdminDesignConfigSection.saveConfiguration}}" stepKey="saveConfiguration2"/>
134-
<waitForElementVisible selector="{{AdminDesignConfigSection.successNotification}}" stepKey="waitForSuccessNotification2"/>
135-
<waitForPageLoad stepKey="waitForPageloadSuccess2"/>
124+
<click selector="{{AdminDesignConfigSection.deleteHeaderSectionImage}}" stepKey="clickUseDefault"/>
125+
<waitForElementVisible selector="{{AdminDesignConfigSection.saveConfiguration}}" stepKey="waitForSaveConfiguration"/>
126+
<click selector="{{AdminDesignConfigSection.saveConfiguration}}" stepKey="saveConfigSectionConfiguration"/>
127+
<waitForElementVisible selector="{{AdminDesignConfigSection.successNotification}}" stepKey="waitForConfigSectionSuccessNotification"/>
128+
<waitForPageLoad stepKey="waitForSuccessNotificationPageLoad"/>
136129
<!--Clear Cache-->
137-
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache4">
130+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfterDeleteImage">
138131
<argument name="tags" value=""/>
139132
</actionGroup>
140-
<!--Delete ImageFolder -->
141-
<comment userInput="Delete Image" stepKey="deleteImageComment"/>
133+
<!--Code Section To Delete ImageFolder-->
142134
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
143-
<comment userInput="BIC workaround" stepKey="navigateToFolder2"/>
135+
<!--Expand Media Gallery Folder-->
144136
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder2">
145137
<argument name="FolderName" value="Storage Root"/>
146138
</actionGroup>
147139
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
148140
<argument name="FolderName" value="wysiwyg"/>
149141
</actionGroup>
150-
<comment userInput="BIC workaround" stepKey="deleteImageFromStorage"/>
142+
<!--Delete Folder From Media Gallery-->
151143
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteFolderFromMediaGallery">
152144
<argument name="Image" value="{{ImageFolder.name}}"/>
153145
</actionGroup>

0 commit comments

Comments
 (0)