diff options
| -rw-r--r-- | tests/unit/utility/FeedFetcherTest.php | 28 | ||||
| -rw-r--r-- | utility/feedfetcher.php | 13 |
2 files changed, 6 insertions, 35 deletions
diff --git a/tests/unit/utility/FeedFetcherTest.php b/tests/unit/utility/FeedFetcherTest.php index b624d998e..b783da296 100644 --- a/tests/unit/utility/FeedFetcherTest.php +++ b/tests/unit/utility/FeedFetcherTest.php @@ -167,7 +167,7 @@ class FeedFetcherTest extends \OCA\AppFramework\Utility\TestUtility { } - private function createItem($author=false, $enclosureType=null, $noPubDate=false) { + private function createItem($author=false, $enclosureType=null) { $this->purifier->expects($this->once()) ->method('purify') ->with($this->equalTo($this->body)) @@ -176,17 +176,9 @@ class FeedFetcherTest extends \OCA\AppFramework\Utility\TestUtility { $this->expectItem('get_title', $this->title); $this->expectItem('get_id', $this->guid); $this->expectItem('get_content', $this->body); + $this->expectItem('get_date', $this->pub); $item = new Item(); - - if($noPubDate) { - $this->expectItem('get_date', 0); - $item->setPubDate($this->time); - } else { - $this->expectItem('get_date', $this->pub); - $item->setPubDate($this->pub); - } - $item->setStatus(0); $item->setUnread(); $item->setUrl($this->permalink); @@ -194,6 +186,7 @@ class FeedFetcherTest extends \OCA\AppFramework\Utility\TestUtility { $item->setGuid($this->guid); $item->setGuidHash(md5($this->guid)); $item->setBody($this->body2); + $item->setPubDate($this->pub); $item->setLastModified($this->time); if($author) { $mock = $this->getMock('author', array('get_name')); @@ -320,20 +313,6 @@ class FeedFetcherTest extends \OCA\AppFramework\Utility\TestUtility { $this->assertEquals(array($feed, array($item)), $result); } - - public function testFetchMapItemsNoPubdate(){ - $this->core->expects($this->once()) - ->method('init') - ->will($this->returnValue(true)); - $item = $this->createItem(false, true, true); - $feed = $this->createFeed(false, true); - $this->expectCore('get_items', array($this->item)); - $result = $this->fetcher->fetch($this->url); - - $this->assertEquals(array($feed, array($item)), $result); - } - - public function testFetchMapItemsGetFavicon() { $this->expectCore('get_title', $this->feedTitle); $this->expectCore('get_link', $this->feedLink); @@ -386,5 +365,4 @@ class FeedFetcherTest extends \OCA\AppFramework\Utility\TestUtility { $this->assertEquals(array($feed, array($item)), $result); } - } diff --git a/utility/feedfetcher.php b/utility/feedfetcher.php index 27eeb31a6..016aae8de 100644 --- a/utility/feedfetcher.php +++ b/utility/feedfetcher.php @@ -120,16 +120,9 @@ class FeedFetcher implements IFeedFetcher { $item->setGuid($guid); $item->setGuidHash(md5($guid)); $item->setBody(str_replace('<a', '<a target="_blank"', - // escape XSS - $this->purifier->purify($simplePieItem->get_content()))); - - // pubdate is not required. if not given use the current date - $date = $simplePieItem->get_date('U'); - if(!$date) { - $date = $this->time->getTime(); - } - - $item->setPubDate($date); + // escape XSS + $this->purifier->purify($simplePieItem->get_content()))); + $item->setPubDate($simplePieItem->get_date('U')); $item->setLastModified($this->time->getTime()); $author = $simplePieItem->get_author(); |