1 files changed, 24 insertions, 3 deletions

diff --git a/tests/Unit/Service/FeedServiceTest.php b/tests/Unit/Service/FeedServiceTest.php
index c7b06040a..fd3dd1805 100644
--- a/tests/Unit/Service/FeedServiceTest.php
+++ b/tests/Unit/Service/FeedServiceTest.php
@@ -29,6 +29,7 @@ class FeedServiceTest extends TestCase
 {
 
     private $feedMapper;
+    /** @var FeedService */
     private $feedService;
     private $user;
     private $response;
@@ -135,8 +136,10 @@ class FeedServiceTest extends TestCase
         $createdFeed->setBasicAuthUser('user');
         $createdFeed->setBasicAuthPassword('pass');
         $item1 = new Item();
+        $item1->setFeedId(4);
         $item1->setGuidHash('hi');
         $item2 = new Item();
+        $item2->setFeedId(4);
         $item2->setGuidHash('yo');
         $return = [
             $createdFeed,
@@ -157,7 +160,10 @@ class FeedServiceTest extends TestCase
         $this->feedMapper->expects($this->once())
             ->method('insert')
             ->with($this->equalTo($createdFeed))
-            ->will($this->returnValue($createdFeed));
+            ->will($this->returnCallback(function() use ($createdFeed) {
+                $createdFeed->setId(4);
+                return $createdFeed;
+            }));
         $this->itemMapper->expects($this->at(0))
             ->method('findByGuidHash')
             ->with(
@@ -212,8 +218,10 @@ class FeedServiceTest extends TestCase
         $createdFeed->setUrlHash($url);
         $createdFeed->setLink($url);
         $item1 = new Item();
+        $item1->setFeedId(5);
         $item1->setGuidHash('hi');
         $item2 = new Item();
+        $item2->setFeedId(5);
         $item2->setGuidHash('yo');
         $return = [
             $createdFeed,
@@ -234,7 +242,10 @@ class FeedServiceTest extends TestCase
         $this->feedMapper->expects($this->once())
             ->method('insert')
             ->with($this->equalTo($createdFeed))
-            ->will($this->returnValue($createdFeed));
+            ->will($this->returnCallback(function() use ($createdFeed) {
+                $createdFeed->setId(5);
+                return $createdFeed;
+            }));
         $this->itemMapper->expects($this->at(0))
             ->method('findByGuidHash')
             ->with(
@@ -521,9 +532,12 @@ class FeedServiceTest extends TestCase
     {
         $feed = new Feed();
         $feed->setId(3);
+        $feed->setUrl('http://example.com');
         $feed->setUrlHash('yo');
 
         $existingFeed = new Feed();
+        $existingFeed->setId(3);
+        $existingFeed->setUrl('http://example.com');
         $feed->setArticlesPerUpdate(2);
 
         $item = new Item();
@@ -554,11 +568,13 @@ class FeedServiceTest extends TestCase
     {
         $feed = new Feed();
         $feed->setId(3);
+        $feed->setUrl('http://example.com');
         $feed->setUpdateErrorCount(0);
         $feed->setLastUpdateError('');
 
         $exptectedFeed = new Feed();
         $exptectedFeed->setId(3);
+        $exptectedFeed->setUrl('http://example.com');
         $exptectedFeed->setUpdateErrorCount(1);
         $exptectedFeed->setLastUpdateError('hi');
 
@@ -657,6 +673,7 @@ class FeedServiceTest extends TestCase
         $feed = new Feed();
         $feed->setId(3);
         $feed->setArticlesPerUpdate(1);
+        $feed->setUrl('http://example.com');
 
         $item = new Item();
         $item->setGuidHash(md5('hi'));
@@ -735,6 +752,7 @@ class FeedServiceTest extends TestCase
         $feed = new Feed();
         $feed->setFolderId(16);
         $feed->setId($feedId);
+        $feed->setUrl('http://example.com');
 
         $this->feedMapper->expects($this->once())
             ->method('find')
@@ -911,7 +929,10 @@ class FeedServiceTest extends TestCase
         $this->feedMapper->expects($this->once())
             ->method('insert')
             ->with($this->equalTo($insertFeed))
-            ->will($this->returnValue($insertFeed));
+            ->will($this->returnCallback(function() use ($insertFeed) {
+                $insertFeed->setId(3);
+                return $insertFeed;
+            }));
 
 
         $this->itemMapper->expects($this->at(0))