Merge remote-tracking branch 'mainline/develop' into MAGETWO-58976 (b4f69c3d) · Commits · KIII-12 / Magento

Commit b4f69c3d authored 8 years ago by

Oleksandr Shmyheliuk

Browse files

Merge remote-tracking branch 'mainline/develop' into MAGETWO-58976

parents adb3c21a dbbf9252

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php 5 additions, 0 deletions

...gento/Catalog/Controller/Adminhtml/Product/MassStatus.php
app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/MassStatusTest.php 102 additions, 36 deletions

...Test/Unit/Controller/Adminhtml/Product/MassStatusTest.php
app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/ProductTest.php 22 additions, 4 deletions

...to/Catalog/Test/Unit/Controller/Adminhtml/ProductTest.php
app/code/Magento/Ui/view/base/web/js/grid/data-storage.js 4 additions, 0 deletions

app/code/Magento/Ui/view/base/web/js/grid/data-storage.js
dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutTest.xml 5 additions, 5 deletions

...agento/Authorizenet/Test/TestCase/OnePageCheckoutTest.xml
dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/BraintreeSettlementReportTest.php 1 addition, 0 deletions

...Braintree/Test/TestCase/BraintreeSettlementReportTest.php
dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/BraintreeSettlementReportTest.xml 1 addition, 1 deletion

...Braintree/Test/TestCase/BraintreeSettlementReportTest.xml
dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.php 1 addition, 0 deletions

...ree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.php
dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.xml 2 additions, 2 deletions

...ree/Test/TestCase/CheckoutWithBraintreePaypalCartTest.xml
dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.php 1 addition, 0 deletions

...Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.php
dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.xml 2 additions, 2 deletions

...Test/TestCase/CheckoutWithBraintreePaypalMinicartTest.xml
dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.php 1 addition, 0 deletions

...st/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.php
dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.xml 2 additions, 4 deletions

...st/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.xml
dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineInvoiceEntityTest.xml 2 additions, 2 deletions

...Braintree/Test/TestCase/CreateOnlineInvoiceEntityTest.xml
dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderBackendTest.xml 2 additions, 4 deletions

...agento/Braintree/Test/TestCase/CreateOrderBackendTest.xml
dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateVaultOrderBackendTest.xml 1 addition, 1 deletion

...o/Braintree/Test/TestCase/CreateVaultOrderBackendTest.xml
dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/InvoicePayPalBraintreeTest.php 1 addition, 0 deletions

...to/Braintree/Test/TestCase/InvoicePayPalBraintreeTest.php
dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/InvoicePaypalBraintreeTest.xml 2 additions, 2 deletions

...to/Braintree/Test/TestCase/InvoicePaypalBraintreeTest.xml
dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.php 12 additions, 4 deletions

...intree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.php
dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.xml 1 addition, 1 deletion

...intree/Test/TestCase/OnePageCheckoutAcceptPaymentTest.xml

with 170 additions and 68 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'mainline/develop' into MAGETWO-58976