Skip to content

Commit deb8957

Browse files
committed
MQE-824: Complete Regression Test (from release branch)
- fix merged test code and formattgin - update env.example, remove sample block
1 parent 50aa4b6 commit deb8957

File tree

5 files changed

+8
-36
lines changed

5 files changed

+8
-36
lines changed

dev/tests/acceptance/.env.example

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,6 @@
11
#Copyright © Magento, Inc. All rights reserved.
22
#See COPYING.txt for license details.
33

4-
#*** Start of example .env ***#
5-
#
6-
# MAGENTO_BASE_URL=http://127.0.0.1:32772/
7-
#
8-
# MAGENTO_BACKEND_NAME=admin
9-
# MAGENTO_ADMIN_USERNAME=admin
10-
# MAGENTO_ADMIN_PASSWORD=123123q
11-
#
12-
# MAGENTO_CLI_COMMAND_PATH=dev/tests/functional/utils/command.php
13-
# MAGENTO_CLI_COMMAND_PARAMETER=command
14-
#
15-
# SELENIUM_HOST=127.0.0.1
16-
# SELENIUM_PORT=4444
17-
# SELENIUM_PROTOCOL=http
18-
# SELENIUM_PATH=/wd/hub
19-
#
20-
# MAGENTO_RESTAPI_SERVER_HOST=127.0.0.1
21-
# MAGENTO_RESTAPI_SERVER_PORT=32769
22-
#
23-
# TESTS_BP=/Users/First_Last/GitHub/magento2ce/dev/tests/acceptance/tests/functional
24-
# FW_BP=/Users/First_Last/GitHub/magento2-functional-testing-framework
25-
# TESTS_MODULE_PATH=/Users/First_Last/GitHub/magento2ce/dev/tests/acceptance/tests/functional/Magento/FunctionalTest
26-
# MODULE_WHITELIST=Magento_NewModule
27-
#
28-
#*** End of example .env ***#
29-
30-
31-
#*** Start of .env ***#
32-
334
#*** Set the base URL for your Magento instance ***#
345
MAGENTO_BASE_URL=
356

@@ -63,4 +34,4 @@ MODULE_WHITELIST=Magento_Framework,Magento_ConfigurableProductWishlist,Magento_C
6334

6435
#*** Bool property which allows the user to toggle debug output during test execution
6536
#MFTF_DEBUG=
66-
#*** End of .env ***#
37+
#*** End of .env ***#

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
2424
<actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
2525
</before>
26-
<amOnPage url="{{AdminProductCreatePage(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToProduct"/>
26+
<amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToProduct"/>
2727
<waitForPageLoad stepKey="wait"/>
2828
<scrollTo selector="{{AdminProductFormSection.productQuantity}}" stepKey="scrollToQty" />
2929
<click selector="{{AdminProductFormSection.contentTab}}" stepKey="clickContentTab" />
@@ -62,7 +62,7 @@
6262
<actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
6363
<actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
6464
</before>
65-
<amOnPage url="{{AdminProductCreatePage(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToProduct"/>
65+
<amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToProduct"/>
6666
<waitForPageLoad stepKey="wait"/>
6767
<scrollTo selector="{{AdminProductFormSection.productQuantity}}" stepKey="scrollToQty" />
6868
<click selector="{{AdminProductFormSection.contentTab}}" stepKey="clickContentTab" />

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/EndToEndB2CGuestUserTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@
6666
<assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$searchGrabSimpleProduct2ImageSrc" stepKey="searchAssertSimpleProduct2ImageNotDefault" after="searchGrabSimpleProduct2ImageSrc"/>
6767

6868
<!-- Quick Search with non-existent product name -->
69-
<comment userInput="Quick Search with non-existent product name" stepKey="commentQuickSearchWithNon-existentProductName" after="searchAssertSimpleProduct2ImageNotDefault" />
70-
<actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchFillQuickSearchNonExistent" after="commentQuickSearchWithNon-existentProductName">
69+
<comment userInput="Quick Search with non-existent product name" stepKey="commentQuickSearchWithNonExistentProductName" after="searchAssertSimpleProduct2ImageNotDefault" />
70+
<actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchFillQuickSearchNonExistent" after="commentQuickSearchWithNonExistentProductName">
7171
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
7272
<argument name="phrase" value="CONST.nonexistentProductName"/>
7373
</actionGroup>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@
6666
<assertNotRegExp expected="'/placeholder\/small_image\.jpg/'" actual="$searchGrabSimpleProduct2ImageSrc" stepKey="searchAssertSimpleProduct2ImageNotDefault" after="searchGrabSimpleProduct2ImageSrc"/>
6767

6868
<!-- Quick Search with non-existent product name -->
69-
<comment userInput="Quick Search with non-existent product name" stepKey="commentQuickSearchWithNon-existentProductName" after="searchAssertSimpleProduct2ImageNotDefault" />
70-
<actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchFillQuickSearchNonExistent" after="commentQuickSearchWithNon-existentProductName">
69+
<comment userInput="Quick Search with non-existent product name" stepKey="commentQuickSearchWithNonExistentProductName" after="searchAssertSimpleProduct2ImageNotDefault" />
70+
<actionGroup ref="StorefrontCheckQuickSearchActionGroup" stepKey="searchFillQuickSearchNonExistent" after="commentQuickSearchWithNonExistentProductName">
7171
<!-- @TODO: Change to scalar value after MQE-498 is implemented -->
7272
<argument name="phrase" value="CONST.nonexistentProductName"/>
7373
</actionGroup>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/SwitcherActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="SwitchToVersion4ActionGroup">
1212
<amOnPage url="{{ConfigurationStoresPage.url}}" stepKey="navigateToWYSIWYGConfigPage1"/>
13+
<waitForPageLoad stepKey="waitForConfigPageToLoad"/>
1314
<conditionalClick stepKey="expandWYSIWYGOptions" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
1415
<waitForElementVisible selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="waitForCheckbox" />
1516
<uncheckOption selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="uncheckUseSystemValue"/>

0 commit comments

Comments
 (0)