mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-27 03:21:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2635 from wallabag/304-reload

Browse source 
Return 304 when content isn't reloaded using the API
This commit is contained in:
Jeremy Benoist 2016-11-22 11:27:55 +01:00 committed by GitHub
commit bb28368f69
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Wallabag/ApiBundle/Controller/EntryRestController.php
View file

@ -287,7 +287,7 @@ class EntryRestController extends WallabagRestController
/**
* Reload an entry.
* A response with HTTP Status 400 will be return if we weren't able to update the content (because it hasn't changed or we got an error).
* An empty response with HTTP Status 304 will be send if we weren't able to update the content (because it hasn't changed or we got an error).
*
* @ApiDoc(
* requirements={
@ -310,12 +310,12 @@ class EntryRestController extends WallabagRestController
'entry' => $entry,
]);
return new JsonResponse(['error' => 'Error while trying to fetch content'], 400);
return new JsonResponse([], 304);
}
// if refreshing entry failed, don't save it
if ($this->getParameter('wallabag_core.fetching_error_message') === $entry->getContent()) {
return new JsonResponse(['error' => 'Error while trying to extract content'], 400);
return new JsonResponse([], 304);
}
$em = $this->getDoctrine()->getManager();

6
tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
View file

@ -690,11 +690,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
}
$this->client->request('PATCH', '/api/entries/'.$entry->getId().'/reload.json');
$this->assertEquals(400, $this->client->getResponse()->getStatusCode());
$this->assertContains('Error while trying to extract content', $this->client->getResponse()->getContent());
$this->assertEquals('application/json', $this->client->getResponse()->headers->get('Content-Type'));
$this->assertEquals(304, $this->client->getResponse()->getStatusCode());
}
public function testReloadEntry()