Skip to content

Commit 8756cda

Browse files
committed
MAGETWO-91595: Image doesn't load on frontend PDP if the product name contains double quote "
- Fix MFTF tests
1 parent 05299bf commit 8756cda

File tree

7 files changed

+10
-9
lines changed

7 files changed

+10
-9
lines changed

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminCategoryActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<!--Upload image for category -->
5858
<actionGroup name="addCategoryImage">
5959
<arguments>
60-
<argument name="image" defaultValue="ImageUpload"/>
60+
<argument name="image" defaultValue="ProductImage"/>
6161
</arguments>
6262
<conditionalClick selector="{{AdminCategoryContentSection.sectionHeader}}" dependentSelector="{{AdminCategoryContentSection.uploadButton}}" visible="false" stepKey="openContentSection"/>
6363
<waitForPageLoad time="30" stepKey="waitForPageLoad"/>
@@ -81,7 +81,7 @@
8181

8282
<actionGroup name="checkCategoryImageInAdmin">
8383
<arguments>
84-
<argument name="image" defaultValue="ImageUpload"/>
84+
<argument name="image" defaultValue="ProductImage"/>
8585
</arguments>
8686
<conditionalClick selector="{{AdminCategoryContentSection.sectionHeader}}" dependentSelector="{{AdminCategoryContentSection.uploadButton}}" visible="false" stepKey="openContentSection"/>
8787
<waitForPageLoad stepKey="waitForPageLoad"/>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<!--Upload image for product-->
7878
<actionGroup name="addProductImage">
7979
<arguments>
80-
<argument name="image" defaultValue="ImageUpload"/>
80+
<argument name="image" defaultValue="ProductImage"/>
8181
</arguments>
8282
<conditionalClick selector="{{AdminProductImagesSection.productImagesToggle}}" dependentSelector="{{AdminProductImagesSection.imageUploadButton}}" visible="false" stepKey="openProductImagesSection"/>
8383
<waitForPageLoad time="30" stepKey="waitForPageRefresh"/>

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
@@ -154,7 +154,7 @@
154154
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
155155
<requiredEntity type="custom_attribute">CustomAttributeProductUrlKey</requiredEntity>
156156
</entity>
157-
<entity name="ImageUpload" type="uploadImage">
157+
<entity name="ProductImage" type="uploadImage">
158158
<data key="title" unique="suffix">Image1</data>
159159
<data key="price">1.00</data>
160160
<data key="file_type">Upload File</data>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminAddImageForCategoryTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@
4343
<actionGroup ref="CheckCategoryOnStorefront" stepKey="CheckCategoryOnStorefront">
4444
<argument name="categoryEntity" value="SimpleSubCategory"/>
4545
</actionGroup>
46-
<seeElement selector="{{StorefrontCategoryMainSection.imageSource(ImageUpload.filename)}}" stepKey="seeImage"/>
46+
<seeElement selector="{{StorefrontCategoryMainSection.imageSource(ProductImage.filename)}}" stepKey="seeImage"/>
4747
</test>
4848
</tests>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CAdminTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<argument name="product" value="SimpleProduct"/>
4040
</actionGroup>
4141
<actionGroup ref="addProductImage" stepKey="addImageForProductSimple">
42-
<argument name="image" value="ImageUpload"/>
42+
<argument name="image" value="ProductImage"/>
4343
</actionGroup>
4444
<actionGroup ref="saveProductForm" stepKey="saveSimpleProduct"/>
4545
<click selector="{{AdminProductFormActionSection.backButton}}" stepKey="clickBackToGridSimple"/>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/StorefrontProductNameWithDoubleQuote.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
</actionGroup>
3636
<searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="selectCategory"/>
3737
<actionGroup ref="addProductImage" stepKey="addImageToProduct">
38-
<argument name="image" value="ImageUpload"/>
38+
<argument name="image" value="ProductImage"/>
3939
</actionGroup>
4040
<actionGroup ref="saveProductForm" stepKey="saveProduct"/>
4141

4242
<!--Check product in category listing-->
4343
<amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="goToCategoryPage"/>
44-
<seeElement selector="{{StorefrontCategoryProductSection.ProductImageByNameAndSrc(SimpleProductNameWithDoubleQuote.name, ImageUpload.fileName)}}" stepKey="seeCorrectImageCategoryPage"/>
44+
<seeElement selector="{{StorefrontCategoryProductSection.ProductImageByNameAndSrc(SimpleProductNameWithDoubleQuote.name, ProductImage.fileName)}}" stepKey="seeCorrectImageCategoryPage"/>
4545
<see selector="{{StorefrontCategoryProductSection.ProductTitleByName(SimpleProductNameWithDoubleQuote.name)}}" userInput="{{SimpleProductNameWithDoubleQuote.name}}" stepKey="seeCorrectNameCategoryPage"/>
4646
<see selector="{{StorefrontCategoryProductSection.ProductPriceByName(SimpleProductNameWithDoubleQuote.name)}}" userInput="${{SimpleProductNameWithDoubleQuote.price}}" stepKey="seeCorrectPriceCategoryPage"/>
4747
<!--Open product display page-->
@@ -50,7 +50,7 @@
5050
<see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{SimpleProductNameWithDoubleQuote.name}}" stepKey="seeCorrectName"/>
5151
<see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{SimpleProductNameWithDoubleQuote.sku}}" stepKey="seeCorrectSku"/>
5252
<see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="${{SimpleProductNameWithDoubleQuote.price}}" stepKey="seeCorrectPrice"/>
53-
<seeElement selector="{{StorefrontProductInfoMainSection.productImageSrc(ImageUpload.fileName)}}" stepKey="seeCorrectImage"/>
53+
<seeElement selector="{{StorefrontProductInfoMainSection.productImageSrc(ProductImage.fileName)}}" stepKey="seeCorrectImage"/>
5454
<see selector="{{StorefrontProductInfoMainSection.stock}}" userInput="In Stock" stepKey="seeInStock"/>
5555
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$$createCategory.name$$" stepKey="seeCorrectBreadCrumbCategory"/>
5656
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="{{SimpleProductNameWithDoubleQuote.name}}" stepKey="seeCorrectBreadCrumbProduct"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<data key="price">1.00</data>
3838
<data key="file_type">Upload File</data>
3939
<data key="shareable">Yes</data>
40+
<data key="file">magento.jpg</data>
4041
<data key="value">magento.jpg</data>
4142
<data key="fileName">magento</data>
4243
<data key="extension">jpg</data>

0 commit comments

Comments
 (0)