Skip to content

Commit 76f5c10

Browse files
adifucanadifucan
committed
Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-73136
2 parents ea0d793 + e669d9d commit 76f5c10

27 files changed

+266
-104
lines changed

‎dev/tests/acceptance/tests/_data/magento3.jpg

30.1 KB
Loading

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductData.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,6 @@
107107
<data key="price">1.00</data>
108108
<data key="file_type">Upload File</data>
109109
<data key="shareable">Yes</data>
110-
<data key="file">logo.png</data>
110+
<data key="file">magento-logo.png</data>
111111
</entity>
112112
</entities>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryMainSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@
1616
<element name="productCount" type="text" selector="#toolbar-amount"/>
1717
<element name="CatalogDescription" type="text" selector="//div[@class='category-description']//p"/>
1818
<element name="mediaDescription" type="text" selector="img[alt='{{var1}}']" parameterized="true"/>
19+
<element name="ImageSource" type="text" selector="//img[contains(@src,'{{var1}}') and not(contains(@src,'{{var2}}/'))]" parameterized="true"/>
1920
</section>
2021
</sections>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageToWYSIWYGCatalogCest.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
<description value="Admin should be able to add image to WYSIWYG Editor on Catalog Page"/>
2222
<severity value="CRITICAL"/>
2323
<testCaseId value="MAGETWO-84373"/>
24+
<!--Skip because of issue MAGETWO-88266-->
25+
<group value="skip"/>
2426
</annotations>
2527
<amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToNewCatalog"/>
2628
<waitForPageLoad stepKey="wait1"/>
@@ -37,18 +39,19 @@
3739
<argument name="ImageFolder" value="ImageFolder"/>
3840
</actionGroup>
3941
<actionGroup ref="attachImage" stepKey="attachImage1">
40-
<argument name="Image" value="ImageUpload"/>
42+
<argument name="Image" value="ImageUpload3"/>
4143
</actionGroup>
4244
<actionGroup ref="deleteImage" stepKey="deleteImage"/>
4345
<actionGroup ref="attachImage" stepKey="attachImage2">
44-
<argument name="Image" value="ImageUpload"/>
46+
<argument name="Image" value="ImageUpload3"/>
4547
</actionGroup>
4648
<actionGroup ref="saveImage" stepKey="insertImage"/>
4749
<actionGroup ref="fillOutUploadImagePopup" stepKey="fillOutUploadImagePopup" />
4850
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCatalog"/>
4951
<amOnPage url="/{{SimpleSubCategory.name_lwr}}.html" stepKey="goToCategoryFrontPage"/>
5052
<waitForPageLoad stepKey="waitForPageLoad2"/>
51-
<seeElement selector="{{StorefrontCategoryMainSection.mediaDescription(ImageUpload.content)}}" stepKey="assertMediaDescription"/>
53+
<seeElement selector="{{StorefrontCategoryMainSection.mediaDescription(ImageUpload3.content)}}" stepKey="assertMediaDescription"/>
54+
<seeElementInDOM selector="{{StorefrontCategoryMainSection.ImageSource(ImageUpload3.fileName,ImageUpload3.extension)}}" stepKey="assertMediaSource"/>
5255
<after>
5356
<actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
5457
<actionGroup ref="logout" stepKey="logout"/>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageToWYSIWYGProductCest.xml

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
<description value="Admin should be able to add image to WYSIWYG Editor on Product Page"/>
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-84375"/>
19+
<!--Skip because of issue MAGETWO-88266-->
20+
<group value="skip"/>
1921
</annotations>
2022
<before>
2123
<actionGroup ref="LoginActionGroup" stepKey="login"/>
@@ -49,24 +51,24 @@
4951
<waitForText userInput="{{ImageFolder.name}}" stepKey="waitForNewFolder1" />
5052
<click userInput="{{ImageFolder.name}}" stepKey="clickOnCreatedFolder1" />
5153
<waitForLoadingMaskToDisappear stepKey="waitForLoading4" />
52-
<attachFile selector="{{ProductDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload.file}}" stepKey="uploadImage1"/>
54+
<attachFile selector="{{ProductDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload1.value}}" stepKey="uploadImage1"/>
5355
<waitForLoadingMaskToDisappear stepKey="waitForLoading5" />
54-
<waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload.file)}}" stepKey="waitForUploadImage1" />
55-
<seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.imageSelected(ImageUpload.file)}}" stepKey="seeImageSelected1" />
56+
<waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload1.value)}}" stepKey="waitForUploadImage1" />
57+
<seeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.imageSelected(ImageUpload1.value)}}" stepKey="seeImageSelected1" />
5658
<see selector="{{ProductDescriptionWYSIWYGToolbarSection.DeleteSelectedBtn}}" userInput="Delete Selected" stepKey="seeDeleteBtn1"/>
5759
<click selector="{{ProductDescriptionWYSIWYGToolbarSection.DeleteSelectedBtn}}" stepKey="clickDeleteSelected1" />
5860
<waitForText userInput="OK" stepKey="waitForConfirm1" />
5961
<click selector="{{ProductDescriptionWYSIWYGToolbarSection.confirmDelete}}" stepKey="confirmDelete1" />
60-
<waitForElementNotVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload.file)}}" stepKey="waitForImageDeleted1" />
61-
<dontSeeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload.file)}}" stepKey="dontSeeImage1" />
62-
<attachFile selector="{{ProductDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload.file}}" stepKey="uploadImage2"/>
62+
<waitForElementNotVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload1.value)}}" stepKey="waitForImageDeleted1" />
63+
<dontSeeElement selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload1.value)}}" stepKey="dontSeeImage1" />
64+
<attachFile selector="{{ProductDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload1.value}}" stepKey="uploadImage2"/>
6365
<waitForLoadingMaskToDisappear stepKey="waitForLoading6" />
64-
<waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload.file)}}" stepKey="waitForUploadImage2" />
66+
<waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.image(ImageUpload1.value)}}" stepKey="waitForUploadImage2" />
6567
<click selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="clickInsertBtn1" />
6668
<waitForLoadingMaskToDisappear stepKey="waitForLoading7" />
6769
<waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.OkBtn}}" stepKey="waitForOkBtn1" />
68-
<fillField selector="{{ProductDescriptionWYSIWYGToolbarSection.ImageDescription}}" userInput="{{ImageUpload.content}}" stepKey="fillImageDescription1" />
69-
<fillField selector="{{ProductDescriptionWYSIWYGToolbarSection.Height}}" userInput="{{ImageUpload.height}}" stepKey="fillImageHeight1" />
70+
<fillField selector="{{ProductDescriptionWYSIWYGToolbarSection.ImageDescription}}" userInput="{{ImageUpload1.content}}" stepKey="fillImageDescription1" />
71+
<fillField selector="{{ProductDescriptionWYSIWYGToolbarSection.Height}}" userInput="{{ImageUpload1.height}}" stepKey="fillImageHeight1" />
7072
<click selector="{{ProductDescriptionWYSIWYGToolbarSection.OkBtn}}" stepKey="clickOkBtn1" />
7173
<waitForPageLoad stepKey="waitForPageLoad3"/>
7274
<scrollTo selector="{{ProductDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="scrollToTinyMCE4" />
@@ -78,31 +80,32 @@
7880
<see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.CancelBtn}}" userInput="Cancel" stepKey="seeCancelBtn2" />
7981
<see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.CreateFolder}}" userInput="Create Folder" stepKey="seeCreateFolderBtn2" />
8082
<see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertFile}}" userInput="Add Selected" stepKey="seeAddSelectedBtn2" />
81-
<attachFile selector="{{ProductShortDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload1.file}}" stepKey="uploadImage3"/>
82-
<waitForElementVisible selector="{{ProductShortDescriptionWYSIWYGToolbarSection.image(ImageUpload1.file)}}" stepKey="waitForUploadImage3" />
83+
<attachFile selector="{{ProductShortDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload3.value}}" stepKey="uploadImage3"/>
84+
<waitForElementVisible selector="{{ProductShortDescriptionWYSIWYGToolbarSection.image(ImageUpload3.value)}}" stepKey="waitForUploadImage3" />
8385
<waitForLoadingMaskToDisappear stepKey="waitForLoading9" />
8486
<wait time="3" stepKey="waitMore" />
8587
<waitForElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.DeleteSelectedBtn}}" stepKey="waitForDeletebtn" />
8688
<see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.DeleteSelectedBtn}}" userInput="Delete Selected" stepKey="seeDeleteBtn2"/>
8789
<click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.DeleteSelectedBtn}}" stepKey="clickDeleteSelected2" />
8890
<waitForText userInput="OK" stepKey="waitForConfirm3" />
8991
<click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.confirmDelete}}" stepKey="confirmDelete2" />
90-
<attachFile selector="{{ProductShortDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload1.file}}" stepKey="uploadImage4"/>
92+
<attachFile selector="{{ProductShortDescriptionWYSIWYGToolbarSection.BrowseUploadImage}}" userInput="{{ImageUpload3.value}}" stepKey="uploadImage4"/>
9193
<waitForLoadingMaskToDisappear stepKey="waitForLoading10" />
92-
<waitForElementVisible selector="{{ProductShortDescriptionWYSIWYGToolbarSection.image(ImageUpload1.file)}}" stepKey="waitForUploadImage4" />
94+
<waitForElementVisible selector="{{ProductShortDescriptionWYSIWYGToolbarSection.image(ImageUpload3.value)}}" stepKey="waitForUploadImage4" />
9395
<click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="clickInsertBtn" />
9496
<waitForLoadingMaskToDisappear stepKey="waitForLoading11" />
9597
<waitForElementVisible selector="{{ProductShortDescriptionWYSIWYGToolbarSection.OkBtn}}" stepKey="waitForOkBtn2" />
96-
<fillField selector="{{ProductShortDescriptionWYSIWYGToolbarSection.ImageDescription}}" userInput="{{ImageUpload1.content}}" stepKey="fillImageDescription2" />
97-
<fillField selector="{{ProductShortDescriptionWYSIWYGToolbarSection.Height}}" userInput="{{ImageUpload1.height}}" stepKey="fillImageHeight2" />
98+
<fillField selector="{{ProductShortDescriptionWYSIWYGToolbarSection.ImageDescription}}" userInput="{{ImageUpload3.content}}" stepKey="fillImageDescription2" />
99+
<fillField selector="{{ProductShortDescriptionWYSIWYGToolbarSection.Height}}" userInput="{{ImageUpload3.height}}" stepKey="fillImageHeight2" />
98100
<click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.OkBtn}}" stepKey="clickOkBtn2" />
99101
<waitForPageLoad stepKey="waitForPageLoad6"/>
100102
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
101103
<waitForLoadingMaskToDisappear stepKey="waitForLoading12" />
102104
<amOnPage url="{{_defaultProduct.name}}.html" stepKey="navigateToProductPage"/>
103105
<waitForPageLoad stepKey="waitForPageLoad7"/>
104106
<seeElement selector="{{StorefrontProductInfoMainSection.mediaDescription}}" stepKey="assertMediaDescription"/>
105-
<seeElement selector="{{StorefrontProductInfoMainSection.mediaShortDescription}}" stepKey="assertMediaShortDescription"/>
107+
<seeElementInDOM selector="{{StorefrontCategoryMainSection.ImageSource(ImageUpload3.fileName,ImageUpload3.extension)}}" stepKey="assertMediaSource3"/>
108+
<seeElementInDOM selector="{{StorefrontCategoryMainSection.ImageSource(ImageUpload1.fileName,ImageUpload1.extension)}}" stepKey="assertMediaSource1"/>
106109
<after>
107110
<actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
108111
<actionGroup ref="logout" stepKey="logout"/>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/StorefrontCustomerCheckoutTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="#"/>
1919
<group value="checkout"/>
20+
<!--Skipped; see: MAGETWO-88791-->
21+
<group value="skip"/>
2022
</annotations>
2123
<before>
2224
<createData entity="SimpleSubCategory" stepKey="simplecategory"/>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/CMSActionGroup.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,16 @@
3232
</arguments>
3333
<amOnPage url="{{CmsBlocksPage.url}}" stepKey="navigateToCMSBlocksGrid"/>
3434
<waitForPageLoad stepKey="waitForPageLoad1"/>
35+
<conditionalClick selector="{{CmsPagesPageActionsSection.clearAll}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
36+
<waitForPageLoad stepKey="waitForPageLoad2"/>
3537
<conditionalClick selector="{{BlockPageActionsSection.idColumn}}" dependentSelector="//span[contains(text(), 'ID')]/parent::th[not(contains(@class, '_descend'))]/parent::tr/parent::thead/parent::table/parent::div[contains(@data-role, 'grid-wrapper')]" stepKey="clickToAttemptSortByIdDescending" visible="true"/>
3638
<waitForLoadingMaskToDisappear stepKey="waitForFirstIdSortDescendingToFinish" />
3739
<!-- Conditional Click again in case it goes from default state to ascending on first click -->
3840
<conditionalClick selector="{{BlockPageActionsSection.idColumn}}" dependentSelector="//span[contains(text(), 'ID')]/parent::th[not(contains(@class, '_descend'))]/parent::tr/parent::thead/parent::table/parent::div[contains(@data-role, 'grid-wrapper')]" stepKey="secondClickToAttemptSortByIdDescending" visible="true"/>
3941
<waitForLoadingMaskToDisappear stepKey="waitForSecondIdSortDescendingToFinish" />
4042
<click selector="{{BlockPageActionsSection.select(CMSBlockPage.identifier)}}" stepKey="clickSelectCreatedCMSBlock" />
4143
<click selector="{{BlockPageActionsSection.edit(CMSBlockPage.identifier)}}" stepKey="navigateToCreatedCMSBlock" />
42-
<waitForPageLoad stepKey="waitForPageLoad2"/>
44+
<waitForPageLoad stepKey="waitForPageLoad3"/>
4345
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskOfStagingSection" />
4446
</actionGroup>
4547
</actionGroups>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/SearchBlockOnGridPageActionGroup.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="searchBlockOnGridPage">
11+
<arguments>
12+
<argument name="Block" defaultValue=""/>
13+
</arguments>
14+
<fillField selector="//input[@name='chooser_identifier']" userInput="{{Block.identifier}}" stepKey="fillEntityIdentifier"/>
15+
<click selector="//div[@class='modal-inner-wrap']//button[@title='Search']" stepKey="clickSearchBtn" />
16+
<waitForLoadingMaskToDisappear stepKey="waitForSecondIdSortDescendingToFinish2" />
17+
<waitForElementVisible selector="{{WidgetSection.BlockPage(Block.identifier)}}" stepKey="waitForBlockTitle" />
18+
</actionGroup>
19+
</actionGroups>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Data/CmsPageData.xml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
<data key="price">1.00</data>
2626
<data key="file_type">Upload File</data>
2727
<data key="shareable">Yes</data>
28-
<data key="file">magento.jpg</data>
2928
<data key="value">magento.jpg</data>
29+
<data key="fileName">magento</data>
3030
<data key="content">Image content. Yeah.</data>
3131
<data key="height">1000</data>
3232
</entity>
@@ -45,8 +45,20 @@
4545
<data key="price">1.00</data>
4646
<data key="file_type">Upload File</data>
4747
<data key="shareable">Yes</data>
48-
<data key="file">magento2.jpg</data>
4948
<data key="value">magento2.jpg</data>
49+
<data key="fileName">magento2</data>
50+
<data key="extension">jpg</data>
51+
<data key="content">Image content. Yeah.</data>
52+
<data key="height">1000</data>
53+
</entity>
54+
<entity name="ImageUpload3" type="uploadImage">
55+
<data key="title" unique="suffix">Image1</data>
56+
<data key="price">1.00</data>
57+
<data key="file_type">Upload File</data>
58+
<data key="shareable">Yes</data>
59+
<data key="value">magento3.jpg</data>
60+
<data key="fileName">magento3</data>
61+
<data key="extension">jpg</data>
5062
<data key="content">Image content. Yeah.</data>
5163
<data key="height">1000</data>
5264
</entity>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/BlockPageActionsSection.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,8 @@
1515
<element name="idColumn" type="button" selector="//div[contains(@data-role, 'grid-wrapper')]/table/thead/tr/th/span[contains(text(), 'ID')]"/>
1616
<element name="clearAll" type="button" selector="//div[@class='admin__data-grid-header']//button[contains(text(), 'Clear all')]"/>
1717
<element name="activeFilters" type="button" selector="//div[@class='admin__data-grid-header']//span[contains(text(), 'Active filters:')]" />
18+
<element name="FilterBtn" type="input" selector="//button[text()='Filters']"/>
19+
<element name="URLKey" type="input" selector="//div[@class='admin__form-field-control']/input[@name='identifier']"/>
20+
<element name="ApplyFiltersBtn" type="button" selector="//span[text()='Apply Filters']"/>
1821
</section>
1922
</sections>

0 commit comments

Comments
 (0)