Merge pull request #9426 from magento-gl/functiona-tests-mainline-dep…

…loyment-1 [Bengals] Functional Tests Mainline Deployment
magento · Dec 28, 2024 · 2990f74 · 2990f74
2 parents 9335934 + 8dd4612
commit 2990f74
Show file tree

Hide file tree

Showing 7 changed files with 128 additions and 44 deletions.
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminVerifyCmsPageSelectMenuActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminVerifyCmsPageSelectMenuActionGroup.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright 2024 Adobe
+  * All Rights Reserved.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminVerifyCmsPageSelectMenuActionGroup">
+        <arguments>
+            <argument name="pageName" type="string" defaultValue="404 Not Found"/>
+        </arguments>
+        <annotations>
+            <description>Goes to Admin CMS Page grid page. Validates that all of the select menu options are present.</description>
+        </annotations>
+        <waitForElementVisible selector="{{CmsPagesPageActionsSection.select('pageName')}}" stepKey="waitForCMSPageListItem" />
+        <click selector="{{CmsPagesPageActionsSection.select('pageName')}}" stepKey="clickSelect" />
+        <waitForElementVisible selector="{{CmsPagesPageActionsSection.edit('pageName')}}" stepKey="waitForEditLink" />
+        <waitForElementVisible selector="{{CmsPagesPageActionsSection.preview('pageName')}}" stepKey="waitForPreviewLink" />
+        <waitForElementVisible selector="{{CmsPagesPageActionsSection.delete('pageName')}}" stepKey="waitForDeleteLink" />
+    </actionGroup>
+</actionGroups>
diff --git a/...agento/Cms/Test/Mftf/ActionGroup/AdminVerifyWYSIWYGEditorAndTinyMCEButtonsActionGroup.xml b/...agento/Cms/Test/Mftf/ActionGroup/AdminVerifyWYSIWYGEditorAndTinyMCEButtonsActionGroup.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright 2024 Adobe
+  * All Rights Reserved.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminVerifyWYSIWYGEditorAndTinyMCEButtonsActionGroup">
+        <annotations>
+            <description>Goes to Admin CMS Page creation page. Validates that all of the Tiny MCE buttons are present.</description>
+        </annotations>
+        <waitForElementVisible selector="{{TinyMCESection.TinyMCE}}" stepKey="waitForTinyMCE"/>
+        <click selector="{{TinyMCESection.ShowHideBtn}}" stepKey="clickShowHideBtn" />
+        <waitForElementNotVisible selector="{{TinyMCESection.TinyMCE}}" stepKey="tinyMCENotAvailable"/>
+        <waitForElementVisible selector="{{TinyMCESection.InsertWidgetBtn}}" stepKey="waitForInsertWidget"/>
+        <waitForElementVisible selector="{{TinyMCESection.InsertImageBtn}}" stepKey="waitForInsertImage"/>
+        <waitForElementVisible selector="{{TinyMCESection.InsertVariableBtn}}" stepKey="waitForInsertVariable"/>
+    </actionGroup>
+</actionGroups>
diff --git a/...nto/Cms/Test/Mftf/Test/AdminVerifyWYSIWYGEditorAndTinyMCEButtonsAcrossBrowserTabsTest.xml b/...nto/Cms/Test/Mftf/Test/AdminVerifyWYSIWYGEditorAndTinyMCEButtonsAcrossBrowserTabsTest.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright 2024 Adobe
+  * All Rights Reserved.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminVerifyWYSIWYGEditorAndTinyMCEButtonsAcrossBrowserTabsTest">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="404 Not Found Page"/>
+            <title value="WYSIWYG is presented for content if page for edit is opened in new browser tab"/>
+            <description value="Testcase verifie WYSIWYG editor and tiny mce buttons for 404 not found page on browser tabs"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="AC-4119" />
+        </annotations>
+        <before>
+            <!-- Enable WYSIWYG editor -->
+            <actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
+            <!-- Enable TinyMCE  -->
+            <actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminDisableWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminOpenCMSPagesGridActionGroup" stepKey="navigateToCmsPageGrid"/>
+        <actionGroup ref="AdminVerifyCmsPageSelectMenuActionGroup" stepKey="verify404NotFoundPageSelectMenu"/>
+        <click selector="{{CmsPagesPageActionsSection.edit('404 Not Found')}}" stepKey="clickEdit" />
+        <openNewTab stepKey="openNewTab"/>
+        <!--Open created cms page-->
+        <actionGroup ref="AdminOpenCmsPageActionGroup" stepKey="openEditPage">
+            <argument name="page_id" value="1"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForCMSPage"/>
+        <switchToPreviousTab stepKey="switchToPreviousTab"/>
+        <waitForPageLoad stepKey="waitForCMSPageToLoad"/>
+        <conditionalClick selector="{{CmsNewPagePageContentSection.header}}" dependentSelector="{{CmsNewPagePageContentSection.contentHeading}}" visible="false" stepKey="expandContentTabIfCollapsed"/>
+        <actionGroup ref="AdminVerifyWYSIWYGEditorAndTinyMCEButtonsActionGroup" stepKey="verifyWYSIWYGEditorAndButtonsPresentInCurrentTab"/>
+        <switchToNextTab stepKey="switchToNextTab"/>
+        <conditionalClick selector="{{CmsNewPagePageContentSection.header}}" dependentSelector="{{CmsNewPagePageContentSection.contentHeading}}" visible="false" stepKey="againExpandContentTabIfCollapsed"/>
+        <actionGroup ref="AdminVerifyWYSIWYGEditorAndTinyMCEButtonsActionGroup" stepKey="verifyWYSIWYGEditorAndButtonsPresentInAnotherTab"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Dhl/Test/Mftf/Test/AdminReorderPlacedUsingDHLAPShippingMethodTest.xml b/app/code/Magento/Dhl/Test/Mftf/Test/AdminReorderPlacedUsingDHLAPShippingMethodTest.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright 2024 Adobe
+  * All Rights Reserved.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminReorderPlacedUsingDHLAPShippingMethodTest" extends="StorefrontRegisteredCustomerUsesDHLAPOnlineShippingCarrierOnCheckoutTest">
+        <annotations>
+            <stories value="Admin Reorder with DHL Shipping method"/>
+            <title value="Reorder placed order using DHL in admin panel"/>
+            <description value="Reorder in admin panel order placed using DHL (AP) as a shipping method"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="AC-4802"/>
+            <group value="pr_exclude"/>
+            <group value="3rd_party_integration"/>
+        </annotations>
+        <remove keyForRemoval="selectExpressWorldWide"/>
+        <click selector="{{CheckoutCartSummarySection.shippingMethods('Express easy')}}"  after="verifyMedicalExpressIsAvailable" stepKey="selectExpressEasy"/>
+        <actionGroup ref="AdminOrderGridClickFirstRowActionGroup" stepKey="clickOrderRow"/>
+        <actionGroup ref="AdminStartReorderFromOrderPageActionGroup" stepKey="startReorder"/>
+        <!--select Check/Money order payment method-->
+        <scrollTo selector="{{AdminOrderFormPaymentSection.DHLShipping('Express easy')}}" stepKey="scrollToDHLShippingMethod"/>
+        <waitForText selector="{{AdminOrderFormPaymentSection.DHLShipping('Express easy')}}" userInput="Express easy" stepKey="verifyDHLShippingMethodIsSelected"/>
+        <waitForText selector="{{AdminOrderFormPaymentSection.verifyCheckMoneyPayment}}" userInput="Check / Money order" stepKey="verifyCheckMoneyOrderIsSelected"/>
+        <actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>
+        <actionGroup ref="AdminOrderViewCheckStatusActionGroup" stepKey="seeAdminOrderStatusIsPending"/>
+        <waitForText selector="{{AdminOrderFormPaymentSection.shippingMethodName('DHL - Express easy')}}" userInput="DHL - Express easy" stepKey="verifyShippingAndHandlingInformationInOrderPage"/>
+    </test>
+</tests>
diff --git a/...to/Directory/Test/Mftf/Test/UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml b/...to/Directory/Test/Mftf/Test/UpdateCurrencyRateForQuotesInStatusesOrderedAndClosedTest.xml
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml
@@ -35,5 +35,8 @@
         <element name="selectPaymentMethod" type="radio" selector="//div[@id='order-billing_method_form']//input[@title='Check / Money order']"/>
         <element name="checkMoneyOrderText" type="text" selector="//div[@id='order-billing_method_form']//dl//dt//label[contains(text(),'Check / Money order')]"/>
         <element name="upsOption" type="radio" selector="//label[contains(text(),'UPS Worldwide Expedited -')]//ancestor::label[@class='admin__field-label']"/>
+        <element name="DHLShipping" type="text" selector="//dd[@class='admin__order-shipment-methods-options' and contains(text(),'{{paymentMethodName}}')]" parameterized="true"/>
+        <element name="shippingMethodName" type="text" selector="//*[contains(text(), '{{paymentMethodName}}')]" parameterized="true"/>
+        <element name="verifyCheckMoneyPayment" type="text" selector="//label[@for='p_method_checkmo']"/>
     </section>
 </sections>
diff --git a/composer.json b/composer.json
@@ -401,3 +401,4 @@
     },
     "prefer-stable": true
 }
+