diff options
author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-29 13:25:04 +0200 |
---|---|---|
committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-29 13:30:01 +0200 |
commit | 3fc18156ae0b586e8de0c82949acfa6291317536 (patch) | |
tree | 201e97511bea44c58b5e9d78d8cf36ae2e2b54f9 /tests/unit/controller/ItemControllerTest.php | |
parent | a03b54c6a59837d0045c140ea7aef3fae95daa95 (diff) |
go back to order by id, fix #138, use a newest item id to prevent marking items as read that the user didnt see yet fix #141, also update the starred count periodically
Diffstat (limited to 'tests/unit/controller/ItemControllerTest.php')
-rw-r--r-- | tests/unit/controller/ItemControllerTest.php | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/tests/unit/controller/ItemControllerTest.php b/tests/unit/controller/ItemControllerTest.php index 451053317..b0d2a52bc 100644 --- a/tests/unit/controller/ItemControllerTest.php +++ b/tests/unit/controller/ItemControllerTest.php @@ -89,11 +89,6 @@ class ItemControllerTest extends ControllerTestUtility { } - public function testStarredAnnotations(){ - $this->assertItemControllerAnnotations('starred'); - } - - public function testStarAnnotations(){ $this->assertItemControllerAnnotations('star'); } @@ -230,24 +225,6 @@ class ItemControllerTest extends ControllerTestUtility { } - public function testStarred(){ - $result = array( - 'starred' => 3 - ); - $this->api->expects($this->once()) - ->method('getUserId') - ->will($this->returnValue($this->user)); - $this->itemBusinessLayer->expects($this->once()) - ->method('starredCount') - ->with($this->user) - ->will($this->returnValue($result['starred'])); - $response = $this->controller->starred(); - - $this->assertEquals($result, $response->getParams()); - $this->assertTrue($response instanceof JSONResponse); - } - - private function itemsApiExpects($id, $type){ $this->api->expects($this->once()) @@ -273,14 +250,14 @@ class ItemControllerTest extends ControllerTestUtility { $result = array( 'items' => array(new Item()), 'feeds' => $feeds, - 'newestItemId' => $this->newestItemId + 'newestItemId' => $this->newestItemId, + 'starred' => 3111 ); $post = array( 'limit' => 3, 'type' => FeedType::FEED, 'id' => 2, 'offset' => 0, - 'newestItemId' => 3 ); $this->controller = $this->getPostController($post); @@ -297,13 +274,17 @@ class ItemControllerTest extends ControllerTestUtility { ->will($this->returnValue($this->newestItemId)); $this->itemBusinessLayer->expects($this->once()) + ->method('starredCount') + ->with($this->equalTo($this->user)) + ->will($this->returnValue(3111)); + + $this->itemBusinessLayer->expects($this->once()) ->method('findAll') ->with( $this->equalTo($post['id']), $this->equalTo($post['type']), $this->equalTo($post['limit']), $this->equalTo($post['offset']), - $this->equalTo($this->newestItemId), $this->equalTo(true), $this->equalTo($this->user)) ->will($this->returnValue($result['items'])); @@ -323,7 +304,6 @@ class ItemControllerTest extends ControllerTestUtility { 'type' => FeedType::FEED, 'id' => 2, 'offset' => 10, - 'newestItemId' => 3 ); $this->controller = $this->getPostController($post); @@ -335,7 +315,6 @@ class ItemControllerTest extends ControllerTestUtility { $this->equalTo($post['type']), $this->equalTo($post['limit']), $this->equalTo($post['offset']), - $this->equalTo($post['newestItemId']), $this->equalTo(true), $this->equalTo($this->user)) ->will($this->returnValue($result['items'])); |