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

add test for empty salt

Browse Source
This commit is contained in:
Nicolas Lœuillet
2015-02-11 15:15:06 +01:00
parent 874e3e10a4
commit f170f31594
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Wallabag/CoreBundle/Controller/WallabagRestController.php
View File

@ -33,7 +33,7 @@ class WallabagRestController extends Controller
throw $this->createNotFoundException(); throw $this->createNotFoundException();
} }
return array($user->getSalt()); return array($user->getSalt() ?: null);
} }
/** /**
* Retrieve all entries. It could be filtered by many options. * Retrieve all entries. It could be filtered by many options.

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

@ -35,6 +35,7 @@ class WallabagRestControllerTest extends WallabagTestCase
$client = $this->createClient(); $client = $this->createClient();
$client->request('GET', '/api/salts/admin.json'); $client->request('GET', '/api/salts/admin.json');
$this->assertEquals(200, $client->getResponse()->getStatusCode()); $this->assertEquals(200, $client->getResponse()->getStatusCode());
$this->assertNotEmpty(json_decode($client->getResponse()->getContent()));
$client->request('GET', '/api/salts/notfound.json'); $client->request('GET', '/api/salts/notfound.json');
$this->assertEquals(404, $client->getResponse()->getStatusCode()); $this->assertEquals(404, $client->getResponse()->getStatusCode());