Skip to content

Commit b067091

Browse files
author
Magento CICD
authored
merge magento/2.2.7-develop into magento-qwerty/MAGETWO-61322
2 parents 7c674ef + bbf907c commit b067091

File tree

88 files changed

+1932
-361
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+1932
-361
lines changed

‎.htaccess

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -364,15 +364,6 @@
364364
Require all denied
365365
</IfVersion>
366366
</Files>
367-
<Files .user.ini>
368-
<IfVersion < 2.4>
369-
order allow,deny
370-
deny from all
371-
</IfVersion>
372-
<IfVersion >= 2.4>
373-
Require all denied
374-
</IfVersion>
375-
</Files>
376367

377368
# For 404s and 403s that aren't handled by the application, show plain 404 response
378369
ErrorDocument 404 /pub/errors/404.php

‎.htaccess.sample

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -341,15 +341,6 @@
341341
Require all denied
342342
</IfVersion>
343343
</Files>
344-
<Files .user.ini>
345-
<IfVersion < 2.4>
346-
order allow,deny
347-
deny from all
348-
</IfVersion>
349-
<IfVersion >= 2.4>
350-
Require all denied
351-
</IfVersion>
352-
</Files>
353344

354345
# For 404s and 403s that aren't handled by the application, show plain 404 response
355346
ErrorDocument 404 /pub/errors/404.php

‎app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88

99
namespace Magento\AdminNotification\Block\Grid\Renderer;
1010

11-
/**
12-
* Renderer class for action in the admin notifications grid
13-
*/
1411
class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
1512
{
1613
/**
@@ -40,8 +37,7 @@ public function __construct(
4037
*/
4138
public function render(\Magento\Framework\DataObject $row)
4239
{
43-
$readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' .
44-
$this->escapeUrl($row->getUrl()) . '">' .
40+
$readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' . $row->getUrl() . '">' .
4541
__('Read Details') . '</a>' : '';
4642

4743
$markAsReadHtml = !$row->getIsRead() ? '<a class="action-mark" href="' . $this->getUrl(

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,18 @@
2626
<waitForPageLoad stepKey="waitForPageLoadAfterDeleteAttribute"/>
2727
<see selector="{{AdminMessagesSection.success}}" userInput="You deleted the product attribute." stepKey="seeDeleteSuccessMessage"/>
2828
</actionGroup>
29+
<actionGroup name="navigateToCreatedProductAttribute">
30+
<arguments>
31+
<argument name="productAttribute"/>
32+
</arguments>
33+
<amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
34+
<waitForPageLoad stepKey="waitForAttributesGridPageLoad"/>
35+
<conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFilters"/>
36+
<waitForPageLoad stepKey="waitForAttributesGridPageLoad1"/>
37+
<fillField selector="{{AdminProductAttributeGridSection.gridFilterAttributeCode}}"
38+
userInput="{{productAttribute.attribute_code}}" stepKey="setAttributeCode"/>
39+
<click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="searchForAttributeFromTheGrid"/>
40+
<click selector="{{AdminDataGridTableSection.row('1')}}" stepKey="clickOnAttributeRow"/>
41+
<waitForPageLoad stepKey="waitForAttributePageLoad" />
42+
</actionGroup>
2943
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeEditPage.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,7 @@
1111
<page name="AdminProductAttributeEditPage" url="catalog/product_attribute/edit/" area="admin" module="Magento_Catalog">
1212
<section name="AdminProductAttributeEditSection"/>
1313
<section name="AdminConfirmationModalSection"/>
14+
<section name="AdminMainActionsSection"/>
15+
<section name="AdminMessagesSection"/>
1416
</page>
1517
</pages>

‎app/code/Magento/Catalog/Test/Mftf/Page/AdminProductAttributeFormPage.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@
1111
<section name="AttributePropertiesSection"/>
1212
<section name="StorefrontPropertiesSection"/>
1313
<section name="AdvancedAttributePropertiesSection"/>
14+
<section name="AdminAttributeOptionsSection"/>
1415
</page>
1516
</pages>

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,9 @@
2929
<element name="addToColumnOptions" type="select" selector="#is_used_in_grid"/>
3030
<element name="useInFilterOptions" type="select" selector="#is_filterable_in_grid"/>
3131
</section>
32+
<section name="AdminAttributeOptionsSection">
33+
<element name="addOption" type="button" selector="#add_new_option_button"/>
34+
<element name="nthOptionAdminLabel" type="input"
35+
selector="(//*[@id='manage-options-panel']//tr[{{var}}]//input[contains(@name, 'option[value]')])[1]" parameterized="true"/>
36+
</section>
3237
</sections>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDropdownAttributeTest.xml

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
<?xml version="1.0"?>
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" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
9+
<test name="AdminCreateProductDropdownAttributeTest">
10+
<annotations>
11+
<features value="Catalog"/>
12+
<stories value="Create/configure Dropdown product attribute"/>
13+
<title value="Admin should be able to create dropdown product attribute"/>
14+
<description value="Admin should be able to create dropdown product attribute"/>
15+
<severity value="CRITICAL"/>
16+
<testCaseId value="MAGETWO-95868"/>
17+
<group value="Catalog"/>
18+
</annotations>
19+
<before>
20+
<actionGroup ref="LoginAsAdmin" stepKey="login"/>
21+
</before>
22+
<after>
23+
<!-- Remove attribute -->
24+
<actionGroup ref="deleteProductAttribute" stepKey="deleteAttribute">
25+
<argument name="ProductAttribute" value="productAttributeWithDropdownTwoOptions"/>
26+
</actionGroup>
27+
<actionGroup ref="logout" stepKey="logout"/>
28+
</after>
29+
30+
<amOnPage url="{{ProductAttributePage.url}}" stepKey="navigateToNewProductAttributePage"/>
31+
<waitForPageLoad stepKey="waitForPageLoad"/>
32+
33+
<!-- Set attribute properties -->
34+
<fillField selector="{{AttributePropertiesSection.defaultLabel}}"
35+
userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillDefaultLabel"/>
36+
<selectOption selector="{{AttributePropertiesSection.inputType}}"
37+
userInput="{{productAttributeWithDropdownTwoOptions.frontend_input}}" stepKey="fillInputType"/>
38+
39+
<!-- Set advanced attribute properties -->
40+
<click selector="{{AdvancedAttributePropertiesSection.advancedAttributePropertiesSectionToggle}}"
41+
stepKey="showAdvancedAttributePropertiesSection"/>
42+
<waitForElementVisible selector="{{AdvancedAttributePropertiesSection.attributeCode}}"
43+
stepKey="waitForSlideOut"/>
44+
<fillField selector="{{AdvancedAttributePropertiesSection.attributeCode}}"
45+
userInput="{{productAttributeWithDropdownTwoOptions.attribute_code}}"
46+
stepKey="fillAttributeCode"/>
47+
48+
<!-- Add new attribute options -->
49+
<click selector="{{AdminAttributeOptionsSection.addOption}}" stepKey="clickAddOption1"/>
50+
<fillField selector="{{AdminAttributeOptionsSection.nthOptionAdminLabel('1')}}"
51+
userInput="Fish and Chips" stepKey="fillAdminValue1"/>
52+
53+
<click selector="{{AdminAttributeOptionsSection.addOption}}" stepKey="clickAddOption2"/>
54+
<fillField selector="{{AdminAttributeOptionsSection.nthOptionAdminLabel('2')}}"
55+
userInput="Fish &amp; Chips" stepKey="fillAdminValue2"/>
56+
57+
<!-- Save the new product attribute -->
58+
<click selector="{{AdminMainActionsSection.save}}" stepKey="clickSave1"/>
59+
<waitForElementVisible selector="{{AdminMessagesSection.successMessage}}"
60+
stepKey="waitForSuccessMessage"/>
61+
62+
<actionGroup ref="navigateToCreatedProductAttribute" stepKey="navigateToAttribute">
63+
<argument name="productAttribute" value="productAttributeWithDropdownTwoOptions"/>
64+
</actionGroup>
65+
<!-- Check attribute data -->
66+
<grabValueFrom selector="{{AdminAttributeOptionsSection.nthOptionAdminLabel('2')}}"
67+
stepKey="secondOptionAdminLabel"/>
68+
<assertEquals actual="$secondOptionAdminLabel" expected="'Fish &amp; Chips'"
69+
stepKey="assertSecondOption"/>
70+
</test>
71+
</tests>

‎app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,15 @@
104104
<see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($createProduct.name$)}}" userInput="Jan 1, 2018" stepKey="seeProductOptionDateAndTimeInput" />
105105
<see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($createProduct.name$)}}" userInput="1/1/18, 1:00 AM" stepKey="seeProductOptionDataInput" />
106106
<see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($createProduct.name$)}}" userInput="1:00 AM" stepKey="seeProductOptionTimeInput" />
107-
107+
<!--Select shipping method-->
108+
<actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
109+
<waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
108110
<click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
109-
111+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterClickNext"/>
112+
<!--Select payment method-->
113+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod"/>
110114
<!-- Place Order -->
111-
112-
<waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
115+
<waitForElementVisible selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
113116
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
114117

115118
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
@@ -120,6 +123,7 @@
120123

121124
<amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
122125
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask3"/>
126+
<actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
123127
<fillField selector="{{OrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
124128
<click selector="{{OrdersGridSection.submitSearch}}" stepKey="submitSearch"/>
125129
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask4"/>
@@ -141,6 +145,7 @@
141145
<!-- Reorder and Checking the correctness of displayed custom options for user parameters on Order and correctness of displayed price Subtotal-->
142146

143147
<click selector="{{OrderDetailsMainActionsSection.reorder}}" stepKey="clickReorder"/>
148+
<actionGroup ref="AdminCheckoutSelectCheckMoneyOrderBillingMethodActionGroup" stepKey="selectBillingMethod"/>
144149
<click selector="{{AdminOrderFormActionSection.submitOrder}}" stepKey="trySubmitOrder"/>
145150

146151
<see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionField.title}}" stepKey="seeAdminOrderProductOptionField1" />
@@ -176,4 +181,4 @@
176181
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
177182
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
178183
</test>
179-
</tests>
184+
</tests>

‎app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitle.xml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,21 @@
5555
<see selector="{{CheckoutPaymentSection.cartItems}}" userInput="$$createProduct.name$$" stepKey="seeProductInCart"/>
5656
<conditionalClick selector="{{CheckoutPaymentSection.productOptionsByProductItemName($$createProduct.name$$)}}" dependentSelector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($$createProduct.name$$)}}" visible="false" stepKey="exposeProductOptions"/>
5757
<see selector="{{CheckoutPaymentSection.productOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="{{ProductOptionValueDropdownLongTitle1.title}}" stepKey="seeProductOptionValueDropdown1Input1"/>
58+
<!--Select shipping method-->
59+
<actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
60+
<waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
5861
<click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
62+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterClickNext"/>
5963
<!-- Place Order -->
60-
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPayment"/>
61-
<waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
64+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod"/>
65+
<waitForElementVisible selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
6266
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
6367
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
6468
<!-- Login to Admin and open Order -->
6569
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
6670
<amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
6771
<waitForPageLoad stepKey="waitForPageLoad1"/>
72+
<actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
6873
<fillField selector="{{AdminOrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
6974
<click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearchOrderNum"/>
7075
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnSearch"/>

0 commit comments

Comments
 (0)