Skip to content

Commit 4ba6fe0

Browse files
KevinBKozantomreece
authored andcommitted
MQE-292: Use "selector" name consistently instead of "locator"
Renamed all occurences of locator to selector.
1 parent 45ff81d commit 4ba6fe0

File tree

53 files changed

+173
-173
lines changed

Some content is hidden

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

53 files changed

+173
-173
lines changed

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminLoginFormSection.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1111
<section name="AdminLoginFormSection">
12-
<element name="username" type="input" locator="#username"/>
13-
<element name="password" type="input" locator="#login"/>
14-
<element name="signIn" type="button" locator=".actions .action-primary" timeout="30"/>
12+
<element name="username" type="input" selector="#username"/>
13+
<element name="password" type="input" selector="#login"/>
14+
<element name="signIn" type="button" selector=".actions .action-primary" timeout="30"/>
1515
</section>
1616
</config>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminMessagesSection.xml

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

99
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
10+
xsi:noNamespaceSchemaLocation="../../../../../../../../../../magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1111
<section name="AdminMessagesSection">
12-
<element name="test" type="input" locator=".test"/>
12+
<element name="test" type="input" selector=".test"/>
1313
</section>
1414
</config>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryBasicFieldSection.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1111
<section name="AdminCategoryBasicFieldSection">
12-
<element name="IncludeInMenu" type="checkbox" locator="input[name='include_in_menu']"/>
13-
<element name="EnableCategory" type="checkbox" locator="input[name='is_active']"/>
14-
<element name="CategoryNameInput" type="input" locator="input[name='name']"/>
12+
<element name="IncludeInMenu" type="checkbox" selector="input[name='include_in_menu']"/>
13+
<element name="EnableCategory" type="checkbox" selector="input[name='is_active']"/>
14+
<element name="CategoryNameInput" type="input" selector="input[name='name']"/>
1515
</section>
1616
</config>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryMainActionsSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1111
<section name="AdminCategoryMainActionsSection">
12-
<element name="SaveButton" type="button" locator=".page-actions-inner #save" timeout="30"/>
12+
<element name="SaveButton" type="button" selector=".page-actions-inner #save" timeout="30"/>
1313
</section>
1414
</config>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryMessagesSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1111
<section name="AdminCategoryMessagesSection">
12-
<element name="SuccessMessage" type="text" locator=".message-success"/>
12+
<element name="SuccessMessage" type="text" selector=".message-success"/>
1313
</section>
1414
</config>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySEOSection.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1111
<section name="AdminCategorySEOSection">
12-
<element name="SectionHeader" type="button" locator="div[data-index='search_engine_optimization']" timeout="30"/>
13-
<element name="UrlKeyInput" type="input" locator="input[name='url_key']"/>
14-
<element name="MetaTitleInput" type="input" locator="input[name='meta_title']"/>
15-
<element name="MetaKeywordsInput" type="textarea" locator="textarea[name='meta_keywords']"/>
16-
<element name="MetaDescriptionInput" type="textarea" locator="textarea[name='meta_description']"/>
12+
<element name="SectionHeader" type="button" selector="div[data-index='search_engine_optimization']" timeout="30"/>
13+
<element name="UrlKeyInput" type="input" selector="input[name='url_key']"/>
14+
<element name="MetaTitleInput" type="input" selector="input[name='meta_title']"/>
15+
<element name="MetaKeywordsInput" type="textarea" selector="textarea[name='meta_keywords']"/>
16+
<element name="MetaDescriptionInput" type="textarea" selector="textarea[name='meta_description']"/>
1717
</section>
1818
</config>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySidebarActionSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1111
<section name="AdminCategorySidebarActionSection">
12-
<element name="AddRootCategoryButton" type="button" locator="#add_root_category_button" timeout="30"/>
13-
<element name="AddSubcategoryButton" type="button" locator="#add_subcategory_button" timeout="30"/>
12+
<element name="AddRootCategoryButton" type="button" selector="#add_root_category_button" timeout="30"/>
13+
<element name="AddSubcategoryButton" type="button" selector="#add_subcategory_button" timeout="30"/>
1414
</section>
1515
</config>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySidebarTreeSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1111
<section name="AdminCategorySidebarTreeSection">
12-
<element name="Collapse All" type="button" locator=".tree-actions a:first-child"/>
13-
<element name="Expand All" type="button" locator=".tree-actions a:last-child"/>
12+
<element name="Collapse All" type="button" selector=".tree-actions a:first-child"/>
13+
<element name="Expand All" type="button" selector=".tree-actions a:last-child"/>
1414
</section>
1515
</config>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormActionSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1111
<section name="AdminProductFormActionSection">
12-
<element name="saveButton" type="button" locator="#save-button" timeout="30"/>
12+
<element name="saveButton" type="button" selector="#save-button" timeout="30"/>
1313
</section>
1414
</config>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -9,49 +9,49 @@
99
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1111
<section name="AdminProductFormSection">
12-
<element name="productName" type="input" locator=".admin__field[data-index=name] input"/>
13-
<element name="productSku" type="input" locator=".admin__field[data-index=sku] input"/>
14-
<element name="productPrice" type="input" locator=".admin__field[data-index=price] input"/>
15-
<element name="categoriesDropdown" type="multiselect" locator="div[data-index='category_ids']"/>
16-
<element name="productQuantity" type="input" locator=".admin__field[data-index=qty] input"/>
12+
<element name="productName" type="input" selector=".admin__field[data-index=name] input"/>
13+
<element name="productSku" type="input" selector=".admin__field[data-index=sku] input"/>
14+
<element name="productPrice" type="input" selector=".admin__field[data-index=price] input"/>
15+
<element name="categoriesDropdown" type="multiselect" selector="div[data-index='category_ids']"/>
16+
<element name="productQuantity" type="input" selector=".admin__field[data-index=qty] input"/>
1717
</section>
1818
<section name="AdminProductFormConfigurationsSection">
19-
<element name="createConfigurations" type="button" locator="button[data-index='create_configurable_products_button']" timeout="30"/>
20-
<element name="currentVariationsRows" type="button" locator=".data-row"/>
21-
<element name="currentVariationsNameCells" type="textarea" locator=".admin__control-fields[data-index='name_container']"/>
22-
<element name="currentVariationsSkuCells" type="textarea" locator=".admin__control-fields[data-index='sku_container']"/>
23-
<element name="currentVariationsPriceCells" type="textarea" locator=".admin__control-fields[data-index='price_container']"/>
24-
<element name="currentVariationsQuantityCells" type="textarea" locator=".admin__control-fields[data-index='quantity_container']"/>
25-
<element name="currentVariationsAttributesCells" type="textarea" locator=".admin__control-fields[data-index='attributes']"/>
19+
<element name="createConfigurations" type="button" selector="button[data-index='create_configurable_products_button']" timeout="30"/>
20+
<element name="currentVariationsRows" type="button" selector=".data-row"/>
21+
<element name="currentVariationsNameCells" type="textarea" selector=".admin__control-fields[data-index='name_container']"/>
22+
<element name="currentVariationsSkuCells" type="textarea" selector=".admin__control-fields[data-index='sku_container']"/>
23+
<element name="currentVariationsPriceCells" type="textarea" selector=".admin__control-fields[data-index='price_container']"/>
24+
<element name="currentVariationsQuantityCells" type="textarea" selector=".admin__control-fields[data-index='quantity_container']"/>
25+
<element name="currentVariationsAttributesCells" type="textarea" selector=".admin__control-fields[data-index='attributes']"/>
2626
</section>
2727
<section name="AdminCreateProductConfigurationsPanel">
28-
<element name="next" type="button" locator=".steps-wizard-navigation .action-next-step" timeout="30"/>
29-
<element name="createNewAttribute" type="button" locator=".select-attributes-actions button[title='Create New Attribute']" timeout="30"/>
30-
<element name="filters" type="button" locator="button[data-action='grid-filter-expand']"/>
31-
<element name="attributeCode" type="input" locator=".admin__control-text[name='attribute_code']"/>
32-
<element name="applyFilters" type="button" locator="button[data-action='grid-filter-apply']" timeout="30"/>
33-
<element name="firstCheckbox" type="input" locator="tr[data-repeat-index='0'] .admin__control-checkbox"/>
28+
<element name="next" type="button" selector=".steps-wizard-navigation .action-next-step" timeout="30"/>
29+
<element name="createNewAttribute" type="button" selector=".select-attributes-actions button[title='Create New Attribute']" timeout="30"/>
30+
<element name="filters" type="button" selector="button[data-action='grid-filter-expand']"/>
31+
<element name="attributeCode" type="input" selector=".admin__control-text[name='attribute_code']"/>
32+
<element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
33+
<element name="firstCheckbox" type="input" selector="tr[data-repeat-index='0'] .admin__control-checkbox"/>
3434

35-
<element name="selectAll" type="button" locator=".action-select-all"/>
36-
<element name="createNewValue" type="input" locator=".action-create-new" timeout="30"/>
37-
<element name="attributeName" type="input" locator="li[data-attribute-option-title=''] .admin__field-create-new .admin__control-text"/>
38-
<element name="saveAttribute" type="button" locator="li[data-attribute-option-title=''] .action-save" timeout="30"/>
35+
<element name="selectAll" type="button" selector=".action-select-all"/>
36+
<element name="createNewValue" type="input" selector=".action-create-new" timeout="30"/>
37+
<element name="attributeName" type="input" selector="li[data-attribute-option-title=''] .admin__field-create-new .admin__control-text"/>
38+
<element name="saveAttribute" type="button" selector="li[data-attribute-option-title=''] .action-save" timeout="30"/>
3939

40-
<element name="applyUniquePricesByAttributeToEachSku" type="radio" locator=".admin__field-label[for='apply-unique-prices-radio']"/>
41-
<element name="selectAttribute" type="select" locator="#select-each-price" timeout="30"/>
42-
<element name="attribute1" type="input" locator="#apply-single-price-input-0"/>
43-
<element name="attribute2" type="input" locator="#apply-single-price-input-1"/>
44-
<element name="attribute3" type="input" locator="#apply-single-price-input-2"/>
40+
<element name="applyUniquePricesByAttributeToEachSku" type="radio" selector=".admin__field-label[for='apply-unique-prices-radio']"/>
41+
<element name="selectAttribute" type="select" selector="#select-each-price" timeout="30"/>
42+
<element name="attribute1" type="input" selector="#apply-single-price-input-0"/>
43+
<element name="attribute2" type="input" selector="#apply-single-price-input-1"/>
44+
<element name="attribute3" type="input" selector="#apply-single-price-input-2"/>
4545

46-
<element name="applySingleQuantityToEachSkus" type="radio" locator=".admin__field-label[for='apply-single-inventory-radio']" timeout="30"/>
47-
<element name="quantity" type="input" locator="#apply-single-inventory-input"/>
46+
<element name="applySingleQuantityToEachSkus" type="radio" selector=".admin__field-label[for='apply-single-inventory-radio']" timeout="30"/>
47+
<element name="quantity" type="input" selector="#apply-single-inventory-input"/>
4848
</section>
4949
<section name="AdminNewAttributePanel">
50-
<element name="saveAttribute" type="button" locator="#save" timeout="30"/>
51-
<element name="newAttributeIFrame" type="iframe" locator="create_new_attribute_container"/>
52-
<element name="defaultLabel" type="input" locator="#attribute_label"/>
50+
<element name="saveAttribute" type="button" selector="#save" timeout="30"/>
51+
<element name="newAttributeIFrame" type="iframe" selector="create_new_attribute_container"/>
52+
<element name="defaultLabel" type="input" selector="#attribute_label"/>
5353
</section>
5454
<section name="AdminChooseAffectedAttributeSetPopup">
55-
<element name="confirm" type="button" locator="button[data-index='confirm_button']" timeout="30"/>
55+
<element name="confirm" type="button" selector="button[data-index='confirm_button']" timeout="30"/>
5656
</section>
5757
</config>

0 commit comments

Comments
 (0)