mirror of
https://github.com/wallabag/wallabag.git
synced 2024-11-26 19:11:07 +00:00
Create a new entry via API even when its content can't be retrieved
Fix #2988
This commit is contained in:
parent
f2beee5185
commit
08f29ae7b6
2 changed files with 37 additions and 4 deletions
|
@ -199,10 +199,19 @@ class EntryRestController extends WallabagRestController
|
||||||
$entry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($url, $this->getUser()->getId());
|
$entry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($url, $this->getUser()->getId());
|
||||||
|
|
||||||
if (false === $entry) {
|
if (false === $entry) {
|
||||||
$entry = $this->get('wallabag_core.content_proxy')->updateEntry(
|
$entry = new Entry($this->getUser());
|
||||||
new Entry($this->getUser()),
|
try {
|
||||||
$url
|
$entry = $this->get('wallabag_core.content_proxy')->updateEntry(
|
||||||
);
|
$entry,
|
||||||
|
$url
|
||||||
|
);
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
$this->get('logger')->error('Error while saving an entry', [
|
||||||
|
'exception' => $e,
|
||||||
|
'entry' => $entry,
|
||||||
|
]);
|
||||||
|
$entry->setUrl($url);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!is_null($title)) {
|
if (!is_null($title)) {
|
||||||
|
|
|
@ -4,6 +4,7 @@ namespace Tests\Wallabag\ApiBundle\Controller;
|
||||||
|
|
||||||
use Tests\Wallabag\ApiBundle\WallabagApiTestCase;
|
use Tests\Wallabag\ApiBundle\WallabagApiTestCase;
|
||||||
use Wallabag\CoreBundle\Entity\Tag;
|
use Wallabag\CoreBundle\Entity\Tag;
|
||||||
|
use Wallabag\CoreBundle\Helper\ContentProxy;
|
||||||
|
|
||||||
class EntryRestControllerTest extends WallabagApiTestCase
|
class EntryRestControllerTest extends WallabagApiTestCase
|
||||||
{
|
{
|
||||||
|
@ -359,6 +360,29 @@ class EntryRestControllerTest extends WallabagApiTestCase
|
||||||
$this->assertCount(2, $content['tags']);
|
$this->assertCount(2, $content['tags']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testPostEntryWhenFetchContentFails()
|
||||||
|
{
|
||||||
|
/** @var \Symfony\Component\DependencyInjection\Container $container */
|
||||||
|
$container = $this->client->getContainer();
|
||||||
|
$contentProxy = $this->getMockBuilder(ContentProxy::class)
|
||||||
|
->disableOriginalConstructor()
|
||||||
|
->setMethods(['updateEntry'])
|
||||||
|
->getMock();
|
||||||
|
$contentProxy->expects($this->any())
|
||||||
|
->method('updateEntry')
|
||||||
|
->willThrowException(new \Exception('Test Fetch content fails'));
|
||||||
|
$container->set('wallabag_core.content_proxy', $contentProxy);
|
||||||
|
|
||||||
|
$this->client->request('POST', '/api/entries.json', [
|
||||||
|
'url' => 'http://www.example.com/',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
|
||||||
|
$content = json_decode($this->client->getResponse()->getContent(), true);
|
||||||
|
$this->assertGreaterThan(0, $content['id']);
|
||||||
|
$this->assertEquals('http://www.example.com/', $content['url']);
|
||||||
|
}
|
||||||
|
|
||||||
public function testPostArchivedAndStarredEntry()
|
public function testPostArchivedAndStarredEntry()
|
||||||
{
|
{
|
||||||
$this->client->request('POST', '/api/entries.json', [
|
$this->client->request('POST', '/api/entries.json', [
|
||||||
|
|
Loading…
Reference in a new issue