Skip to content

Commit

Permalink
Merge pull request #7 from magento/2.3-develop
Browse files Browse the repository at this point in the history
Magento 2.3-develop Latest Pull
  • Loading branch information
niravkrish authored Jan 25, 2019
2 parents 75d3b00 + 8e2ca94 commit 2258f50
Show file tree
Hide file tree
Showing 345 changed files with 6,332 additions and 1,532 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@
<element name="save" type="button" selector="#save" timeout="30"/>
<element name="saveAndContinue" type="button" selector="button[id*=save_and_continue]" timeout="30"/>
<element name="delete" type="button" selector="#delete" timeout="30"/>
<element name="add" type="button" selector="#add" timeout="30"/>
</section>
</sections>
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,10 @@
<element name="widgets" type="button" selector="#nav li[data-ui-id='menu-magento-widget-cms-widget-instance']"/>
<element name="stores" type="button" selector="#menu-magento-backend-stores"/>
<element name="configuration" type="button" selector="#nav li[data-ui-id='menu-magento-config-system-config']"/>
<element name="dashboard" type="button" selector="//li[@id='menu-magento-backend-dashboard']"/>
<element name="sales" type="button" selector="//li[@id='menu-magento-sales-sales']"/>
<element name="marketing" type="button" selector="//li[@id='menu-magento-backend-marketing']"/>
<element name="system" type="button" selector="//li[@id='menu-magento-backend-system']"/>
<element name="findPartners" type="button" selector="//li[@id='menu-magento-marketplace-partners']"/>
</section>
</sections>
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
<test name="AdminAttributeTextSwatchesCanBeFiledTest">
<annotations>
<features value="Backend"/>
<stories value="Unable to add more attributes in size"/>
<title value="Check that attribute text swatches can be filed"/>
<description value="Check that attribute text swatches can be filed"/>
<severity value="MAJOR"/>
<testCaseId value="MAGETWO-96710"/>
<useCaseId value="MAGETWO-96409"/>
<group value="backend"/>
<group value="ui"/>
</annotations>
<before>

<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>

</before>
<after>
<!-- Delete all 10 store views -->
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView1">
<argument name="customStore" value="customStore"/>
</actionGroup>
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView2">
<argument name="customStore" value="NewStoreViewData"/>
</actionGroup>
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView3">
<argument name="customStore" value="storeViewData"/>
</actionGroup>
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView4">
<argument name="customStore" value="storeViewData1"/>
</actionGroup>
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView5">
<argument name="customStore" value="storeViewData2"/>
</actionGroup>
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView6">
<argument name="customStore" value="storeViewData3"/>
</actionGroup>
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView7">
<argument name="customStore" value="storeViewData4"/>
</actionGroup>
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView8">
<argument name="customStore" value="storeViewData5"/>
</actionGroup>
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView9">
<argument name="customStore" value="storeViewData6"/>
</actionGroup>
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView10">
<argument name="customStore" value="storeViewData7"/>
</actionGroup>

<actionGroup ref="logout" stepKey="logout"/>
</after>

<!-- Create 10 store views -->
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView1">
<argument name="customStore" value="customStore"/>
</actionGroup>
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView2">
<argument name="customStore" value="NewStoreViewData"/>
</actionGroup>
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView3">
<argument name="customStore" value="storeViewData"/>
</actionGroup>
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView4">
<argument name="customStore" value="storeViewData1"/>
</actionGroup>
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView5">
<argument name="customStore" value="storeViewData2"/>
</actionGroup>
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView6">
<argument name="customStore" value="storeViewData3"/>
</actionGroup>
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView7">
<argument name="customStore" value="storeViewData4"/>
</actionGroup>
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView8">
<argument name="customStore" value="storeViewData5"/>
</actionGroup>
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView9">
<argument name="customStore" value="storeViewData6"/>
</actionGroup>
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView10">
<argument name="customStore" value="storeViewData7"/>
</actionGroup>

<!--Navigate to Product attribute page-->
<amOnPage url="{{ProductAttributePage.url}}" stepKey="navigateToNewProductAttributePage"/>
<waitForPageLoad stepKey="waitForPageLoad"/>
<fillField userInput="test_label" selector="{{AttributePropertiesSection.DefaultLabel}}" stepKey="fillDefaultLabel"/>
<selectOption selector="{{AttributePropertiesSection.InputType}}" userInput="Text Swatch" stepKey="selectInputType"/>
<click selector="{{AttributePropertiesSection.addSwatch}}" stepKey="clickAddSwatch"/>
<waitForAjaxLoad stepKey="waitForAjaxLoad"/>

<!-- Fill Swatch and Description fields for Admin -->
<fillField selector="{{AttributeManageSwatchSection.swatchField('Admin')}}" userInput="test" stepKey="fillSwatchForAdmin"/>
<fillField selector="{{AttributeManageSwatchSection.descriptionField('Admin')}}" userInput="test" stepKey="fillDescriptionForAdmin"/>

<!-- Grab value Swatch and Description fields for Admin -->
<grabValueFrom selector="{{AttributeManageSwatchSection.swatchField('Admin')}}" stepKey="grabSwatchForAdmin"/>
<grabValueFrom selector="{{AttributeManageSwatchSection.descriptionField('Admin')}}" stepKey="grabDescriptionForAdmin"/>

<!-- Check that Swatch and Description fields for Admin are not empty-->
<assertNotEmpty actual="$grabSwatchForAdmin" stepKey="checkSwatchFieldForAdmin"/>
<assertNotEmpty actual="$grabDescriptionForAdmin" stepKey="checkDescriptionFieldForAdmin"/>
</test>
</tests>
1 change: 1 addition & 0 deletions app/code/Magento/Backend/etc/module.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<module name="Magento_Backend">
<sequence>
<module name="Magento_Directory"/>
<module name="Magento_Theme"/>
</sequence>
</module>
</config>
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<?php $_tabType = (!preg_match('/\s?ajax\s?/', $_tabClass) && $block->getTabUrl($_tab) != '#') ? 'link' : '' ?>
<?php $_tabHref = $block->getTabUrl($_tab) == '#' ? '#' . $block->getTabId($_tab) . '_content' : $block->getTabUrl($_tab) ?>
<li>
<a href="<?= /* @escapeNotVerified */ $_tabHref ?>" id="<?= /* @escapeNotVerified */ $block->getTabId($_tab) ?>" title="<?= /* @escapeNotVerified */ $block->getTabTitle($_tab) ?>" class="<?php $_tabClass ?>" data-tab-type="<?php $_tabType ?>">
<a href="<?= $block->escapeHtmlAttr($_tabHref) ?>" id="<?= $block->escapeHtmlAttr($block->getTabId($_tab)) ?>" title="<?= $block->escapeHtmlAttr($block->getTabTitle($_tab)) ?>" class="<?= $block->escapeHtmlAttr($_tabClass) ?>" data-tab-type="<?= $block->escapeHtmlAttr($_tabType) ?>">
<span>
<span class="changed" title="<?= /* @escapeNotVerified */ __('The information in this tab has been changed.') ?>"></span>
<span class="error" title="<?= /* @escapeNotVerified */ __('This tab contains invalid data. Please resolve this before saving.') ?>"></span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*/
-->
<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
<listingToolbar name="listing_top" />
<columns name="design_config_columns">
<column name="theme_theme_id" component="Magento_Ui/js/grid/columns/select" sortOrder="40">
<settings>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/
-->
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">

<actionGroup name="AdminOrderBraintreeFillActionGroup">
<!--Select Braintree Payment method on Admin Order Create Page-->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<!-- GoTo ConfigureBraintree fields -->
<click stepKey="clickOnSTORES" selector="{{AdminMenuSection.stores}}"/>
<waitForPageLoad stepKey="waitForConfiguration" time="2"/>
<click stepKey="clickOnConfigurations" selector="{{StoresSubmenuSection.configuration}}" />
<click stepKey="clickOnConfigurations" selector="{{AdminMenuSection.configuration}}" />
<waitForPageLoad stepKey="waitForSales" time="2"/>
<click stepKey="clickOnSales" selector="{{ConfigurationListSection.sales}}" />
<waitForPageLoad stepKey="waitForPaymentMethods" time="2"/>
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

23 changes: 0 additions & 23 deletions app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
* See COPYING.txt for license details.
*/
-->
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
<section name="BraintreeConfiguraionSection">
<element name="titleForBraintreeSettings" type="input" selector="//input[@id='payment_us_braintree_section_braintree_braintree_required_title']"/>
<element name="environment" type="select" selector="//select[@id='payment_us_braintree_section_braintree_braintree_required_environment']"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
-->

<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
<section name="ConfigurationPaymentSection">
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
<section name="ConfigurationPaymentSection">
<element name="configureButton" type="button" selector="//button[@id='payment_us_braintree_section_braintree-head']"/>
</section>
</sections>

This file was deleted.

Loading

0 comments on commit 2258f50

Please sign in to comment.