Merge remote-tracking branch 'origin/MAGETWO-58855' into 2.1.8-develop-pr17

Author: zakdma

app/code/Magento/SalesRule/Model/CouponRepository.php

@@ -172,19 +172,16 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
                 ($sortOrder->getDirection() == SortOrder::SORT_ASC) ? 'ASC' : 'DESC'
             );
         }
+
         $collection->setCurPage($searchCriteria->getCurrentPage());
         $collection->setPageSize($searchCriteria->getPageSize());
 
-        $coupons = [];
-        /** @var \Magento\SalesRule\Model\Coupon $couponModel */
-        foreach ($collection->getItems() as $couponModel) {
-            $coupons[] = $couponModel->getData();
-        }
-
+        /** @var \Magento\SalesRule\Api\Data\CouponSearchResultInterface $searchResults */
         $searchResults = $this->searchResultFactory->create();
         $searchResults->setSearchCriteria($searchCriteria);
-        $searchResults->setItems($coupons);
+        $searchResults->setItems($collection->getItems());
         $searchResults->setTotalCount($collection->getSize());
+
         return $searchResults;
     }
 

app/code/Magento/SalesRule/Test/Unit/Model/CouponRepositoryTest.php

@@ -6,6 +6,7 @@
 namespace Magento\SalesRule\Test\Unit\Model;
 
 use Magento\Framework\Api\SortOrder;
+use Magento\SalesRule\Api\Data\CouponInterface;
 
 class CouponRepositoryTest extends \PHPUnit_Framework_TestCase
 {
@@ -214,6 +215,11 @@ public function testGetList()
         $currentPage = 42;
         $pageSize = 4;
 
+        /** @var CouponInterface|\PHPUnit_Framework_MockObject_MockObject $couponMock */
+        $couponMock = $this->getMockBuilder(CouponInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         /**
          * @var \Magento\Framework\Api\SearchCriteriaInterface $searchCriteriaMock
          */
@@ -248,8 +254,8 @@ public function testGetList()
         $collectionMock->expects($this->once())->method('setCurPage')->with($currentPage);
         $searchCriteriaMock->expects($this->once())->method('getPageSize')->willReturn($pageSize);
         $collectionMock->expects($this->once())->method('setPageSize')->with($pageSize);
-        $collectionMock->expects($this->once())->method('getItems')->willReturn([]);
-        $this->searchResultsMock->expects($this->once())->method('setItems')->with([]);
+        $collectionMock->expects($this->once())->method('getItems')->willReturn([$couponMock]);
+        $this->searchResultsMock->expects($this->once())->method('setItems')->with([$couponMock]);
         $this->searchResultFactory->expects($this->once())->method('create')->willReturn($this->searchResultsMock);
 
         $this->assertEquals($this->searchResultsMock, $this->model->getList($searchCriteriaMock));