MAGETWO-60873: Process pull-request (05c4fc00) · Commits · KIII-12 / Magento

Commit 05c4fc00 authored 8 years ago by

Oleksandr Dubovyk

MAGETWO-60873: Process pull-request

- Merge remote-tracking branch 'mainline/develop' into pull-primary
- Conflicts:
- dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product/CustomOptions.xml

parents b77f3fa8 13db0b11

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/CategoryForm.xml 4 additions, 0 deletions

...talog/Test/Block/Adminhtml/Category/Edit/CategoryForm.xml
dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/PageActions.php 39 additions, 0 deletions

...atalog/Test/Block/Adminhtml/Category/Edit/PageActions.php
dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php 27 additions, 0 deletions

...pp/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php 30 additions, 4 deletions

...ento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php
dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/TopToolbar.php 2 additions, 3 deletions

...nto/Catalog/Test/Block/Product/ProductList/TopToolbar.php
dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml 1 addition, 0 deletions

...ional/tests/app/Magento/Catalog/Test/Fixture/Category.xml
dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml 231 additions, 0 deletions

.../Magento/Catalog/Test/Repository/CatalogProductSimple.xml
dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple/CheckoutData.xml 50 additions, 0 deletions

...log/Test/Repository/CatalogProductSimple/CheckoutData.xml
dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product/CustomOptions.xml 25 additions, 1 deletion

...Magento/Catalog/Test/Repository/Product/CustomOptions.xml
dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml 5 additions, 4 deletions

...talog/Test/TestCase/Category/CreateCategoryEntityTest.xml
dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml 1 addition, 0 deletions

...g/Test/TestCase/Product/CreateSimpleProductEntityTest.xml
dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplyCatalogPriceRulesTest.php 33 additions, 24 deletions

.../CatalogRule/Test/TestCase/ApplyCatalogPriceRulesTest.php
dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplyCatalogPriceRulesTest.xml 39 additions, 6 deletions

.../CatalogRule/Test/TestCase/ApplyCatalogPriceRulesTest.xml
dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php 11 additions, 10 deletions

...l/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php
dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php 17 additions, 0 deletions

...al/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php
dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/CustomAddress.php 51 additions, 0 deletions

...app/Magento/Checkout/Test/Block/Onepage/CustomAddress.php
dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Method/Billing.php 18 additions, 0 deletions

...to/Checkout/Test/Block/Onepage/Payment/Method/Billing.php
dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.php 92 additions, 0 deletions

...ests/app/Magento/Checkout/Test/Block/Onepage/Shipping.php
dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping/Method.php 2 additions, 2 deletions

...p/Magento/Checkout/Test/Block/Onepage/Shipping/Method.php
dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/ShippingPopup.php 32 additions, 0 deletions

...app/Magento/Checkout/Test/Block/Onepage/ShippingPopup.php

with 710 additions and 54 deletions

Please register or to comment

Admin message

MAGETWO-60873: Process pull-request