Merge pull request #107 from magento-pangolin/2.3-dev-pan-2.3.6

2.3 dev pan 2.3.6
magento · Sep 14, 2018 · 750628e · 750628e
2 parents 1a5ed8d + 6fe8311
commit 750628e
Show file tree

Hide file tree

Showing 30 changed files with 27,366 additions and 14,125 deletions.
diff --git a/app/code/Magento/Tax/Test/Mftf/Section/AdminConfigureTaxSection.xml b/app/code/Magento/Tax/Test/Mftf/Section/AdminConfigureTaxSection.xml
@@ -35,6 +35,7 @@
         <element name="taxDisplayProductPricesDisabled" type="select" selector="#tax_display_type[disabled='disabled']"/>
         <element name="taxDisplayProductPricesInherit" type="checkbox" selector="#tax_display_type_inherit"/>
 
+        <element name="taxSalesDisplay" type="block" selector=".config.admin__collapsible-block#tax_sales_display" timeout="30"/>
         <element name="shoppingCartDisplay" type="block" selector="#tax_cart_display-head" timeout="30"/>
         <element name="systemValueIncludeTaxTotalCart" type="checkbox" selector="#row_tax_cart_display_grandtotal input[type='checkbox']"/>
         <element name="dropdownIncludeTaxTotalCart" type="checkbox" selector="#row_tax_cart_display_grandtotal select"/>

diff --git a/composer.json b/composer.json
@@ -84,7 +84,7 @@
     "require-dev": {
         "friendsofphp/php-cs-fixer": "~2.13.0",
         "lusitanian/oauth": "~0.8.10",
-        "magento/magento2-functional-testing-framework": "2.3.5",
+        "magento/magento2-functional-testing-framework": "2.3.6",
         "pdepend/pdepend": "2.5.2",
         "phpmd/phpmd": "@stable",
         "phpunit/phpunit": "~6.5.0",

diff --git a/composer.lock b/composer.lock
diff --git a/setup/pub/angular-ng-storage/angular-ng-storage.min.js b/setup/pub/angular-ng-storage/angular-ng-storage.min.js