Skip to content

Commit

Permalink
Merge pull request magento#197 from magento-pangolin/MC-148
Browse files Browse the repository at this point in the history
MC-148
  • Loading branch information
RyanZolper authored Jul 25, 2019
2 parents ff5c9c3 + 03187f8 commit 8d55e04
Show file tree
Hide file tree
Showing 6 changed files with 300 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<element name="catalogRuleIdentifierSearch" type="input" selector=".col-name .admin__control-text"/>
<element name="searchButton" type="input" selector=".admin__filter-actions [title='Search']"/>
<element name="firstRow" type="block" selector="tr[data-role='row']"/>
<element name="rowByName" type="block" selector="//td[contains(text(), '{{searchingName}}')]" parameterized="true" timeout="30"/>
</section>
</sections>

21 changes: 21 additions & 0 deletions app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
Original file line number Diff line number Diff line change
Expand Up @@ -343,4 +343,25 @@
<data key="used_for_sort_by">true</data>
<requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
</entity>
<entity name="productAttributeDropdownTwoOptions" type="ProductAttribute">
<data key="attribute_code" unique="suffix">testattribute</data>
<data key="frontend_input">select</data>
<data key="scope">Global</data>
<data key="is_required">false</data>
<data key="is_unique">false</data>
<data key="is_searchable">true</data>
<data key="is_visible">true</data>
<data key="is_visible_in_advanced_search">true</data>
<data key="is_visible_on_front">true</data>
<data key="is_filterable">true</data>
<data key="is_filterable_in_search">true</data>
<data key="used_in_product_listing">true</data>
<data key="is_used_for_promo_rules">true</data>
<data key="is_comparable">true</data>
<data key="is_used_in_grid">true</data>
<data key="is_visible_in_grid">true</data>
<data key="is_filterable_in_grid">true</data>
<data key="used_for_sort_by">true</data>
<requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
</entity>
</entities>
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<element name="checkIfTabOpen" selector="//div[@id='advanced_fieldset-wrapper' and not(contains(@class,'opened'))]" type="button"/>
<element name="useInLayeredNavigation" type="select" selector="#is_filterable"/>
<element name="addSwatch" type="button" selector="#add_new_swatch_text_option_button"/>
<element name="dropdownAddOptions" type="button" selector="#add_new_option_button"/>
<element name="dropdownAddOptions" type="button" selector="#add_new_option_button" timeout="30"/>
<!-- Manage Options nth child-->
<element name="dropdownNthOptionIsDefault" type="checkbox" selector="tbody[data-role='options-container'] tr:nth-child({{var}}) .input-radio" parameterized="true"/>
<element name="dropdownNthOptionAdmin" type="textarea" selector="tbody[data-role='options-container'] tr:nth-child({{var}}) td:nth-child(3) input" parameterized="true"/>
Expand Down
16 changes: 16 additions & 0 deletions app/code/Magento/CatalogRule/Test/Mftf/Data/CatalogRuleData.xml
Original file line number Diff line number Diff line change
Expand Up @@ -157,4 +157,20 @@
<data key="simple_action">by_percent</data>
<data key="discount_amount">10</data>
</entity>
<entity name="SimpleCatalogPriceRule">
<data key="name" unique="suffix">Catalog Price Rule1</data>
<data key="description">Description for Cart Price Rule</data>
<data key="is_active">Yes</data>
<data key="websites">Main Website</data>
<data key="customerGroups">NOT LOGGED IN</data>
<data key="coupon_type">No Coupon</data>
<data key="simple_action">Percent of product price discount</data>
<data key="discount_amount">50</data>
<data key="maximumQtyDiscount">0</data>
<data key="discount_step">0</data>
<data key="apply_to_shipping">0</data>
<data key="simple_free_shipping">For matching items only</data>
<data key="defaultRuleLabelAllStoreViews">Free Shipping in conditions</data>
<data key="defaultStoreView">Free Shipping in conditions</data>
</entity>
</entities>
Loading

0 comments on commit 8d55e04

Please sign in to comment.