MAGETWO-92070: Automate MFTF

kieuphan2406 · kieuphan2406 · commit cad26250df00 · 2018-06-01T17:31:26.000-05:00
- Fixed review comments
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ActionGroup.xml
@@ -478,7 +478,7 @@
             <argument name="property" defaultValue=""/>
         </arguments>
         <waitForElement selector="{{PageBuilderActionsSection.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElement" />
-        <waitForElementVisible selector="{{PageBuilderActionsSection.editFormUploadedImageSource(property.section, property.fieldName, property.baseFileName, property.fileType)}}" stepKey="seeUploadedFile"/>
+        <waitForElementVisible selector="{{PageBuilderActionsSection.editFormUploadedImageSource(property.section, property.fieldName, property.fileName, property.fileType)}}" stepKey="seeUploadedFile"/>
     </actionGroup>
     <actionGroup name="seeNoImageUploadedOnSlideOut">
         <arguments>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ImageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ImageActionGroup.xml
@@ -9,7 +9,7 @@
               xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="addImageToStage">
         <arguments>
-            <argument name="property" defaultValue=""/>
+            <argument name="property"/>
         </arguments>
         <comment userInput="Attach image A to PageBuilder stage" stepKey="commentAttach"/>
         <attachFile userInput="{{property.value}}" selector="{{ImageOnStage.attachImageBtn}}" stepKey="attachImageFileOnStage"/>
@@ -19,8 +19,8 @@
     </actionGroup>
     <actionGroup name="verifyUploadImageButtons">
         <arguments>
-            <argument name="contentBlockType" defaultValue=""/>
-            <argument name="section" defaultValue=""/>
+            <argument name="contentBlockType"/>
+            <argument name="section"/>
         </arguments>
         <comment userInput="Hover uploaded image to check Upload New Image button and Select From Gallery button" stepKey="commentHover"/>
         <moveMouseOver selector="{{PageBuilderActionsSection.contentBlockInStage(contentBlockType.role)}}" x="10" y="0" stepKey="onMouseOverBannerContentBlockStage"/>
@@ -29,7 +29,7 @@
     </actionGroup>
     <actionGroup name="verifyImageOnSlideout">
         <arguments>
-            <argument name="property" defaultValue=""/>
+            <argument name="property"/>
         </arguments>
         <comment userInput="Verify image A display on preview of slide-out" stepKey="commentVerifyImage"/>
         <waitForElementVisible selector="{{ImageOnConfigurationPanel.imageName(property.value)}}" stepKey="seeImageNameOnPreview"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/RowActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/RowActionGroup.xml
@@ -57,7 +57,7 @@
         </arguments>
         <waitForElementVisible selector="{{page.base(index)}}" stepKey="waitForRow"/>
         <waitForElementVisible selector="{{page.backgroundColor(index, backgroundColor.rgb)}}" stepKey="waitForBackgroundColor"/>
-        <waitForElementVisible selector="{{page.backgroundImage(index, backgroundImage.baseFileName, backgroundImage.fileType)}}" stepKey="waitForBackgroundImage"/>
+        <waitForElementVisible selector="{{page.backgroundImage(index, backgroundImage.fileName, backgroundImage.fileType)}}" stepKey="waitForBackgroundImage"/>
         <waitForElementVisible selector="{{page.backgroundPosition(index, backgroundPosition.styleValue)}}" stepKey="waitForBackgroundPosition"/>
         <waitForElementVisible selector="{{page.backgroundSize(index, backgroundSize.value)}}" stepKey="waitForBackgroundSize"/>
         <waitForElementVisible selector="{{page.backgroundRepeat(index, backgroundRepeat.styleValue)}}" stepKey="waitForBackgroundRepeat"/>
@@ -76,7 +76,7 @@
         </arguments>
         <waitForElementVisible selector="{{page.base(index)}}" stepKey="waitForRow"/>
         <waitForElementVisible selector="{{page.backgroundColor(index, backgroundColor.rgb)}}" stepKey="waitForBackgroundColor"/>
-        <waitForElementVisible selector="{{page.parallaxBackgroundImage(index, backgroundImage.baseFileName, backgroundImage.fileType)}}" stepKey="waitForBackgroundImage"/>
+        <waitForElementVisible selector="{{page.parallaxBackgroundImage(index, backgroundImage.fileName, backgroundImage.fileType)}}" stepKey="waitForBackgroundImage"/>
         <waitForElementVisible selector="{{page.backgroundPosition(index, backgroundPosition.styleValue)}}" stepKey="waitForBackgroundPosition"/>
         <waitForElementVisible selector="{{page.backgroundSize(index, backgroundSize.value)}}" stepKey="waitForBackgroundSize"/>
         <waitForElementVisible selector="{{page.backgroundRepeat(index, backgroundRepeat.styleValue)}}" stepKey="waitForBackgroundRepeat"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/RowData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/RowData.xml
@@ -100,7 +100,7 @@
         <data key="section">background</data>
         <data key="fieldName">background_image</data>
         <data key="value">magento.jpg</data>
-        <data key="baseFileName">magento</data>
+        <data key="fileName">magento</data>
         <data key="fileType">jpg</data>
         <data key="path">wysiwyg/magento</data>
         <data key="url">/(\b(https?|ftp|file):\/\/)[-A-Za-z0-9+&amp;@#/%?=~_|!:,.;]+[-A-Za-z0-9+&amp;@#/%=~_|]/g</data>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/SlideData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/SlideData.xml
@@ -14,6 +14,16 @@
         <data key="fieldName">slide_name</data>
         <data key="value">Slide 1 Name</data>
     </entity>
+    <entity name="PageBuilderSliderBackgroundImageProperty" type="pagebuilder_background_image_property">
+        <data key="name">Background Image</data>
+        <data key="section">background</data>
+        <data key="fieldName">background_image</data>
+        <data key="value">magento.jpg</data>
+        <data key="fileName">magento</data>
+        <data key="fileType">jpg</data>
+        <data key="path">wysiwyg/magento</data>
+        <data key="url">/(\b(https?|ftp|file):\/\/)[-A-Za-z0-9+&amp;@#/%?=~_|!:,.;]+[-A-Za-z0-9+&amp;@#/%=~_|]/g</data>
+    </entity>
     <entity name="PageBuilderSlideMinHeight" type="pagebuilder_slide_property">
         <data key="name">Minimum Height</data>
         <data key="section">appearance_fieldset</data>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderActionsSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderActionsSection.xml
@@ -89,6 +89,9 @@
         <element name="editFormUploadedImage" type="button" selector="//div[@data-index='{{arg1}}']/descendant::*[@name='{{arg2}}']//..//..//img" parameterized="true"/>
         <element name="editFormNoUploadedImage" type="button" selector="//span[text()='{{arg1}}']//parent::label//following-sibling::div//p[text()='Browse to find or drag image here']" parameterized="true"/>
         <element name="editFormUploadedImageSource" type="button" selector="//div[@data-index='{{arg1}}']/descendant::*[@name='{{arg2}}']//..//..//img[contains(@src,'{{arg3}}') and contains(@src,'{{arg4}}')]" parameterized="true"/>
+        <element name="uploadLocalImageBtn" type="button" selector="//div[contains(@class,'pagebuilder-image-uploader-container')]//input[@name='background_image']"/>
+        <element name="uploadNewImageBtn" type="button" selector="//label[text()='Upload Image']" />
+        <element name="selectFromGalleryImageBtn" type="button" selector="//ul[contains(@class,'pagebuilder-options-links')]//label[text()='Select from Gallery']"/>
     </section>
     <section name="AdvancedForm">
         <element name="sectionName" type="button" selector="//div[@data-index='advanced']"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection.xml
@@ -102,9 +102,6 @@
         <element name="bannerBorderRadiusStyle" type="button" selector="div[style*='border-radius: {{arg1}}']" parameterized="true"/>
         <element name="editFormBackgroundImagePreview" type="button" selector="//input[@name='background_image']/ancestor::div[@class='admin__field-control']/descendant::img"/>
         <element name="editFormBackgroundMobileImagePreview" type="button" selector="//input[@name='mobile_image']/ancestor::div[@class='admin__field-control']/descendant::img"/>
-        <element name="uploadLocalImageBtn" type="button" selector="//div[contains(@class,'pagebuilder-image-uploader-container')]//input[@name='background_image']"/>
-        <element name="uploadNewImageBtn" type="button" selector="//label[text()='Upload Image']" />
-        <element name="selectFromGalleryImageBtn" type="button" selector="//ul[contains(@class,'pagebuilder-options-links')]//label[text()='Select from Gallery']"/>
     </section>
     <section name="BannerOnConfigurationPanel">
         <element name="tinyMCEIFrame" type="text" selector="pagebuilder_banner_form_message_ifr"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection.xml
@@ -186,10 +186,7 @@
         <element name="slideBorderRadiusStyle" type="button" selector="div[style*='border-radius: {{arg1}}']" parameterized="true"/>
         <element name="editFormBackgroundImagePreview" type="button" selector="//input[@name='background_image']/ancestor::div[@class='admin__field-control']/descendant::img"/>
         <element name="editFormBackgroundMobileImagePreview" type="button" selector="//input[@name='mobile_image']/ancestor::div[@class='admin__field-control']/descendant::img"/>
-        <element name="uploadLocalImageBtn" type="button" selector="//div[contains(@class,'pagebuilder-image-uploader-container')]//input[@name='background_image']"/>
         <element name="collageOverlay" type="button" selector=".pagebuilder-collage-overlay"/>
-        <element name="uploadNewImageBtn" type="button" selector="//label[text()='Upload Image']" />
-        <element name="selectFromGalleryImageBtn" type="button" selector="//ul[contains(@class,'pagebuilder-options-links')]//label[text()='Select from Gallery']"/>
     </section>
     <section name="SlideOnConfigurationPanel">
         <element name="tinyMCEIFrame" type="text" selector="pagebuilder_slide_form_content_ifr"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest.xml
@@ -982,7 +982,7 @@
     </test>
     <test name="BannerCanAddImageToBanner">
         <annotations>
-            <features value="Pagebuilder: Banner"/>
+            <features value="Pagebuilder"/>
             <stories value="MAGETWO-86533: [UI component] MediaGalleryImage: inside form"/>
             <title value="Add an image content block into banner"/>
             <description value="A user should be able to add an image into a banner."/>
@@ -1068,7 +1068,7 @@
     </test>
     <test name="AddImageToBannerStage">
         <annotations>
-            <features value="Pagebuilder: Banner"/>
+            <features value="Pagebuilder"/>
             <stories value="MAGETWO-75104: Add image into Slide, Banner from the Stage"/>
             <title value="Add image into Banner from the Stage"/>
             <description value="A user should be able to add image to Banner stage."/>
@@ -1080,8 +1080,6 @@
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-            <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
-            <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <createData entity="_defaultCmsPage" stepKey="createPreReqCMSPage" />
         </before>
         <after>
@@ -1099,14 +1097,14 @@
         </actionGroup>
         <!--Verify there are 2 buttons when hovering-->
         <comment userInput="Verify there are 2 buttons when hovering" stepKey="commentVerifyButtons" />
-        <moveMouseOver selector="{{PageBuilderActionsSection.contentBlockInStage(PageBuilderBannerContentBlock.role)}}" x="10" y="0" stepKey="onMouseOverBannerContentBlockStage"/>
+        <moveMouseOver selector="{{PageBuilderActionsSection.contentBlockInStage(PageBuilderBannerContentBlock.role)}}" stepKey="onMouseOverBannerContentBlockStage"/>
         <actionGroup ref="verifyUploadImageButtons" stepKey="verifyUploadImageButtons" >
             <argument name="contentBlockType" value="PageBuilderBannerContentBlock"/>
-            <argument name="section" value="BannerOnBackend"/>
+            <argument name="section" value="PageBuilderActionsSection"/>
         </actionGroup>
         <!--Upload image from local machine -->
         <comment userInput="Upload image from local machine" stepKey="commentUploadImageFromLocal" />
-        <attachFile userInput="{{PageBuilderLocalImagePropertyJpg.value}}" selector="{{BannerOnBackend.uploadLocalImageBtn}}" stepKey="attachImageFromLocalToStage"/>
+        <attachFile userInput="{{PageBuilderLocalImagePropertyJpg.value}}" selector="{{PageBuilderActionsSection.uploadLocalImageBtn}}" stepKey="attachImageFromLocalToStage"/>
         <seeElement selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderImagePropertyJpg.fileName)}}" stepKey="seeMainImageSource1"/>
         <!--Upload image from Media Gallery Storage -->
         <comment userInput="Upload image from Media Gallery Storage" stepKey="commentUploadImageFromStorage"/>
@@ -1117,30 +1115,30 @@
             <argument name="ImageFolder" value="ImageFolder"/>
         </actionGroup>
         <actionGroup ref="attachImage" stepKey="attachImageFile1">
-            <argument name="Image" value="PageBuilderImagePropertyJpg"/>
+            <argument name="Image" value="PageBuilderBannerBackgroundImageProperty"/>
         </actionGroup>
         <actionGroup ref="saveImage" stepKey="saveImage"/>
-        <seeElement selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderImagePropertyJpg.fileName)}}" stepKey="seeMainImageSource2"/>
+        <seeElement selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderBannerBackgroundImageProperty.fileName)}}" stepKey="seeMainImageSource2"/>
         <comment userInput="Go to Banner slide-out to verify uploaded image" stepKey="commentGoToBannerSlideOut"/>
         <!--Verify uploaded image is displayed on slide-out-->
         <comment userInput="Verify uploaded image is displayed on slide-out" stepKey="commentVerifyImageOnSlideout"/>
         <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
             <argument name="contentBlockType" value="PageBuilderBannerContentBlock"/>
         </actionGroup>
-        <seeElement selector="{{ImageOnConfigurationPanel.imageName(PageBuilderImagePropertyJpg.value)}}" stepKey="seeImageNameOnPreview2"/>
-        <seeElement selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderImagePropertyJpg.fileName)}}" stepKey="seeMainImageSource3"/>
+        <actionGroup ref="seeImageUploadedOnSlideOut" stepKey="seeImageOnSlideOut1">
+            <argument name="property" value="PageBuilderBannerBackgroundImageProperty"/>
+        </actionGroup>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
         <actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
         <!-- Validate Storefront -->
         <comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
-        <openNewTab stepKey="openNewTab"/>
         <amOnPage url="$$createPreReqCMSPage.identifier$$" stepKey="amOnCmsStorefront" />
         <waitForPageLoad stepKey="waitForPageLoad3" />
-        <seeElement selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderImagePropertyJpg.fileName)}}" stepKey="seeMainImageSourceOnFrontend"/>
+        <seeElement selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderBannerBackgroundImageProperty.fileName)}}" stepKey="seeMainImageSourceOnFrontend"/>
     </test>
     <test name="VerifyUploadImageOnBannerStageDependOnEachTypeOfAppearance">
         <annotations>
-            <features value="Pagebuilder: Banner"/>
+            <features value="Pagebuilder:"/>
             <stories value="MAGETWO-75104: Add image into Slide, Banner from the Stage"/>
             <title value="Add image into Banner from the Stage"/>
             <description value="A user should be able to add image to Banner stage when switching between appearance type"/>
@@ -1152,8 +1150,6 @@
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-            <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
-            <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <createData entity="_defaultCmsPage" stepKey="createPreReqCMSPage" />
         </before>
         <after>
@@ -1178,24 +1174,24 @@
         </actionGroup>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings1"/>
         <comment userInput="Verify there are 2 buttons when hovering" stepKey="commentVerifyButtons1" />
-        <moveMouseOver selector="{{PageBuilderActionsSection.contentBlockInStage(PageBuilderBannerContentBlock.role)}}" x="10" y="0" stepKey="onMouseOverBannerContentBlockStage1"/>
+        <moveMouseOver selector="{{PageBuilderActionsSection.contentBlockInStage(PageBuilderBannerContentBlock.role)}}" stepKey="onMouseOverBannerContentBlockStage1"/>
         <actionGroup ref="verifyUploadImageButtons" stepKey="verifyUploadImageButtons1" >
             <argument name="contentBlockType" value="PageBuilderBannerContentBlock"/>
-            <argument name="section" value="BannerOnBackend"/>
+            <argument name="section" value="PageBuilderActionsSection"/>
         </actionGroup>
         <!--Verify there are 2 buttons display when user select appearance Center-->
         <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
             <argument name="contentBlockType" value="PageBuilderBannerContentBlock"/>
         </actionGroup>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty2">
-            <argument name="property" value="PageBuilderSlideCollageCenteredProperty"/>
+            <argument name="property" value="PageBuilderBannerCollageCenteredProperty"/>
         </actionGroup>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
         <comment userInput="Verify there are 2 buttons when hovering" stepKey="commentVerifyButtons2" />
-        <moveMouseOver selector="{{PageBuilderActionsSection.contentBlockInStage(PageBuilderBannerContentBlock.role)}}" x="10" y="0" stepKey="onMouseOverBannerContentBlockStage2"/>
+        <moveMouseOver selector="{{PageBuilderActionsSection.contentBlockInStage(PageBuilderBannerContentBlock.role)}}" stepKey="onMouseOverBannerContentBlockStage2"/>
         <actionGroup ref="verifyUploadImageButtons" stepKey="verifyUploadImageButtons2" >
             <argument name="contentBlockType" value="PageBuilderBannerContentBlock"/>
-            <argument name="section" value="BannerOnBackend"/>
+            <argument name="section" value="PageBuilderActionsSection"/>
         </actionGroup>
         <!--Verify there are 2 buttons display when user select appearance Right-->
         <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage3">
@@ -1206,10 +1202,10 @@
         </actionGroup>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings3"/>
         <comment userInput="Verify there are 2 buttons when hovering" stepKey="commentVerifyButtons3" />
-        <moveMouseOver selector="{{PageBuilderActionsSection.contentBlockInStage(PageBuilderBannerContentBlock.role)}}" x="10" y="0" stepKey="onMouseOverBannerContentBlockStage3"/>
+        <moveMouseOver selector="{{PageBuilderActionsSection.contentBlockInStage(PageBuilderBannerContentBlock.role)}}" stepKey="onMouseOverBannerContentBlockStage3"/>
         <actionGroup ref="verifyUploadImageButtons" stepKey="verifyUploadImageButtons3" >
             <argument name="contentBlockType" value="PageBuilderBannerContentBlock"/>
-            <argument name="section" value="BannerOnBackend"/>
+            <argument name="section" value="PageBuilderActionsSection"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest.xml
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest.xml
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideCommonTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideCommonTest.xml
