Skip to content

MFTF: Replace redundant Action Group with proper one - magento/module-page-cache #25817

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Dec 20, 2019
Merged

MFTF: Replace redundant Action Group with proper one - magento/module-page-cache #25817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f77414
REFACTOR: Replace redundant Action Group with the same one
lbajsarowicz Nov 28, 2019
76f310f
BACKWARD COMPATIBILITY: Deprecated ActionGroups to make change Backwa…
lbajsarowicz Dec 4, 2019
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
15 changes: 1 addition & 14 deletions app/code/Magento/PageCache/Test/Mftf/ActionGroup/ClearCacheActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,10 @@
<annotations>
<description>Goes to the Admin Cache Management page. Clicks on 'Flush Magento Cache'.</description>
</annotations>

<amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}/admin/cache/" stepKey="goToNewCustomVarialePage"/>
<waitForPageLoad stepKey="waitForPageLoad"/>
<click selector="{{AdminCacheManagementSection.FlushMagentoCache}}" stepKey="clickFlushMagentoCache"/>
<waitForPageLoad stepKey="waitForCacheFlush"/>
</actionGroup>

<actionGroup name="clearPageCache">
<annotations>
<description>Goes to the Admin Cache Management page. Selects 'Refresh'. Checks the 'Page Cache' row. Clicks on Submit.</description>
</annotations>

<amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}/admin/cache/" stepKey="amOnCacheManagementPage"/>
<waitForPageLoad stepKey="waitForCacheManagement"/>
<selectOption selector="{{AdminCacheManagementSection.massActionSelect}}" userInput="refresh" stepKey="selectRefresh"/>
<click selector="{{AdminCacheManagementSection.pageCacheCheckbox}}" stepKey="selectPageCache"/>
<click selector="{{AdminCacheManagementSection.massActionSubmit}}" stepKey="submitCacheForm"/>
<waitForPageLoad stepKey="waitForCacheFlush"/>
</actionGroup>
</actionGroups>
28 changes: 28 additions & 0 deletions app/code/Magento/PageCache/Test/Mftf/ActionGroup/_Deprecated_ActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<!--
NOTICE: Action Groups in this file are DEPRECATED and SHOULD NOT BE USED anymore.
Please find the Comment with proper replacement for each of ActionGroups provided.
-->
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="clearPageCache">
<annotations>
<description>Goes to the Admin Cache Management page. Selects 'Refresh'. Checks the 'Page Cache' row. Clicks on Submit.</description>
</annotations>

<!-- NOTICE: This ActionGroup is DEPRECATED! Use `ClearPageCacheActionGroup` instead -->
<amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}/admin/cache/" stepKey="amOnCacheManagementPage"/>
<waitForPageLoad stepKey="waitForCacheManagement"/>
<selectOption selector="{{AdminCacheManagementSection.massActionSelect}}" userInput="refresh" stepKey="selectRefresh"/>
<click selector="{{AdminCacheManagementSection.pageCacheCheckbox}}" stepKey="selectPageCache"/>
<click selector="{{AdminCacheManagementSection.massActionSubmit}}" stepKey="submitCacheForm"/>
<waitForPageLoad stepKey="waitForCacheFlush"/>
</actionGroup>
</actionGroups>
14 changes: 7 additions & 7 deletions app/code/Magento/PageCache/Test/Mftf/Test/NewProductsListWidgetTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
<test name="NewProductsListWidgetSimpleProductTest">
<actionGroup ref="clearPageCache" stepKey="clearPageCache" before="amOnCmsPage"/>
<actionGroup ref="ClearPageCacheActionGroup" stepKey="clearPageCache" before="amOnCmsPage"/>
</test>
<test name="NewProductsListWidgetConfigurableProductTest">
<actionGroup ref="clearPageCache" stepKey="clearPageCache" after="clickSaveProduct"/>
<actionGroup ref="ClearPageCacheActionGroup" stepKey="clearPageCache" after="clickSaveProduct"/>
</test>
<test name="NewProductsListWidgetGroupedProductTest">
<actionGroup ref="clearPageCache" stepKey="clearPageCache" after="clickSaveProduct"/>
<actionGroup ref="ClearPageCacheActionGroup" stepKey="clearPageCache" after="clickSaveProduct"/>
</test>
<test name="NewProductsListWidgetVirtualProductTest">
<actionGroup ref="clearPageCache" stepKey="clearPageCache" before="amOnCmsPage"/>
<actionGroup ref="ClearPageCacheActionGroup" stepKey="clearPageCache" before="amOnCmsPage"/>
</test>
<test name="NewProductsListWidgetBundleProductTest">
<actionGroup ref="clearPageCache" stepKey="clearPageCache" after="clickSaveProduct"/>
<actionGroup ref="ClearPageCacheActionGroup" stepKey="clearPageCache" after="clickSaveProduct"/>
</test>
<test name="NewProductsListWidgetDownloadableProductTest">
<actionGroup ref="clearPageCache" stepKey="clearPageCache" after="clickSaveProduct"/>
<actionGroup ref="ClearPageCacheActionGroup" stepKey="clearPageCache" after="clickSaveProduct"/>
</test>
</tests>
</tests>