$entry = $this->client->getContainer()
->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry')
- ->findOneBy(['user' => 1, 'isArchived' => false]);
+ ->findOneBy(['user' => $this->getUserId(), 'isArchived' => false]);
if (!$entry) {
$this->markTestSkipped('No content found in db.');
$entry = $this->client->getContainer()
->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry')
- ->findOneBy(['user' => 1, 'url' => 'http://0.0.0.0/entry2']);
+ ->findOneBy(['user' => $this->getUserId(), 'url' => 'http://0.0.0.0/entry2']);
if (!$entry) {
$this->markTestSkipped('No content found in db.');
$entry = $this->client->getContainer()
->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry')
- ->findOneBy(['user' => 1, 'isArchived' => false]);
+ ->findOneBy(['user' => $this->getUserId(), 'isArchived' => false]);
if (!$entry) {
$this->markTestSkipped('No content found in db.');
$entry = $this->client->getContainer()
->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry')
- ->findOneBy(['user' => 2, 'isArchived' => false]);
+ ->findOneBy(['user' => $this->getUserId('bob'), 'isArchived' => false]);
if (!$entry) {
$this->markTestSkipped('No content found in db.');
$entry = $this->client->getContainer()
->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry')
- ->findOneByUser(1);
+ ->findOneByUser($this->getUserId());
if (!$entry) {
$this->markTestSkipped('No content found in db.');
$this->assertSame(2, $content['limit']);
}
+ public function testGetStarredEntriesWithBadSort()
+ {
+ $this->client->request('GET', '/api/entries', ['starred' => 1, 'sort' => 'updated', 'order' => 'unknown']);
+
+ $this->assertSame(400, $this->client->getResponse()->getStatusCode());
+
+ $this->assertSame('application/json', $this->client->getResponse()->headers->get('Content-Type'));
+ }
+
public function testGetStarredEntries()
{
$this->client->request('GET', '/api/entries', ['starred' => 1, 'sort' => 'updated']);
public function testDeleteEntry()
{
- $entry = $this->client->getContainer()
- ->get('doctrine.orm.entity_manager')
- ->getRepository('WallabagCoreBundle:Entry')
- ->findOneByUser(1, ['id' => 'asc']);
+ $em = $this->client->getContainer()->get('doctrine.orm.entity_manager');
+ $entry = new Entry($em->getReference(User::class, 1));
+ $entry->setUrl('http://0.0.0.0/test-delete-entry');
+ $entry->setTitle('Test delete entry');
+ $em->persist($entry);
+ $em->flush();
- if (!$entry) {
- $this->markTestSkipped('No content found in db.');
- }
+ $em->clear();
+
+ $e = [
+ 'title' => $entry->getTitle(),
+ 'url' => $entry->getUrl(),
+ 'id' => $entry->getId(),
+ ];
- $this->client->request('DELETE', '/api/entries/' . $entry->getId() . '.json');
+ $this->client->request('DELETE', '/api/entries/' . $e['id'] . '.json');
$this->assertSame(200, $this->client->getResponse()->getStatusCode());
$content = json_decode($this->client->getResponse()->getContent(), true);
- $this->assertSame($entry->getTitle(), $content['title']);
- $this->assertSame($entry->getUrl(), $content['url']);
- $this->assertSame($entry->getId(), $content['id']);
+ $this->assertSame($e['title'], $content['title']);
+ $this->assertSame($e['url'], $content['url']);
+ $this->assertSame($e['id'], $content['id']);
// We'll try to delete this entry again
- $this->client->request('DELETE', '/api/entries/' . $entry->getId() . '.json');
+ $client = $this->createAuthorizedClient();
+ $client->request('DELETE', '/api/entries/' . $e['id'] . '.json');
- $this->assertSame(404, $this->client->getResponse()->getStatusCode());
+ $this->assertSame(404, $client->getResponse()->getStatusCode());
+ }
+
+ public function testDeleteEntryExpectId()
+ {
+ $em = $this->client->getContainer()->get('doctrine.orm.entity_manager');
+ $entry = new Entry($em->getReference(User::class, 1));
+ $entry->setUrl('http://0.0.0.0/test-delete-entry-id');
+ $em->persist($entry);
+ $em->flush();
+
+ $em->clear();
+
+ $id = $entry->getId();
+
+ $this->client->request('DELETE', '/api/entries/' . $id . '.json?expect=id');
+
+ $this->assertSame(200, $this->client->getResponse()->getStatusCode());
+
+ $content = json_decode($this->client->getResponse()->getContent(), true);
+
+ $this->assertSame($id, $content['id']);
+ $this->assertArrayNotHasKey('url', $content);
+
+ // We'll try to delete this entry again
+ $client = $this->createAuthorizedClient();
+ $client->request('DELETE', '/api/entries/' . $id . '.json');
+
+ $this->assertSame(404, $client->getResponse()->getStatusCode());
+ }
+
+ public function testDeleteEntryExpectBadRequest()
+ {
+ $this->client->request('DELETE', '/api/entries/1.json?expect=badrequest');
+
+ $this->assertSame(400, $this->client->getResponse()->getStatusCode());
}
public function testPostEntry()
$this->assertSame(0, $content['is_archived']);
$this->assertSame(0, $content['is_starred']);
$this->assertNull($content['starred_at']);
+ $this->assertNull($content['archived_at']);
$this->assertSame('New title for my article', $content['title']);
- $this->assertSame(1, $content['user_id']);
+ $this->assertSame($this->getUserId(), $content['user_id']);
$this->assertCount(2, $content['tags']);
$this->assertNull($content['origin_url']);
$this->assertSame('my content', $content['content']);
public function testPostSameEntry()
{
$em = $this->client->getContainer()->get('doctrine.orm.entity_manager');
- $entry = new Entry($em->getReference(User::class, 1));
+ $entry = new Entry($em->getReference(User::class, $this->getUserId()));
$entry->setUrl('https://www.lemonde.fr/pixels/article/2015/03/28/plongee-dans-l-univers-d-ingress-le-jeu-de-google-aux-frontieres-du-reel_4601155_4408996.html');
$entry->setArchived(true);
$entry->addTag((new Tag())->setLabel('google'));
$this->assertSame(1, $content['is_archived']);
$this->assertSame(1, $content['is_starred']);
$this->assertGreaterThanOrEqual($now->getTimestamp(), (new \DateTime($content['starred_at']))->getTimestamp());
- $this->assertSame(1, $content['user_id']);
+ $this->assertGreaterThanOrEqual($now->getTimestamp(), (new \DateTime($content['archived_at']))->getTimestamp());
+ $this->assertSame($this->getUserId(), $content['user_id']);
}
public function testPostArchivedAndStarredEntryWithoutQuotes()
$entry = $this->client->getContainer()
->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry')
- ->findOneByUser(1);
+ ->findOneByUser($this->getUserId());
if (!$entry) {
$this->markTestSkipped('No content found in db.');
$this->assertSame($entry->getUrl(), $content['url']);
$this->assertSame('New awesome title', $content['title']);
$this->assertGreaterThanOrEqual(1, \count($content['tags']), 'We force only one tag');
- $this->assertSame(1, $content['user_id']);
+ $this->assertSame($this->getUserId(), $content['user_id']);
$this->assertSame('de_AT', $content['language']);
$this->assertSame('http://preview.io/picture.jpg', $content['preview_picture']);
$this->assertContains('sponge', $content['published_by']);
$entry = $this->client->getContainer()
->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry')
- ->findOneByUser(1);
+ ->findOneByUser($this->getUserId());
if (!$entry) {
$this->markTestSkipped('No content found in db.');
$entry = $this->client->getContainer()
->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry')
- ->findOneByUser(1);
+ ->findOneByUser($this->getUserId());
if (!$entry) {
$this->markTestSkipped('No content found in db.');
$entry = $this->client->getContainer()
->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry')
- ->findOneByUser(1);
+ ->findOneByUser($this->getUserId());
if (!$entry) {
$this->markTestSkipped('No content found in db.');
$entry = $this->client->getContainer()
->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry')
- ->findOneByUser(1);
+ ->findOneByUser($this->getUserId());
if (!$entry) {
$this->markTestSkipped('No content found in db.');
$entry = $this->client->getContainer()
->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry')
- ->findOneByUser(1);
+ ->findOneByUser($this->getUserId());
if (!$entry) {
$this->markTestSkipped('No content found in db.');
$content = json_decode($this->client->getResponse()->getContent(), true);
$this->assertArrayHasKey('tags', $content);
- $this->assertSame($nbTags + 3, \count($content['tags']));
+ $this->assertCount($nbTags + 3, $content['tags']);
$entryDB = $this->client->getContainer()
->get('doctrine.orm.entity_manager')
$content = json_decode($this->client->getResponse()->getContent(), true);
$this->assertArrayHasKey('tags', $content);
- $this->assertSame($nbTags - 1, \count($content['tags']));
+ $this->assertCount($nbTags - 1, $content['tags']);
}
public function testSaveIsArchivedAfterPost()
$entry = $this->client->getContainer()
->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry')
- ->findOneBy(['user' => 1, 'isArchived' => true]);
+ ->findOneBy(['user' => $this->getUserId(), 'isArchived' => true]);
if (!$entry) {
$this->markTestSkipped('No content found in db.');
$entry = $this->client->getContainer()
->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry')
- ->findOneBy(['user' => 1, 'isStarred' => true]);
+ ->findOneBy(['user' => $this->getUserId(), 'isStarred' => true]);
if (!$entry) {
$this->markTestSkipped('No content found in db.');
$entry = $this->client->getContainer()
->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry')
- ->findOneBy(['user' => 1, 'isArchived' => true]);
+ ->findOneBy(['user' => $this->getUserId(), 'isArchived' => true]);
if (!$entry) {
$this->markTestSkipped('No content found in db.');
$entry = $this->client->getContainer()
->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry')
- ->findOneBy(['user' => 1, 'isStarred' => true]);
+ ->findOneBy(['user' => $this->getUserId(), 'isStarred' => true]);
if (!$entry) {
$this->markTestSkipped('No content found in db.');
$this->assertGreaterThanOrEqual($now->getTimestamp(), (new \DateTime($content['starred_at']))->getTimestamp());
}
- public function dataForEntriesExistWithUrl()
+ public function testGetEntriesExistsWithReturnId()
{
- return [
- 'with_id' => [
- 'url' => '/api/entries/exists?url=http://0.0.0.0/entry2&return_id=1',
- 'expectedValue' => 2,
- ],
- 'without_id' => [
- 'url' => '/api/entries/exists?url=http://0.0.0.0/entry2',
- 'expectedValue' => true,
- ],
- ];
+ $this->client->request('GET', '/api/entries/exists?url=http://0.0.0.0/entry2&return_id=1');
+
+ $this->assertSame(200, $this->client->getResponse()->getStatusCode());
+
+ $content = json_decode($this->client->getResponse()->getContent(), true);
+
+ // it returns a database id, we don't know it, so we only check it's greater than the lowest possible value
+ $this->assertGreaterThan(1, $content['exists']);
}
- /**
- * @dataProvider dataForEntriesExistWithUrl
- */
- public function testGetEntriesExists($url, $expectedValue)
+ public function testGetEntriesExistsWithoutReturnId()
{
- $this->client->request('GET', $url);
+ $this->client->request('GET', '/api/entries/exists?url=http://0.0.0.0/entry2');
$this->assertSame(200, $this->client->getResponse()->getStatusCode());
$content = json_decode($this->client->getResponse()->getContent(), true);
- $this->assertSame($expectedValue, $content['exists']);
+ $this->assertTrue($content['exists']);
}
public function testGetEntriesExistsWithManyUrls()
$this->assertArrayHasKey($url1, $content);
$this->assertArrayHasKey($url2, $content);
- $this->assertSame(2, $content[$url1]);
+ // it returns a database id, we don't know it, so we only check it's greater than the lowest possible value
+ $this->assertGreaterThan(1, $content[$url1]);
$this->assertNull($content[$url2]);
}
{
$entry = $this->client->getContainer()->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry')
- ->findByUrlAndUserId('http://0.0.0.0/entry4', 1);
+ ->findByUrlAndUserId('http://0.0.0.0/entry4', $this->getUserId());
if (!$entry) {
$this->markTestSkipped('No content found in db.');
{
$entry = $this->client->getContainer()->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry')
- ->findByUrlAndUserId('http://0.0.0.0/entry4', 1);
+ ->findByUrlAndUserId('http://0.0.0.0/entry4', $this->getUserId());
$tags = $entry->getTags();
$entry = $this->client->getContainer()->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry')
- ->findByUrlAndUserId('http://0.0.0.0/entry4', 1);
+ ->findByUrlAndUserId('http://0.0.0.0/entry4', $this->getUserId());
$tags = $entry->getTags();
$this->assertCount(4, $tags);
public function testDeleteEntriesTagsListAction()
{
$em = $this->client->getContainer()->get('doctrine.orm.entity_manager');
- $entry = new Entry($em->getReference(User::class, 1));
+ $entry = new Entry($em->getReference(User::class, $this->getUserId()));
$entry->setUrl('http://0.0.0.0/test-entry');
$entry->addTag((new Tag())->setLabel('foo-tag'));
$entry->addTag((new Tag())->setLabel('bar-tag'));
public function testDeleteEntriesListAction()
{
$em = $this->client->getContainer()->get('doctrine.orm.entity_manager');
- $em->persist((new Entry($em->getReference(User::class, 1)))->setUrl('http://0.0.0.0/test-entry1'));
+ $em->persist((new Entry($em->getReference(User::class, $this->getUserId())))->setUrl('http://0.0.0.0/test-entry1'));
$em->flush();
$em->clear();
public function testRePostEntryAndReUsePublishedAt()
{
$em = $this->client->getContainer()->get('doctrine.orm.entity_manager');
- $entry = new Entry($em->getReference(User::class, 1));
+ $entry = new Entry($em->getReference(User::class, $this->getUserId()));
$entry->setTitle('Antoine de Caunes : « Je veux avoir le droit de tâtonner »');
$entry->setContent('hihi');
$entry->setUrl('https://www.lemonde.fr/m-perso/article/2017/06/25/antoine-de-caunes-je-veux-avoir-le-droit-de-tatonner_5150728_4497916.html');
projects / github / wallabag / wallabag.git / blobdiff