Merge branch 'develop' into FearlessKiwis-MAGETWO-55867-New-Incorrect-Time (6afbeaac) · Commits · KIII-12 / Magento

There was an error fetching the commit references. Please try again later.

Commit 6afbeaac authored 8 years ago by

Arpita Barua

Browse files

Merge branch 'develop' into FearlessKiwis-MAGETWO-55867-New-Incorrect-Time

parents e32e8c98 0cb8b17b

Expand all Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/CatalogInventory/Model/Stock/Status.php 1 addition, 1 deletion

app/code/Magento/CatalogInventory/Model/Stock/Status.php
app/code/Magento/Checkout/Test/Unit/Model/ShippingInformationManagementTest.php 177 additions, 397 deletions

...out/Test/Unit/Model/ShippingInformationManagementTest.php
app/code/Magento/Customer/Test/Unit/Model/Address/AbstractAddressTest.php 2 additions, 3 deletions

.../Customer/Test/Unit/Model/Address/AbstractAddressTest.php
app/code/Magento/Paypal/Model/Config.php 1 addition, 1 deletion

app/code/Magento/Paypal/Model/Config.php
app/code/Magento/Quote/Test/Unit/Model/BillingAddressManagementTest.php 63 additions, 78 deletions

...to/Quote/Test/Unit/Model/BillingAddressManagementTest.php
app/code/Magento/Quote/Test/Unit/Model/Quote/Item/RepositoryTest.php 85 additions, 389 deletions

...gento/Quote/Test/Unit/Model/Quote/Item/RepositoryTest.php
app/code/Magento/Quote/Test/Unit/Model/QuoteAddressValidatorTest.php 3 additions, 50 deletions

...gento/Quote/Test/Unit/Model/QuoteAddressValidatorTest.php
app/code/Magento/Quote/Test/Unit/Model/QuoteRepositoryTest.php 73 additions, 16 deletions

...ode/Magento/Quote/Test/Unit/Model/QuoteRepositoryTest.php
app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php 184 additions, 44 deletions

...o/Quote/Test/Unit/Model/ShippingAddressManagementTest.php
app/code/Magento/Quote/Test/Unit/Model/ShippingMethodManagementTest.php 33 additions, 55 deletions

...to/Quote/Test/Unit/Model/ShippingMethodManagementTest.php
app/code/Magento/Vault/Setup/UpgradeData.php 28 additions, 1 deletion

app/code/Magento/Vault/Setup/UpgradeData.php
dev/tests/api-functional/testsuite/Magento/Bundle/Api/ProductLinkManagementTest.php 0 additions, 1 deletion

...estsuite/Magento/Bundle/Api/ProductLinkManagementTest.php
dev/tests/api-functional/testsuite/Magento/Bundle/Api/ProductServiceTest.php 1 addition, 6 deletions

...ional/testsuite/Magento/Bundle/Api/ProductServiceTest.php
dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryLinkRepositoryTest.php 0 additions, 22 deletions

...tsuite/Magento/Catalog/Api/CategoryLinkRepositoryTest.php
dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestCartTotalRepositoryTest.php 16 additions, 2 deletions

...tsuite/Magento/Quote/Api/GuestCartTotalRepositoryTest.php
dev/tests/api-functional/testsuite/Magento/Quote/Api/ShippingMethodManagementTest.php 2 additions, 3 deletions

...tsuite/Magento/Quote/Api/ShippingMethodManagementTest.php
dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditmemoCancelTest.php 3 additions, 3 deletions

...stsuite/Magento/Sales/Service/V1/CreditmemoCancelTest.php
dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct/CheckoutData.xml 2 additions, 2 deletions

...nto/Bundle/Test/Repository/BundleProduct/CheckoutData.xml
dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual/CheckoutData.xml 5 additions, 0 deletions

...og/Test/Repository/CatalogProductVirtual/CheckoutData.xml
dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar/Item.php 1 addition, 1 deletion

...sts/app/Magento/Checkout/Test/Block/Cart/Sidebar/Item.php

with 680 additions and 1075 deletions

Please register or to comment

Admin message

Merge branch 'develop' into FearlessKiwis-MAGETWO-55867-New-Incorrect-Time