Merge remote-tracking branch 'goinc/MAGETWO-31058' into MAGETWO-31159 (9cd7866f) · Commits · KIII-12 / Magento

Commit 9cd7866f authored 10 years ago by

Vlad Veselov

Browse files

Merge remote-tracking branch 'goinc/MAGETWO-31058' into MAGETWO-31159

parents 1fa94152 cdcc72ad

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Backend/Test/Unit/Model/Menu/Filter/IteratorTest.php 21 additions, 13 deletions

...ento/Backend/Test/Unit/Model/Menu/Filter/IteratorTest.php
app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php 0 additions, 1 deletion

.../Catalog/Model/Product/Option/Type/File/ValidatorFile.php
app/code/Magento/Checkout/Test/Unit/Controller/Onepage/SaveBillingTest.php 1 addition, 0 deletions

...Checkout/Test/Unit/Controller/Onepage/SaveBillingTest.php
app/code/Magento/Checkout/Test/Unit/Controller/Onepage/SaveShippingTest.php 1 addition, 0 deletions

...heckout/Test/Unit/Controller/Onepage/SaveShippingTest.php
app/code/Magento/Cms/Test/Unit/Block/Adminhtml/Block/EditTest.php 2 additions, 2 deletions

.../Magento/Cms/Test/Unit/Block/Adminhtml/Block/EditTest.php
app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmTest.php 4 additions, 4 deletions

...nto/Customer/Test/Unit/Controller/Account/ConfirmTest.php
app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php 1 addition, 1 deletion

...ode/Magento/GroupedProduct/Model/Product/Type/Grouped.php
app/code/Magento/Indexer/Test/Unit/Model/Config/ConverterTest.php 0 additions, 20 deletions

.../Magento/Indexer/Test/Unit/Model/Config/ConverterTest.php
app/code/Magento/Indexer/Test/Unit/Model/Resource/AbstractResourceTest.php 1 addition, 1 deletion

...Indexer/Test/Unit/Model/Resource/AbstractResourceTest.php
app/code/Magento/Sales/Test/Unit/Model/Order/Total/Config/BaseTest.php 0 additions, 4 deletions

...nto/Sales/Test/Unit/Model/Order/Total/Config/BaseTest.php
app/code/Magento/Webapi/Model/Soap/Server.php 1 addition, 13 deletions

app/code/Magento/Webapi/Model/Soap/Server.php
app/code/Magento/Webapi/etc/adminhtml/system.xml 0 additions, 5 deletions

app/code/Magento/Webapi/etc/adminhtml/system.xml
app/code/Magento/Wishlist/Test/Unit/Controller/Index/UpdateItemOptionsTest.php 4 additions, 6 deletions

...list/Test/Unit/Controller/Index/UpdateItemOptionsTest.php
dev/tests/integration/framework/bootstrap.php 1 addition, 1 deletion

dev/tests/integration/framework/bootstrap.php
dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Cache/MassActionTest.php 29 additions, 27 deletions

...nto/Backend/Controller/Adminhtml/Cache/MassActionTest.php
dev/tests/integration/testsuite/Magento/Catalog/Controller/ProductTest.php 11 additions, 0 deletions

...tion/testsuite/Magento/Catalog/Controller/ProductTest.php
dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFileTest.php 21 additions, 6 deletions

...alog/Model/Product/Option/Type/File/ValidatorFileTest.php
dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorInfoTest.php 11 additions, 1 deletion

...alog/Model/Product/Option/Type/File/ValidatorInfoTest.php
dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php 1 addition, 1 deletion

.../Magento/CatalogImportExport/Model/Import/ProductTest.php
dev/tests/integration/testsuite/Magento/Checkout/Block/Cart/Item/RendererTest.php 1 addition, 0 deletions

...stsuite/Magento/Checkout/Block/Cart/Item/RendererTest.php

with 111 additions and 106 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'goinc/MAGETWO-31058' into MAGETWO-31159