Merge pull request #530 from magento-folks/bugs

[Folks] Bugfix
magento · Apr 15, 2016 · 2a71879 · 2a71879
2 parents ea52f98 + a7b60da
commit 2a71879
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 3 deletions.
diff --git a/app/code/Magento/Checkout/Model/Cart.php b/app/code/Magento/Checkout/Model/Cart.php
@@ -14,6 +14,7 @@
 /**
  * Shopping cart model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @deprecated 
  */
 class Cart extends DataObject implements CartInterface
 {

diff --git a/app/code/Magento/Checkout/Model/Cart/CartInterface.php b/app/code/Magento/Checkout/Model/Cart/CartInterface.php
@@ -11,6 +11,7 @@
  * Shopping cart interface
  *
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @deprecated
  */
 interface CartInterface
 {

diff --git a/app/code/Magento/Checkout/Model/Sidebar.php b/app/code/Magento/Checkout/Model/Sidebar.php
@@ -12,6 +12,9 @@
 use Magento\Quote\Api\Data\CartItemInterface;
 use Magento\Quote\Model\Quote\Address\Total;
 
+/**
+ * @deprecated
+ */
 class Sidebar
 {
     /**

diff --git a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
@@ -219,6 +219,15 @@ public function getAssociatedProducts($product)
         return $product->getData($this->_keyAssociatedProducts);
     }
 
+    /**
+     * @param \Magento\Catalog\Model\Product $product
+     * @return \Magento\Catalog\Model\Product
+     */
+    public function flushAssociatedProductsCache($product)
+    {
+        return $product->unsData($this->_keyAssociatedProducts);
+    }
+
     /**
      * Add status filter to collection
      *

diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/GroupedTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/GroupedTest.php
@@ -375,7 +375,6 @@ public function testPrepareForCartAdvancedEmpty()
             $this->_model->prepareForCartAdvanced($buyRequest, $this->product)
         );
 
-
         $buyRequest->setSuperGroup(1);
         $this->assertEquals(
             $expectedMsg,
@@ -603,4 +602,14 @@ public function testPrepareForCartAdvancedZeroQty()
             ->will($this->returnValue([$associatedProduct]));
         $this->assertEquals($expectedMsg, $this->_model->prepareForCartAdvanced($buyRequest, $this->product));
     }
+
+    public function testFlushAssociatedProductsCache()
+    {
+        $productMock = $this->getMock('\Magento\Catalog\Model\Product', ['unsData'], [], '', false);
+        $productMock->expects($this->once())
+            ->method('unsData')
+            ->with('_cache_instance_associated_products')
+            ->willReturnSelf();
+        $this->assertEquals($productMock, $this->_model->flushAssociatedProductsCache($productMock));
+    }
 }
diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
@@ -1,6 +1,6 @@
 {
     "require": {
-        "magento/mtf": "1.0.0-rc41",
+        "magento/mtf": "1.0.0-rc42",
         "php": "~5.5.22|~5.6.0|~7.0.0",
         "phpunit/phpunit": "4.1.0",
         "phpunit/phpunit-selenium": ">=1.2"

diff --git a/dev/tests/functional/lib/Magento/Mtf/System/Observer/WebapiResponse.php b/dev/tests/functional/lib/Magento/Mtf/System/Observer/WebapiResponse.php
@@ -27,6 +27,9 @@ class WebapiResponse extends AbstractObserver
     public function process(Event $event)
     {
         $directory = $this->createDestinationDirectory('webapi-response');
-        $this->logger->log(json_encode($event->getSubjects()[0]), $directory . '/' . $event->getIdentifier() . '.json');
+        $this->logger->log(
+            json_encode($event->getSubjects()[0]),
+            $directory . '/' . $event->getFileIdentifier() . '.json'
+        );
     }
 }