Skip to content

Commit b8ecd88

Browse files
YevSentYevSent
committed
Merge branch '2.3-develop' of github.com:magento/magento2ce into port-2618
2 parents 3e2e613 + 275e63c commit b8ecd88

File tree

121 files changed

+5681
-3842
lines changed

Some content is hidden

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

121 files changed

+5681
-3842
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
</after>
2323
<actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
2424
<amOnPage stepKey="amOnAdminConfig" url="{{AdminConfigPage.url}}"/>
25+
<waitForPageLoad stepKey="waitForAdminConfig"/>
2526
<click stepKey="clickAdvancedReportingConfigMenu" selector="{{AdminConfigSection.advancedReportingMenuItem}}"/>
2627
<see stepKey="seeAdvancedReportingIndustryLabel" selector="{{AdminConfigSection.advancedReportingIndustryLabel}}" userInput="Industry"/>
2728
<selectOption stepKey="selectAdvancedReportingIndustry" selector="{{AdminConfigSection.advancedReportingIndustry}}" userInput="--Please Select--"/>

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

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

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

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

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

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

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

‎app/code/Magento/Bundle/Test/Mftf/Data/BundleLinkData.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
1111
<entity name="ApiBundleLink" type="bundle_link">
12-
<var key="sku" entityKey="sku" entityType="product2"/>
1312
<var key="option_id" entityKey="return" entityType="bundle_option"/>
1413
<var key="sku" entityKey="sku" entityType="product"/>
1514
<data key="qty">1</data>

‎app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
1111
<entity name="BundleProduct" type="product">
12-
<data key="name" unique="suffix">BundleProduct</data>
1312
<data key="name" unique="suffix">BundleProduct</data>
1413
<data key="name2" unique="suffix">BundleProduct2</data>
1514
<data key="sku" unique="suffix">bundleproduct</data>

‎app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,6 @@
6868
<element name="searchForCategory" type="input" selector="div.action-menu._active > div.admin__action-multiselect-search-wrap input" timeout="30"/>
6969
<element name="selectCategory" type="multiselect" selector="//div[@class='action-menu _active']//label[@class='admin__action-multiselect-label']"/>
7070
<element name="categoriesLabel" type="text" selector="//div[@class='action-menu _active']//button[@data-action='close-advanced-select']"/>
71+
<element name="userDefinedQuantity" type="checkbox" selector="[name='bundle_options[bundle_options][{{option}}][bundle_selections][{{product}}][selection_can_change_qty]'][type='checkbox']" parameterized="true"/>
7172
</section>
7273
</sections>

‎app/code/Magento/Bundle/Test/Mftf/Section/BundleStorefrontSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1111
<section name="BundleStorefrontSection">
1212
<!--TestingForLocationOfOptions-->
13-
<element name="bundleOptionSelector" type="button" selector="//*[@id='bundle-slide']/span"/>
14-
<element name="bundleOptionSelection" type="button" selector="//div[@class='nested options-list']/div[2]/label[@class='label']"/>
13+
<element name="bundleOptionSelector" type="checkbox" selector="//*[@id='bundle-slide']/span" timeout="30"/>
14+
<element name="bundleOptionSelection" type="checkbox" selector="//div[@class='nested options-list']/div[{{optionNumber}}]/label[@class='label']" parameterized="true"/>
1515
<!--Description-->
1616
<!--CE exclusively-->
1717
<element name="longDescriptionText" type="text" selector="//*[@id='description']/div/div" timeout="30"/>

‎app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,13 @@
2121
<element name="nthOptionDiv" type="block" selector="#product-options-wrapper div.field.option:nth-of-type({{var}})" parameterized="true"/>
2222
<element name="nthItemOptionsTitle" type="text" selector="dl.item-options dt:nth-of-type({{var}})" parameterized="true"/>
2323
<element name="nthItemOptionsValue" type="text" selector="dl.item-options dd:nth-of-type({{var}})" parameterized="true"/>
24+
<element name="bundleProductName" type="text" selector="//*[@id='maincontent']//span[@itemprop='name']"/>
25+
<element name="pageNotFound" type="text" selector="//h1[@class='page-title']//span[contains(., 'Whoops, our bad...')]"/>
26+
<element name="dropDownOptionOneProducts" type="select" selector="//label//span[contains(text(), '{{productName}}')]/../..//div[@class='control']//select" parameterized="true"/>
27+
<element name="dropDownOptionOneQuantity" type="input" selector="//span[contains(text(), '{{productName}}')]/../..//input" parameterized="true"/>
28+
<element name="radioButtonOptionTwoProducts" type="checkbox" selector="//label//span[contains(text(), '{{productName}}')]/../..//div[@class='control']//div[@class='field choice'][{{productNumber}}]/input" parameterized="true"/>
29+
<element name="radioButtonOptionTwoQuantity" type="input" selector="//label//span[contains(text(), '{{productName}}')]/../..//div[@class='control']//div[@class='field qty qty-holder']//input" parameterized="true"/>
30+
<element name="checkboxOptionThreeProducts" type="checkbox" selector="//label//span[contains(text(), '{{productName}}')]/../..//div[@class='control']//div[@class='field choice'][{{productNumber}}]/input" parameterized="true"/>
31+
<element name="multiselectOptionFourProducts" type="multiselect" selector="//label//span[contains(text(), '{{productName}}')]/../..//select[@multiple='multiple']" parameterized="true"/>
2432
</section>
2533
</sections>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,6 @@
8282
<!--Testing deletion of product-->
8383
<amOnPage url="{{BundleProduct.urlKey}}.html" stepKey="GoToProductPageAgain"/>
8484
<waitForPageLoad stepKey="WaitForProductPageToLoadToShowElement"/>
85-
<dontSeeElement selector="{{BundleStorefrontSection.bundleProductName}}" stepKey="LookingForNameOfProductTwo"/>
85+
<dontSeeElement selector="{{StorefrontBundledSection.bundleProductName}}" stepKey="LookingForNameOfProductTwo"/>
8686
</test>
8787
</tests>

0 commit comments

Comments
 (0)