Skip to content

Commit ffe0da0

Browse files
omiroshnichenkoomiroshnichenko
committed
Merge branch 'MC-21425' of github.com:magento-obsessive-owls/magento2-page-builder into PR
2 parents acc47e9 + 919f492 commit ffe0da0

12 files changed

+179
-1
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,13 @@
1717
<waitForElementVisible selector="{{ImageOnStageWithoutImageUploaded.imagePreview}}" stepKey="waitForImagePreview"/>
1818
<waitForElementVisible selector="{{ImageOnStageWithoutImageUploaded.imageSource(property.fileName)}}" stepKey="waitForImageSource"/>
1919
</actionGroup>
20+
<actionGroup name="AdminAddImageCMSBlock" extends="AdminAddImageToCMSBlockContent">
21+
<remove keyForRemoval="clickAddImageButton"/>
22+
<remove keyForRemoval="waitForBrowseImage"/>
23+
<remove keyForRemoval="clickBrowseImage"/>
24+
<remove keyForRemoval="waitForOkButton"/>
25+
<remove keyForRemoval="clickOk"/>
26+
</actionGroup>
2027
<actionGroup name="verifyImageOnSlideout">
2128
<arguments>
2229
<argument name="property"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Data/CmsConfigData.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<data key="row">row_cms_pagebuilder_google_maps_api_key</data>
1414
<data key="label">Google Maps API Key</data>
1515
<data key="default"/>
16-
<data key="valid">AIzaSyA7TbgpW4U9yKFNzJmHPwLUh_bWt9nXBl4</data>
16+
<data key="valid">Valid API Key tests are currently not running</data>
1717
<data key="invalidOneCharacter">a</data>
1818
<data key="invalidOneCharacterOffOfValid">aIzaSyA7TbgpW4U9yKFNzJmHPwLUh_bWt9nXBl4</data>
1919
<data key="empty"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Suite/PageBuilderRequiresValidGoogleMapsAPIKeySuite.xml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
9+
<suite name="PageBuilderRequiresValidGoogleMapsAPIKeySuite">
10+
<before>
11+
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
12+
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
13+
<magentoCLI command="config:set cms/wysiwyg/editor mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter" stepKey="enableTinyMCE4"/>
14+
<magentoCLI command="config:set cms/pagebuilder/google_maps_api_key ''" stepKey="setEmptyGoogleMapsAPIKey"/>
15+
<magentoCLI command="config:set web/default_layouts/default_cms_layout cms-full-width" stepKey="setPageBuilderDefaultCmsLayout"/>
16+
<magentoCLI command="config:set web/default_layouts/default_category_layout category-full-width" stepKey="setPageBuilderDefaultCategoryLayout"/>
17+
<magentoCLI command="config:set web/default_layouts/default_product_layout product-full-width" stepKey="setPageBuilderDefaultProductLayout"/>
18+
</before>
19+
<after>
20+
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
21+
<magentoCLI command="config:set cms/wysiwyg/editor mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter" stepKey="enableTinyMCE4"/>
22+
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
23+
<magentoCLI command="config:set cms/pagebuilder/google_maps_api_key ''" stepKey="setEmptyGoogleMapsAPIKey"/>
24+
</after>
25+
<include>
26+
<group name="pagebuilder-requiresValidMapAPIKey"/>
27+
</include>
28+
</suite>
29+
</suites>

‎app/code/Magento/PageBuilder/Test/Mftf/Suite/PageBuilderSuite.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,8 @@
2525
<include>
2626
<group name="pagebuilder"/>
2727
</include>
28+
<exclude>
29+
<group name="pagebuilder-requiresValidMapAPIKey"/>
30+
</exclude>
2831
</suite>
2932
</suites>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminMediaGalleryPopupUploadImagesWithoutErrorTest.xml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AdminMediaGalleryPopupUploadImagesWithoutErrorTest">
11+
<remove keyForRemoval="addImage"/>
12+
<remove keyForRemoval="clickShowHideBtnFirstTime"/>
13+
<remove keyForRemoval="clickShowHideBtnSecondTime"/>
14+
<remove keyForRemoval="waitForPageLoad"/>
15+
<remove keyForRemoval="switchToContentFrame"/>
16+
<remove keyForRemoval="clickImage"/>
17+
<remove keyForRemoval="switchBack"/>
18+
<remove keyForRemoval="addImageSecondTime"/>
19+
<remove keyForRemoval="switchToContentFrameSecondTime"/>
20+
<remove keyForRemoval="seeImageElement"/>
21+
<!--Add image into PageBuilder-->
22+
<comment userInput="Add image into PageBuilder" stepKey="addImageIntoPageBuilder"/>
23+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
24+
<argument name="contentType" value="PageBuilderImageContentType"/>
25+
</actionGroup>
26+
<actionGroup ref="dragContentTypeToStage" stepKey="dragImageIntoStage">
27+
<argument name="contentType" value="PageBuilderImageContentType"/>
28+
</actionGroup>
29+
<click selector="{{ImageOnStageWithoutImageUploaded.selectFromGalleryBtn}}" stepKey="clickSelectFormGallery"/>
30+
<actionGroup ref="AdminAddImageCMSBlock" stepKey="addFirstImageToStage">
31+
<argument name="image" value="PageBuilderImageProperty_PNG"/>
32+
</actionGroup>
33+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
34+
<seeElement selector="{{ImageOnStageWithoutImageUploaded.imageSource(PageBuilderImageProperty_PNG.fileName)}}" stepKey="seeFirstImageElement"/>
35+
<actionGroup ref="goToMediaStorageFromStage" stepKey="goToMediaStorageFromStage" >
36+
<argument name="contentType" value="PageBuilderImageContentType"/>
37+
<argument name="section" value="ImageOnStageWithoutImageUploaded"/>
38+
</actionGroup>
39+
<actionGroup ref="AdminAddImageCMSBlock" stepKey="addSecondImageToStage">
40+
<argument name="image" value="PageBuilderImageProperty_JPG"/>
41+
</actionGroup>
42+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingSecondMask"/>
43+
<seeElement selector="{{ImageOnStageWithoutImageUploaded.imageSource(PageBuilderImageProperty_JPG.fileName)}}" stepKey="seeSecondImageElement"/>
44+
</test>
45+
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTests.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2032,6 +2032,9 @@
20322032
<group value="pagebuilder-map"/>
20332033
<group value="pagebuilder-mapMapSettings"/>
20342034
<group value="pagebuilder-requiresValidMapAPIKey"/>
2035+
<skip>
2036+
<issueId value="MTS-657"/>
2037+
</skip>
20352038
</annotations>
20362039
<before>
20372040
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
<group value="pagebuilder"/>
2121
<group value="pagebuilder-map"/>
2222
<group value="pagebuilder-mapCommon"/>
23+
<group value="pagebuilder-requiresValidMapAPIKey"/>
24+
<skip>
25+
<issueId value="MTS-657"/>
26+
</skip>
2327
</annotations>
2428
<before>
2529
<magentoCLI command="config:set cms/pagebuilder/google_maps_api_key {{googleMapsAPIKey.valid}}" stepKey="setValidGoogleMapsAPIKey"/>
@@ -533,6 +537,9 @@
533537
<group value="pagebuilder-map"/>
534538
<group value="pagebuilder-mapCommon"/>
535539
<group value="pagebuilder-requiresValidMapAPIKey"/>
540+
<skip>
541+
<issueId value="MTS-657"/>
542+
</skip>
536543
</annotations>
537544
<before>
538545
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTests.xml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
<group value="pagebuilder-mapLocation"/>
2323
<group value="pagebuilder-mapLocationAttributes"/>
2424
<group value="pagebuilder-requiresValidMapAPIKey"/>
25+
<skip>
26+
<issueId value="MTS-657"/>
27+
</skip>
2528
</annotations>
2629
<before>
2730
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -220,6 +223,9 @@
220223
<group value="pagebuilder-mapLocation"/>
221224
<group value="pagebuilder-mapLocationAttributes"/>
222225
<group value="pagebuilder-requiresValidMapAPIKey"/>
226+
<skip>
227+
<issueId value="MTS-657"/>
228+
</skip>
223229
</annotations>
224230
<before>
225231
<magentoCLI command="config:set cms/pagebuilder/google_maps_api_key {{googleMapsAPIKey.valid}}" stepKey="setValidGoogleMapsAPIKey"/>
@@ -343,6 +349,9 @@
343349
<group value="pagebuilder-mapLocation"/>
344350
<group value="pagebuilder-mapLocationAttributes"/>
345351
<group value="pagebuilder-requiresValidMapAPIKey"/>
352+
<skip>
353+
<issueId value="MTS-657"/>
354+
</skip>
346355
</annotations>
347356
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterCoordinate">
348357
<argument name="property" value="PageBuilderMapLatitude_Positive39_74"/>
@@ -406,6 +415,9 @@
406415
<group value="pagebuilder-mapLocation"/>
407416
<group value="pagebuilder-mapLocationAttributes"/>
408417
<group value="pagebuilder-requiresValidMapAPIKey"/>
418+
<skip>
419+
<issueId value="MTS-657"/>
420+
</skip>
409421
</annotations>
410422
<before>
411423
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -601,6 +613,9 @@
601613
<group value="pagebuilder-mapLocation"/>
602614
<group value="pagebuilder-mapLocationAttributes"/>
603615
<group value="pagebuilder-requiresValidMapAPIKey"/>
616+
<skip>
617+
<issueId value="MTS-657"/>
618+
</skip>
604619
</annotations>
605620
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterPhoneNumber1">
606621
<argument name="property" value="PageBuilderMapStreetAddress_CommonCharacters"/>
@@ -669,6 +684,9 @@
669684
<group value="pagebuilder-mapLocation"/>
670685
<group value="pagebuilder-mapLocationAttributes"/>
671686
<group value="pagebuilder-requiresValidMapAPIKey"/>
687+
<skip>
688+
<issueId value="MTS-657"/>
689+
</skip>
672690
</annotations>
673691
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterPhoneNumber1">
674692
<argument name="property" value="PageBuilderMapCity_CommonCharacters"/>
@@ -737,6 +755,9 @@
737755
<group value="pagebuilder-mapLocation"/>
738756
<group value="pagebuilder-mapLocationAttributes"/>
739757
<group value="pagebuilder-requiresValidMapAPIKey"/>
758+
<skip>
759+
<issueId value="MTS-657"/>
760+
</skip>
740761
</annotations>
741762
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterPhoneNumber1">
742763
<argument name="property" value="PageBuilderMapState_CommonCharacters"/>
@@ -805,6 +826,9 @@
805826
<group value="pagebuilder-mapLocation"/>
806827
<group value="pagebuilder-mapLocationAttributes"/>
807828
<group value="pagebuilder-requiresValidMapAPIKey"/>
829+
<skip>
830+
<issueId value="MTS-657"/>
831+
</skip>
808832
</annotations>
809833
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterPhoneNumber1">
810834
<argument name="property" value="PageBuilderMapZipCode_CommonCharacters"/>
@@ -873,6 +897,9 @@
873897
<group value="pagebuilder-mapLocation"/>
874898
<group value="pagebuilder-mapLocationAttributes"/>
875899
<group value="pagebuilder-requiresValidMapAPIKey"/>
900+
<skip>
901+
<issueId value="MTS-657"/>
902+
</skip>
876903
</annotations>
877904
<before>
878905
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -966,6 +993,9 @@
966993
<group value="pagebuilder-mapLocation"/>
967994
<group value="pagebuilder-mapLocationAttributes"/>
968995
<group value="pagebuilder-requiresValidMapAPIKey"/>
996+
<skip>
997+
<issueId value="MTS-657"/>
998+
</skip>
969999
</annotations>
9701000
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterPhoneNumber1">
9711001
<argument name="property" value="PageBuilderMapComment_CommonCharacters"/>
@@ -1012,6 +1042,9 @@
10121042
<group value="pagebuilder-mapLocation"/>
10131043
<group value="pagebuilder-mapLocationAttributes"/>
10141044
<group value="pagebuilder-requiresValidMapAPIKey"/>
1045+
<skip>
1046+
<issueId value="MTS-657"/>
1047+
</skip>
10151048
</annotations>
10161049
<before>
10171050
<createData entity="_defaultCmsPage" stepKey="createCMSPage" />

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTests.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1409,6 +1409,9 @@
14091409
<group value="pagebuilder-map"/>
14101410
<group value="pagebuilder-mapLocation"/>
14111411
<group value="pagebuilder-requiresValidMapAPIKey"/>
1412+
<skip>
1413+
<issueId value="MTS-657"/>
1414+
</skip>
14121415
</annotations>
14131416
<before>
14141417
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapMapSettingsAttributesTest.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
<group value="pagebuilder-map"/>
2222
<group value="pagebuilder-mapMapSettings"/>
2323
<group value="pagebuilder-requiresValidMapAPIKey"/>
24+
<skip>
25+
<issueId value="MTS-657"/>
26+
</skip>
2427
</annotations>
2528
<before>
2629
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -205,6 +208,9 @@
205208
<group value="pagebuilder-map"/>
206209
<group value="pagebuilder-mapMapSettings"/>
207210
<group value="pagebuilder-requiresValidMapAPIKey"/>
211+
<skip>
212+
<issueId value="MTS-657"/>
213+
</skip>
208214
</annotations>
209215
<before>
210216
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>

0 commit comments

Comments
 (0)