Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit bce847d

Browse files
authored
Merge pull request #3067 from magento-pangolin/2.3-dev-pan-2.3.5
[Pangolin] MQE-1217: Deliver MFTF 2.3.5
2 parents 80af302 + 914a5d4 commit bce847d

File tree

4 files changed

+74
-61
lines changed

4 files changed

+74
-61
lines changed

app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWYSIWYGActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<amOnPage url="admin/admin/system_config/edit/section/cms/" stepKey="navigateToConfigurationPage" />
2424
<waitForPageLoad stepKey="wait3"/>
2525
<conditionalClick stepKey="expandWYSIWYGOptions" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
26-
<waitForElementVisible selector="{{ContentManagementSection.EnableWYSIWYG}}" stepKey="waitForEnableWYSIWYGDropdown2" />
26+
<waitForElementVisible selector="{{ContentManagementSection.EnableWYSIWYG}}" stepKey="waitForEnableWYSIWYGDropdown2" time="30"/>
2727
<uncheckOption selector="{{ContentManagementSection.EnableSystemValue}}" stepKey="uncheckUseSystemValue"/>
2828
<selectOption selector="{{ContentManagementSection.EnableWYSIWYG}}" userInput="Disabled Completely" stepKey="selectOption2"/>
2929
<click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions" />

app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/ConfigurableProductAttributeNameDesignActionGroup.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,26 +69,31 @@
6969

7070
<!--Add option 1 to attribute-->
7171
<click selector="{{NewProduct.addOptionButton}}" stepKey="clickAddOption1"/>
72+
<waitForPageLoad stepKey="waitForOption1"/>
7273
<fillField stepKey="fillInAdminFieldRed" selector="{{NewProduct.adminFieldRed}}" userInput="{{NewProductsData.adminFieldRed}}"/>
7374
<fillField stepKey="fillInDefaultStoreViewFieldRed" selector="{{NewProduct.defaultStoreViewFieldRed}}" userInput="{{NewProductsData.defaultStoreViewFieldRed}}"/>
7475

7576
<!--Add option 2 to attribute-->
7677
<click selector="{{NewProduct.addOptionButton}}" stepKey="clickAddOption2"/>
78+
<waitForPageLoad stepKey="waitForOption2"/>
7779
<fillField stepKey="fillInAdminFieldBlue" selector="{{NewProduct.adminFieldBlue}}" userInput="{{NewProductsData.adminFieldBlue}}"/>
7880
<fillField stepKey="fillInDefaultStoreViewFieldBlue" selector="{{NewProduct.defaultStoreViewFieldBlue}}" userInput="{{NewProductsData.defaultStoreViewFieldBlue}}"/>
7981

8082
<!--Add option 3 to attribute-->
8183
<click selector="{{NewProduct.addOptionButton}}" stepKey="clickAddOption3"/>
84+
<waitForPageLoad stepKey="waitForOption3"/>
8285
<fillField stepKey="fillInAdminFieldYellow" selector="{{NewProduct.adminFieldYellow}}" userInput="{{NewProductsData.adminFieldYellow}}"/>
8386
<fillField stepKey="fillInDefaultStoreViewFieldYellow" selector="{{NewProduct.defaultStoreViewFieldYellow}}" userInput="{{NewProductsData.defaultStoreViewFieldYellow}}"/>
8487

8588
<!--Add option 4 to attribute-->
8689
<click selector="{{NewProduct.addOptionButton}}" stepKey="clickAddOption4"/>
90+
<waitForPageLoad stepKey="waitForOption4"/>
8791
<fillField stepKey="fillInAdminFieldGreen" selector="{{NewProduct.adminFieldGreen}}" userInput="{{NewProductsData.adminFieldGreen}}"/>
8892
<fillField stepKey="fillInDefaultStoreViewFieldGreen" selector="{{NewProduct.defaultStoreViewFieldGreen}}" userInput="{{NewProductsData.defaultStoreViewFieldGreen}}"/>
8993

9094
<!--Add option 5 to attribute-->
9195
<click selector="{{NewProduct.addOptionButton}}" stepKey="clickAddOption5"/>
96+
<waitForPageLoad stepKey="waitForOption5"/>
9297
<fillField stepKey="fillInAdminFieldBlack" selector="{{NewProduct.adminFieldBlack}}" userInput="{{NewProductsData.adminFieldBlack}}"/>
9398
<fillField stepKey="fillInDefaultStoreViewFieldBlack" selector="{{NewProduct.defaultStoreViewFieldBlack}}" userInput="{{NewProductsData.defaultStoreViewFieldBlack}}"/>
9499

@@ -135,6 +140,7 @@
135140

136141
<!--Click on Stores item-->
137142
<click stepKey="clickOnStoresItem" selector="{{CatalogProductsSection.storesItem}}"/>
143+
<waitForPageLoad stepKey="waitForNavigationPanel"/>
138144

139145
<!--Click on Products item-->
140146
<waitForElementVisible selector="{{CatalogProductsSection.storesProductItem}}" stepKey="waitForCatalogLoad"/>

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"zendframework/zend-view": "~2.10.0"
8383
},
8484
"require-dev": {
85-
"magento/magento2-functional-testing-framework": "2.3.4",
85+
"magento/magento2-functional-testing-framework": "2.3.5",
8686
"friendsofphp/php-cs-fixer": "~2.12.0",
8787
"lusitanian/oauth": "~0.8.10",
8888
"pdepend/pdepend": "2.5.2",

0 commit comments

Comments
 (0)