diff options
| -rw-r--r-- | fetcher/feedfetcher.php | 3 | ||||
| -rw-r--r-- | tests/unit/fetcher/FeedFetcherTest.php | 16 |
2 files changed, 10 insertions, 9 deletions
diff --git a/fetcher/feedfetcher.php b/fetcher/feedfetcher.php index 328f10f5a..0476a9d3a 100644 --- a/fetcher/feedfetcher.php +++ b/fetcher/feedfetcher.php @@ -94,9 +94,10 @@ class FeedFetcher implements IFeedFetcher { try { // somehow $simplePie turns into a feed after init $items = array(); + $permaLink = $simplePie->get_permalink(); if ($feedItems = $simplePie->get_items()) { foreach($feedItems as $feedItem) { - array_push($items, $this->buildItem($feedItem, $simplePie->get_permalink())); + array_push($items, $this->buildItem($feedItem, $permaLink)); } } diff --git a/tests/unit/fetcher/FeedFetcherTest.php b/tests/unit/fetcher/FeedFetcherTest.php index 83ba3b809..b9f68fdae 100644 --- a/tests/unit/fetcher/FeedFetcherTest.php +++ b/tests/unit/fetcher/FeedFetcherTest.php @@ -160,14 +160,14 @@ class FeedFetcherTest extends \OCA\AppFramework\Utility\TestUtility { } - private function expectCore($method, $return) { - $this->core->expects($this->once()) + private function expectCore($method, $return, $count = 1) { + $this->core->expects($this->exactly($count)) ->method($method) ->will($this->returnValue($return)); } - private function expectItem($method, $return) { - $this->item->expects($this->once()) + private function expectItem($method, $return, $count = 1) { + $this->item->expects($this->exactly($count)) ->method($method) ->will($this->returnValue($return)); } @@ -236,7 +236,7 @@ class FeedFetcherTest extends \OCA\AppFramework\Utility\TestUtility { private function createFeed($hasFeedFavicon=false, $hasWebFavicon=false) { $this->expectCore('get_title', $this->feedTitle); - $this->expectCore('get_permalink', $this->feedLink); + $this->expectCore('get_permalink', $this->feedLink, 2); $feed = new Feed(); $feed->setTitle(html_entity_decode($this->feedTitle)); @@ -280,7 +280,7 @@ class FeedFetcherTest extends \OCA\AppFramework\Utility\TestUtility { public function testFetchMapItemsNoFeedTitleUsesUrl(){ $this->expectCore('get_title', ''); - $this->expectCore('get_permalink', $this->feedLink); + $this->expectCore('get_permalink', $this->feedLink, 2); $feed = new Feed(); $feed->setTitle($this->url); @@ -340,7 +340,7 @@ class FeedFetcherTest extends \OCA\AppFramework\Utility\TestUtility { public function testFetchMapItemsGetFavicon() { $this->expectCore('get_title', $this->feedTitle); - $this->expectCore('get_permalink', $this->feedLink); + $this->expectCore('get_permalink', $this->feedLink, 2); $feed = new Feed(); $feed->setTitle(html_entity_decode($this->feedTitle)); @@ -366,7 +366,7 @@ class FeedFetcherTest extends \OCA\AppFramework\Utility\TestUtility { public function testFetchMapItemsNoGetFavicon() { $this->expectCore('get_title', $this->feedTitle); - $this->expectCore('get_permalink', $this->feedLink); + $this->expectCore('get_permalink', $this->feedLink, 2); $feed = new Feed(); $feed->setTitle(html_entity_decode($this->feedTitle)); |