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.

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

Delete tests images after tests execution #29285

Merged
merged 6 commits into from
Aug 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,11 @@
<waitForPageLoad stepKey="waitForPageLoad" />
<actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
<actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder">
<argument name="FolderName" value="Storage Root"/>
</actionGroup>
<actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
<argument name="ImageFolder" value="ImageFolder"/>
<argument name="ImageFolder" value="ImageFolder"/>
</actionGroup>
<actionGroup ref="AttachImageActionGroup" stepKey="attachImage1">
<argument name="Image" value="ImageUpload3"/>
Expand All @@ -50,6 +53,10 @@
<seeElement selector="{{StorefrontCategoryMainSection.mediaDescription(ImageUpload3.content)}}" stepKey="assertMediaDescription"/>
<seeElementInDOM selector="{{StorefrontCategoryMainSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSource"/>
<after>
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteCreatedFolder">
<argument name="ImageFolder" value="ImageFolder"/>
</actionGroup>
<actionGroup ref="DeleteCategoryActionGroup" stepKey="DeleteCategory">
<argument name="categoryEntity" value="SimpleSubCategory"/>
</actionGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
<magentoCLI command="config:set cms/wysiwyg/editor Magento_Tinymce3/tinymce3Adapter" stepKey="enableTinyMCE3"/>
</before>
<after>
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteCreatedFolder">
<argument name="ImageFolder" value="ImageFolder"/>
</actionGroup>
<!-- Switch WYSIWYG editor to TinyMCE4-->
<comment userInput="Reset editor as TinyMCE4" stepKey="chooseTinyMCE4AsEditor"/>
<magentoCLI command="config:set cms/wysiwyg/editor mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter" stepKey="enableTinyMCE4"/>
Expand All @@ -47,6 +51,9 @@
<click selector="{{MediaGallerySection.browseForImage}}" stepKey="clickBrowse"/>
<switchToIFrame stepKey="switchOutOfIFrame"/>
<waitForPageLoad stepKey="waitForPageToLoad" />
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder">
<argument name="FolderName" value="Storage Root"/>
</actionGroup>
<actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
<argument name="ImageFolder" value="ImageFolder"/>
</actionGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@
<waitForPageLoad stepKey="waitForPageLoad2" />
<actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
<actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder">
<argument name="FolderName" value="Storage Root"/>
</actionGroup>
<actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
<argument name="ImageFolder" value="ImageFolder"/>
</actionGroup>
Expand All @@ -56,6 +59,10 @@
<seeElement selector="{{StorefrontBlockSection.mediaDescription}}" stepKey="assertMediaDescription"/>
<seeElementInDOM selector="{{StorefrontBlockSection.imageSource(ImageUpload.fileName)}}" stepKey="assertMediaSource"/>
<after>
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteCreatedFolder">
<argument name="ImageFolder" value="ImageFolder"/>
</actionGroup>
<amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnEditPage"/>
<waitForPageLoad stepKey="waitForPageLoad"/>
<conditionalClick selector="{{CmsPagesPageActionsSection.clearAllButton}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,17 @@
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
<actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
</before>
<after>
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteCreatedFolder">
<argument name="ImageFolder" value="ImageFolder"/>
</actionGroup>
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYGFirst"/>
<deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
</after>

<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
<argument name="CMSPage" value="$$createCMSPage$$"/>
</actionGroup>
Expand All @@ -32,6 +43,9 @@
<waitForPageLoad stepKey="waitForPageLoad" />
<actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
<actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder">
<argument name="FolderName" value="Storage Root"/>
</actionGroup>
<actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
<argument name="ImageFolder" value="ImageFolder"/>
</actionGroup>
Expand All @@ -54,11 +68,5 @@
<waitForPageLoad stepKey="wait4"/>
<seeElement selector="{{StorefrontCMSPageSection.mediaDescription}}" stepKey="assertMediaDescription"/>
<seeElementInDOM selector="{{StorefrontCMSPageSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSource"/>
<after>
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYGFirst"/>
<deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
</after>
</test>
</tests>
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@
<waitForPageLoad stepKey="waitForPageLoad" />
<actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
<actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder">
<argument name="FolderName" value="Storage Root"/>
</actionGroup>
<actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
<argument name="ImageFolder" value="ImageFolder"/>
</actionGroup>
Expand All @@ -57,6 +60,10 @@
<seeElementInDOM selector="{{StorefrontNewsletterSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSource"/>
<closeTab stepKey="closeTab"/>
<after>
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteCreatedFolder">
<argument name="ImageFolder" value="ImageFolder"/>
</actionGroup>
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
</after>
Expand Down