pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Entry: add archived_at property and updateArchived method

Browse Source
This commit is contained in:
Sébastien Viande
2018-04-11 11:42:52 +02:00
committed by Jeremy Benoist
parent 2f3af70e1a
commit 7975395d10
13 changed files with 132 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
View File

@ -438,6 +438,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
$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->assertCount(2, $content['tags']);
@ -533,6 +534,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
$this->assertSame(1, $content['is_archived']);
$this->assertSame(1, $content['is_starred']);
$this->assertGreaterThanOrEqual($now->getTimestamp(), (new \DateTime($content['starred_at']))->getTimestamp());
$this->assertGreaterThanOrEqual($now->getTimestamp(), (new \DateTime($content['archived_at']))->getTimestamp());
$this->assertSame(1, $content['user_id']);
}

2
tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php
View File

@ -849,7 +849,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
$entryArchived->setContent('Youhou');
$entryArchived->setTitle('Youhou');
$entryArchived->addTag($tagArchived);
$entryArchived->setArchived(true);
$entryArchived->updateArchived(true);
$em->persist($entryArchived);
$annotationArchived = new Annotation($user);

8
tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
View File

@ -621,7 +621,7 @@ class EntryControllerTest extends WallabagCoreTestCase
$content->setMimetype('text/html');
$content->setTitle('test title entry');
$content->setContent('This is my content /o/');
$content->setArchived(true);
$content->updateArchived(true);
$content->setLanguage('fr');
$em->persist($content);
@ -774,7 +774,7 @@ class EntryControllerTest extends WallabagCoreTestCase
$entry = new Entry($this->getLoggedInUser());
$entry->setUrl($this->url);
$entry->setArchived(false);
$entry->updateArchived(false);
$this->getEntityManager()->persist($entry);
$this->getEntityManager()->flush();
@ -1245,7 +1245,7 @@ class EntryControllerTest extends WallabagCoreTestCase
$entry = new Entry($this->getLoggedInUser());
$entry->setUrl('http://0.0.0.0/foo/baz/qux');
$entry->setTitle('Le manège');
$entry->setArchived(true);
$entry->updateArchived(true);
$this->getEntityManager()->persist($entry);
$this->getEntityManager()->flush();
@ -1275,7 +1275,7 @@ class EntryControllerTest extends WallabagCoreTestCase
$entry = new Entry($this->getLoggedInUser());
$entry->setUrl('http://domain/qux');
$entry->setTitle('Le manège');
$entry->setArchived(true);
$entry->updateArchived(true);
$this->getEntityManager()->persist($entry);
$this->getEntityManager()->flush();