Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit ae1a034

Browse files
committed
Merge remote-tracking branch 'origin/2.3-develop' into status-searchapi
2 parents ef60eb2 + 0339078 commit ae1a034

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="searchAndMultiSelectActionGroup">
1212
<arguments>
13-
<argument name="dropDownSelector"/>
14-
<argument name="options"/>
13+
<argument name="dropDownSelector" />
14+
<argument name="options" type="string"/>
1515
</arguments>
1616
<waitForPageLoad stepKey="waitForPageLoad"/>
1717
<waitForElementVisible selector="{{dropDownSelector}} .action-select.admin__action-multiselect" stepKey="waitForDropdown"/>
1818
<click selector="{{dropDownSelector}} .action-select.admin__action-multiselect" stepKey="clickDropdown"/>
19-
<selectMultipleOptions filterSelector="{{dropDownSelector}} .admin__action-multiselect-search-wrap>input[data-role='advanced-select-text']" optionSelector="{{dropDownSelector}} .admin__action-multiselect-label>span" stepKey="selectSpecifiedOptions">
19+
<selectMultipleOptions filterSelector="{{dropDownSelector}} .admin__action-multiselect-search-wrap>input" optionSelector="{{dropDownSelector}} .admin__action-multiselect-label>span" stepKey="selectSpecifiedOptions">
2020
<array>[{{options}}]</array>
2121
</selectMultipleOptions>
2222
</actionGroup>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Data/CustomerGroupData.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,9 @@
1313
<data key="tax_class_id">3</data>
1414
<data key="tax_class_name">Retail Customer</data>
1515
</entity>
16+
<entity name="DefaultCustomerGroup" type="customerGroup">
17+
<array key="group_names">
18+
<item>General</item>
19+
</array>
20+
</entity>
1621
</entities>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerAccountInformationSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@
1313
<element name="firstName" type="input" selector="input[name='customer[firstname]']"/>
1414
<element name="lastName" type="input" selector="input[name='customer[lastname]']"/>
1515
<element name="email" type="input" selector="input[name='customer[email]']"/>
16+
<element name="group" type="select" selector="[name='customer[group_id]']"/>
1617
</section>
1718
</sections>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/AdminCreateCustomerTest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<testCaseId value="MAGETWO-72095"/>
1919
<group value="customer"/>
2020
<group value="create"/>
21-
<group value="skip"/>
2221
</annotations>
2322
<after>
2423
<amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>

0 commit comments

Comments
 (0)