diff options
| author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-11-22 11:27:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-22 11:27:55 +0100 |
| commit | bb28368f6953e07dbe6747d7c1eacf1abe35817e (patch) | |
| tree | bac9d0e78d0908fa3c8e4c22900a6d7b2d456735 /tests/Wallabag | |
| parent | 944b8d61752bedd126e1cdaeb3205177e414cf6b (diff) | |
| parent | 5cd0857e3c87541fa8a628b0623b8959bfba2ca8 (diff) | |
| download | wallabag-bb28368f6953e07dbe6747d7c1eacf1abe35817e.tar.gz wallabag-bb28368f6953e07dbe6747d7c1eacf1abe35817e.tar.zst wallabag-bb28368f6953e07dbe6747d7c1eacf1abe35817e.zip | |
Merge pull request #2635 from wallabag/304-reload
Return 304 when content isn't reloaded using the API
Diffstat (limited to 'tests/Wallabag')
| -rw-r--r-- | tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php b/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php index 432ce7d8..409a8291 100644 --- a/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php +++ b/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php | |||
| @@ -690,11 +690,7 @@ class EntryRestControllerTest extends WallabagApiTestCase | |||
| 690 | } | 690 | } |
| 691 | 691 | ||
| 692 | $this->client->request('PATCH', '/api/entries/'.$entry->getId().'/reload.json'); | 692 | $this->client->request('PATCH', '/api/entries/'.$entry->getId().'/reload.json'); |
| 693 | $this->assertEquals(400, $this->client->getResponse()->getStatusCode()); | 693 | $this->assertEquals(304, $this->client->getResponse()->getStatusCode()); |
| 694 | |||
| 695 | $this->assertContains('Error while trying to extract content', $this->client->getResponse()->getContent()); | ||
| 696 | |||
| 697 | $this->assertEquals('application/json', $this->client->getResponse()->headers->get('Content-Type')); | ||
| 698 | } | 694 | } |
| 699 | 695 | ||
| 700 | public function testReloadEntry() | 696 | public function testReloadEntry() |