Skip to content

Commit cd8af08

Browse files
jilu1jilu1
committed
Merge remote-tracking branch 'upstream/2.3.0-release' into MQE-1139-2.3.0
2 parents 3da3b7b + 840a7aa commit cd8af08

File tree

46 files changed

+352
-3655
lines changed

Some content is hidden

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

46 files changed

+352
-3655
lines changed

‎app/code/Magento/Analytics/Test/Mftf/Data/UserData.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
1111
<entity name="adminNoReport" type="user">
1212
<data key="username" unique="suffix">noreport</data>
1313
<data key="firstname">No</data>
@@ -18,7 +18,7 @@
1818
<data key="interface_local">en_US</data>
1919
<data key="is_active">true</data>
2020
<data key="current_password">123123q</data>
21-
</entity>
21+
</entity>
2222
<entity name="restrictedWebUser" type="user">
2323
<data key="username" unique="suffix">restrictedWebUser</data>
2424
<data key="firstname">restricted</data>

‎app/code/Magento/Analytics/Test/Mftf/Section/AdminConfigSection.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
9+
<section name="AdminConfigSection">
10+
<element name="advancedReportingMenuItem" type="text" selector="//*[@id='system_config_tabs']/div[1]//span[text()='Advanced Reporting']"/>
11+
<element name="advancedReportingService" type="select" selector="#analytics_general_enabled"/>
12+
<element name="advancedReportingServiceLabel" type="text" selector="#row_analytics_general_enabled>td.label>label>span"/>
13+
<element name="advancedReportingServiceStatus" type="text" selector="#row_analytics_general_enabled>td.value>p>span"/>
14+
<element name="advancedReportingIndustry" type="select" selector="#analytics_general_vertical"/>
15+
<element name="advancedReportingIndustryLabel" type="text" selector=".config-vertical-label>label>span"/>
16+
<element name="advancedReportingHour" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(2)"/>
17+
<element name="advancedReportingMinute" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(3)"/>
18+
<element name="advancedReportingSeconds" type="select" selector="#row_analytics_general_collection_time>td:nth-child(2)>select:nth-child(4)"/>
19+
<element name="advancedReportingBlankIndustryError" type="text" selector=".message-error>div"/>
20+
<element name="advancedReportingSuccessMessage" type="text" selector=".message-success>div"/>
21+
</section>
22+
</sections>

‎app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
<severity value="MAJOR"/>
1717
<testCaseId value="MAGETWO-66465"/>
1818
<group value="analytics"/>
19-
<skip>
20-
<issueId value="MAGETWO-90659"/>
21-
</skip>
2219
</annotations>
2320
<after>
2421
<amOnPage stepKey="amOnLogoutPage" url="admin/admin/auth/logout/"/>

‎app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<severity value="MAJOR"/>
1818
<testCaseId value="MAGETWO-63898"/>
1919
<group value="analytics"/>
20-
<skip>
21-
<issueId value="MAGETWO-90659"/>
22-
</skip>
2320
</annotations>
2421

2522
<actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>

‎app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationPermissionTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-82648"/>
1919
<group value="analytics"/>
20-
<skip>
21-
<issueId value="MAGETWO-90659"/>
22-
</skip>
2320
</annotations>
2421
<before>
2522
<createData stepKey="noReportUserRole" entity="adminNoReportRole"/>

‎app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfigurationPaymentSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1111
<section name="BraintreeConfigurationPaymentSection">
1212
<element name="creditCart" type="radio" selector="#braintree"/>
13+
<element name="paymentMethodContainer" type="block" selector=".payment-method-braintree"/>
1314
<element name="paymentMethod" type="radio" selector="//div[@class='payment-group']//input[contains(@id, 'braintree_cc_vault_')]"/>
1415
<element name="cartFrame" type="iframe" selector="braintree-hosted-field-number"/>
1516
<element name="monthFrame" type="iframe" selector="braintree-hosted-field-expirationMonth"/>

‎app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,12 @@
6161
<!--Fill cart data-->
6262
<click selector="{{BraintreeConfigurationPaymentSection.creditCart}}" stepKey="SelectBraintreePaymentMethod"/>
6363
<waitForPageLoad stepKey="waitForPageLoad3"/>
64+
<scrollTo selector="{{BraintreeConfigurationPaymentSection.creditCart}}" stepKey="ScrollToCreditCardSection"/>
6465
<actionGroup ref="StorefrontFillCartDataActionGroup" stepKey="StorefrontFillCartDataActionGroup"/>
6566
<waitForPageLoad stepKey="waitForPageLoad4"/>
6667
<!--Place order-->
67-
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="PlaceOrder"/>
68+
<click selector="{{BraintreeConfigurationPaymentSection.paymentMethodContainer}} {{CheckoutPaymentSection.placeOrder}}"
69+
stepKey="PlaceOrder"/>
6870
<waitForPageLoad stepKey="waitForPageLoad5"/>
6971

7072
<!--Add product to cart again-->

‎app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MC-217"/>
1919
<group value="Bundle"/>
20-
<skip>
21-
<issueId value="MAGETWO-92898"/>
22-
</skip>
2320
</annotations>
2421
<before>
2522
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>

‎app/code/Magento/Captcha/Test/Mftf/ActionGroup/CaptchaFormsDisplayingActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<waitForPageLoad stepKey="waitForStoresLoaded"/>
1414
<click selector="{{CaptchaFormsDisplayingSection.config}}" stepKey="ClickToGoConfiguration"/>
1515
<waitForPageLoad stepKey="waitForConfigurationsLoaded"/>
16-
<scrollTo selector="{{CaptchaFormsDisplayingSection.customer}}" stepKey="ScrollToCustomers"/>
16+
<scrollTo selector="{{CaptchaFormsDisplayingSection.customer}}" x="0" y="-80" stepKey="ScrollToCustomers"/>
1717
<click selector="{{CaptchaFormsDisplayingSection.customer}}" stepKey="ClickToCustomers"/>
1818
<waitForPageLoad stepKey="waitForCustomerConfigurationsLoaded"/>
1919
<click selector="{{CaptchaFormsDisplayingSection.customerConfig}}" stepKey="ClickToGoCustomerConfiguration"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<element name="apply" type="button" selector="button[data-action=grid-filter-apply]" timeout="30"/>
1616
<element name="filter" type="button" selector="//div[@class='data-grid-filters-action-wrap']/button" timeout="30"/>
1717
<element name="typeDropDown" type="multiselect" selector="//select[@name='type_id']" timeout="30"/>
18-
<element name="bundleOption" type="multiselect" selector="//select[@name='type_id']/option[4]" timeout="30"/>
18+
<element name="bundleOption" type="multiselect" selector="//select[@name='type_id']/option[@value='bundle']" timeout="30"/>
1919
<element name="applyFilters" type="button" selector="//button[@class='action-secondary']" timeout="30"/>
2020
<element name="allCheckbox" type="checkbox" selector="//div[@data-role='grid-wrapper']//label[@data-bind='attr: {for: ko.uid}']" timeout="30"/>
2121
<element name="actions" type="button" selector="//div[@class='action-select-wrap']/button" timeout="30"/>

0 commit comments

Comments
 (0)