diff options
author | Marco Nassabain <marco.nassabain@hotmail.com> | 2021-03-03 23:01:36 +0100 |
---|---|---|
committer | Sean Molenaar <SMillerDev@users.noreply.github.com> | 2021-04-08 22:31:21 +0200 |
commit | 2ee5112760d721e441abee4ededfa5484269a3c9 (patch) | |
tree | 37b241472c1dbf424acf317a0a86c93bfd54d00b /tests/Unit/Controller | |
parent | 9bd27da9bac99a7780df8eb3845df566fb23b02a (diff) |
🔥 Remove old share logic from tests & old tests
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
Diffstat (limited to 'tests/Unit/Controller')
-rw-r--r-- | tests/Unit/Controller/FeedControllerTest.php | 12 | ||||
-rw-r--r-- | tests/Unit/Controller/ItemControllerTest.php | 145 |
2 files changed, 8 insertions, 149 deletions
diff --git a/tests/Unit/Controller/FeedControllerTest.php b/tests/Unit/Controller/FeedControllerTest.php index 2ea13b1ec..fde821088 100644 --- a/tests/Unit/Controller/FeedControllerTest.php +++ b/tests/Unit/Controller/FeedControllerTest.php @@ -137,8 +137,7 @@ class FeedControllerTest extends TestCase 'feeds' => [ ['a feed'], ], - 'starred' => 4, - 'shared' => 3 + 'starred' => 4 ]; $this->feedService->expects($this->once()) ->method('findAllForUser') @@ -152,10 +151,6 @@ class FeedControllerTest extends TestCase ->method('starred') ->with($this->uid) ->will($this->returnValue([1, 2, 3, 4])); - $this->itemService->expects($this->once()) - ->method('sharedWithUser') - ->with($this->equalTo($this->uid)) - ->will($this->returnValue([0, 1, 2])); $response = $this->class->index(); @@ -170,7 +165,6 @@ class FeedControllerTest extends TestCase ['a feed'], ], 'starred' => 2, - 'shared' => 3, 'newestItemId' => 5 ]; $this->feedService->expects($this->once()) @@ -185,10 +179,6 @@ class FeedControllerTest extends TestCase ->method('starred') ->with($this->uid) ->will($this->returnValue([1, 2])); - $this->itemService->expects($this->once()) - ->method('sharedWithUser') - ->with($this->equalTo($this->uid)) - ->will($this->returnValue([4, 5, 6])); $response = $this->class->index(); diff --git a/tests/Unit/Controller/ItemControllerTest.php b/tests/Unit/Controller/ItemControllerTest.php index 6836cd119..8c10dad4b 100644 --- a/tests/Unit/Controller/ItemControllerTest.php +++ b/tests/Unit/Controller/ItemControllerTest.php @@ -258,8 +258,7 @@ class ItemControllerTest extends TestCase 'items' => [new Item()], 'feeds' => $feeds, 'newestItemId' => $this->newestItemId, - 'starred' => 3, - 'shared' => 2 + 'starred' => 3 ]; $this->itemsApiExpects(2, ListType::FEED, '0'); @@ -280,11 +279,6 @@ class ItemControllerTest extends TestCase ->will($this->returnValue([1, 2, 3])); $this->itemService->expects($this->once()) - ->method('sharedWithUser') - ->with('user') - ->will($this->returnValue([4, 5])); - - $this->itemService->expects($this->once()) ->method('findAllInFeedWithFilters') ->with('user', 2, 3, 0, false, false, []) ->will($this->returnValue($result['items'])); @@ -301,8 +295,7 @@ class ItemControllerTest extends TestCase 'items' => [new Item()], 'feeds' => $feeds, 'newestItemId' => $this->newestItemId, - 'starred' => 3, - 'shared' => 2 + 'starred' => 3 ]; $this->itemsApiExpects(2, ListType::FOLDER, '0'); @@ -323,11 +316,6 @@ class ItemControllerTest extends TestCase ->will($this->returnValue([1, 2, 3])); $this->itemService->expects($this->once()) - ->method('sharedWithUser') - ->with('user') - ->will($this->returnValue([0, 1])); - - $this->itemService->expects($this->once()) ->method('findAllInFolderWithFilters') ->with('user', 2, 3, 0, false, false, []) ->will($this->returnValue($result['items'])); @@ -337,49 +325,6 @@ class ItemControllerTest extends TestCase } - public function testIndexForShared() - { - $feeds = [new Feed()]; - $result = [ - 'items' => [new Item()], - 'feeds' => $feeds, - 'newestItemId' => $this->newestItemId, - 'starred' => 3, - 'shared' => 4 - ]; - - $this->itemsApiExpects(2, ListType::SHARED, '0'); - - $this->feedService->expects($this->once()) - ->method('findAllForUser') - ->with('user') - ->will($this->returnValue($feeds)); - - $this->itemService->expects($this->once()) - ->method('newest') - ->with('user') - ->will($this->returnValue(Item::fromParams(['id' => $this->newestItemId]))); - - $this->itemService->expects($this->once()) - ->method('starred') - ->with('user') - ->will($this->returnValue([1, 2, 3])); - - $this->itemService->expects($this->once()) - ->method('sharedWithUser') - ->with('user') - ->will($this->returnValue([1, 2, 3, 4])); - - $this->itemService->expects($this->once()) - ->method('findAllSharedWithUserWithFilters') - ->with('user', 3, 0, false, false, []) - ->will($this->returnValue($result['items'])); - - $response = $this->controller->index(ListType::SHARED, 2, 3); - $this->assertEquals($result, $response); - } - - public function testIndexForOther() { $feeds = [new Feed()]; @@ -387,8 +332,7 @@ class ItemControllerTest extends TestCase 'items' => [new Item()], 'feeds' => $feeds, 'newestItemId' => $this->newestItemId, - 'starred' => 3, - 'shared' => 4 + 'starred' => 3 ]; $this->itemsApiExpects(2, ListType::STARRED, '0'); @@ -413,11 +357,6 @@ class ItemControllerTest extends TestCase ->with('user', 2, 3, 0, false, []) ->will($this->returnValue($result['items'])); - $this->itemService->expects($this->once()) - ->method('sharedWithUser') - ->with('user') - ->will($this->returnValue([1, 2, 3, 4])); - $response = $this->controller->index(ListType::STARRED, 2, 3); $this->assertEquals($result, $response); } @@ -430,8 +369,7 @@ class ItemControllerTest extends TestCase 'items' => [new Item()], 'feeds' => $feeds, 'newestItemId' => $this->newestItemId, - 'starred' => 3, - 'shared' => 2 + 'starred' => 3 ]; $this->itemsApiExpects(2, ListType::FEED, '0'); @@ -456,11 +394,6 @@ class ItemControllerTest extends TestCase ->with('user', 2, 3, 0, false, false, ['test', 'search']) ->will($this->returnValue($result['items'])); - $this->itemService->expects($this->once()) - ->method('sharedWithUser') - ->with('user') - ->will($this->returnValue([1, 2])); - $response = $this->controller->index(ListType::FEED, 2, 3, 0, null, null, 'test%20%20search%20'); $this->assertEquals($result, $response); } @@ -506,8 +439,7 @@ class ItemControllerTest extends TestCase 'items' => [new Item()], 'feeds' => $feeds, 'newestItemId' => $this->newestItemId, - 'starred' => 3, - 'shared' => 3 + 'starred' => 3 ]; $this->settings->expects($this->once()) @@ -531,11 +463,6 @@ class ItemControllerTest extends TestCase ->will($this->returnValue([1, 2, 3])); $this->itemService->expects($this->once()) - ->method('sharedWithUser') - ->with('user') - ->will($this->returnValue([1, 2, 3])); - - $this->itemService->expects($this->once()) ->method('findAllInFeedAfter') ->with('user', 2, 3, false) ->will($this->returnValue($result['items'])); @@ -552,8 +479,7 @@ class ItemControllerTest extends TestCase 'items' => [new Item()], 'feeds' => $feeds, 'newestItemId' => $this->newestItemId, - 'starred' => 3, - 'shared' => 2 + 'starred' => 3 ]; $this->settings->expects($this->once()) @@ -581,62 +507,11 @@ class ItemControllerTest extends TestCase ->with('user', 2, 3, false) ->will($this->returnValue($result['items'])); - $this->itemService->expects($this->once()) - ->method('sharedWithUser') - ->with('user') - ->will($this->returnValue([1, 2])); - $response = $this->controller->newItems(ListType::FOLDER, 2, 3); $this->assertEquals($result, $response); } - public function testNewItemsShared() - { - $feeds = [new Feed()]; - $result = [ - 'items' => [new Item()], - 'feeds' => $feeds, - 'newestItemId' => $this->newestItemId, - 'starred' => 3, - 'shared' => 5 - ]; - - $this->settings->expects($this->once()) - ->method('getUserValue') - ->with('user', $this->appName, 'showAll') - ->will($this->returnValue('1')); - - $this->feedService->expects($this->once()) - ->method('findAllForUser') - ->with('user') - ->will($this->returnValue($feeds)); - - $this->itemService->expects($this->once()) - ->method('newest') - ->with('user') - ->will($this->returnValue(Item::fromParams(['id' => $this->newestItemId]))); - - $this->itemService->expects($this->once()) - ->method('starred') - ->with('user') - ->will($this->returnValue([1, 2, 3])); - - $this->itemService->expects($this->once()) - ->method('sharedWithUser') - ->with('user') - ->will($this->returnValue([1, 2, 3, 4, 5])); - - $this->itemService->expects($this->once()) - ->method('findAllSharedAfter') - ->with('user', 3, false) - ->will($this->returnValue($result['items'])); - - $response = $this->controller->newItems(ListType::SHARED, 2, 3); - $this->assertEquals($result, $response); - } - - public function testNewItemsOther() { $feeds = [new Feed()]; @@ -644,8 +519,7 @@ class ItemControllerTest extends TestCase 'items' => [new Item()], 'feeds' => $feeds, 'newestItemId' => $this->newestItemId, - 'starred' => 3, - 'shared' => 2 + 'starred' => 3 ]; $this->settings->expects($this->once()) @@ -673,11 +547,6 @@ class ItemControllerTest extends TestCase ->with('user', 6, 3) ->will($this->returnValue($result['items'])); - $this->itemService->expects($this->once()) - ->method('sharedWithUser') - ->with('user') - ->will($this->returnValue([1, 2])); - $response = $this->controller->newItems(ListType::UNREAD, 2, 3); $this->assertEquals($result, $response); } |