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

remove isDeleted flag

Browse Source
This commit is contained in:
Nicolas Lœuillet
2015-02-20 15:36:25 +01:00
parent aa4d6562c1
commit 1d14779154
6 changed files with 23 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php
View File

@ -161,18 +161,15 @@ class EntryControllerTest extends WallabagTestCase
$content = $client->getContainer()
->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry')
->findOneByIsDeleted(false);
->findOneById(1);
$client->request('GET', '/delete/'.$content->getId());
$this->assertEquals(302, $client->getResponse()->getStatusCode());
$res = $client->getContainer()
->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry')
->findOneById($content->getId());
$client->request('GET', '/delete/'.$content->getId());
$this->assertEquals($res->isDeleted(), true);
$this->assertEquals(404, $client->getResponse()->getStatusCode());
}
public function testViewOtherUserEntry()

16
src/Wallabag/CoreBundle/Tests/Controller/WallabagRestControllerTest.php
View File

@ -130,7 +130,7 @@ class WallabagRestControllerTest extends WallabagTestCase
$entry = $client->getContainer()
->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry')
->findOneByIsDeleted(false);
->findOneByUser(1);
if (!$entry) {
$this->markTestSkipped('No content found in db.');
@ -140,10 +140,14 @@ class WallabagRestControllerTest extends WallabagTestCase
$this->assertEquals(200, $client->getResponse()->getStatusCode());
$res = $client->getContainer()
->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry')
->findOneById($entry->getId());
$this->assertEquals($res->isDeleted(), true);
// We'll try to delete this entry again
$client->request('GET', '/api/salts/admin.json');
$salt = json_decode($client->getResponse()->getContent());
$headers = $this->generateHeaders('admin', 'test', $salt[0]);
$client->request('DELETE', '/api/entries/'.$entry->getId().'.json', array(), array(), $headers);
$this->assertEquals(404, $client->getResponse()->getStatusCode());
}
}