From c995c5b447cd32f4eb9f3cd9fc1865fd93962f24 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Fri, 20 Nov 2015 19:55:23 +0100 Subject: If a feed failed to update more than 10 times, show a hint in the web interface --- tests/unit/db/FeedTest.php | 4 +++- tests/unit/service/FeedServiceTest.php | 15 +++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) (limited to 'tests/unit') diff --git a/tests/unit/db/FeedTest.php b/tests/unit/db/FeedTest.php index 4bec6b08a..146215803 100644 --- a/tests/unit/db/FeedTest.php +++ b/tests/unit/db/FeedTest.php @@ -34,6 +34,7 @@ class FeedTest extends \PHPUnit_Framework_TestCase { $feed->setFullTextEnabled(true); $feed->setPinned(true); $feed->setUpdateMode(1); + $feed->setUpdateErrorCount(2); return $feed; } @@ -77,7 +78,8 @@ class FeedTest extends \PHPUnit_Framework_TestCase { 'ordering' => 2, 'fullTextEnabled' => true, 'pinned' => true, - 'updateMode' => 1 + 'updateMode' => 1, + 'updateErrorCount' => 2 ], $feed->jsonSerialize()); } diff --git a/tests/unit/service/FeedServiceTest.php b/tests/unit/service/FeedServiceTest.php index a74208c29..40ebf09d1 100644 --- a/tests/unit/service/FeedServiceTest.php +++ b/tests/unit/service/FeedServiceTest.php @@ -509,6 +509,12 @@ class FeedServiceTest extends \PHPUnit_Framework_TestCase { public function testUpdateFails(){ $feed = new Feed(); $feed->setId(3); + $feed->setUpdateErrorCount(0); + + $exptectedFeed = new Feed(); + $exptectedFeed->setId(3); + $exptectedFeed->setUpdateErrorCount(1); + $ex = new FetcherException(''); $this->feedMapper->expects($this->at(0)) @@ -523,13 +529,18 @@ class FeedServiceTest extends \PHPUnit_Framework_TestCase { ->method('debug'); $this->feedMapper->expects($this->at(1)) + ->method('update') + ->with($exptectedFeed) + ->will($this->returnValue($exptectedFeed)); + + $this->feedMapper->expects($this->at(2)) ->method('find') ->with($feed->getId(), $this->user) - ->will($this->returnValue($feed)); + ->will($this->returnValue($exptectedFeed)); $return = $this->feedService->update($feed->getId(), $this->user); - $this->assertEquals($return, $feed); + $this->assertEquals($return, $exptectedFeed); } -- cgit v1.2.3