From f170f315941b461a2bcd85843583baedbc48efd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Wed, 11 Feb 2015 15:15:06 +0100
Subject: [PATCH] add test for empty salt

---
 src/Wallabag/CoreBundle/Controller/WallabagRestController.php   | 2 +-
 .../CoreBundle/Tests/Controller/WallabagRestControllerTest.php  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Wallabag/CoreBundle/Controller/WallabagRestController.php b/src/Wallabag/CoreBundle/Controller/WallabagRestController.php
index 3cfb8a778..e9cd8c939 100644
--- a/src/Wallabag/CoreBundle/Controller/WallabagRestController.php
+++ b/src/Wallabag/CoreBundle/Controller/WallabagRestController.php
@@ -33,7 +33,7 @@ class WallabagRestController extends Controller
             throw $this->createNotFoundException();
         }
 
-        return array($user->getSalt());
+        return array($user->getSalt() ?: null);
     }
     /**
      * Retrieve all entries. It could be filtered by many options.
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/WallabagRestControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/WallabagRestControllerTest.php
index 298cf10c1..815903fad 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/WallabagRestControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/WallabagRestControllerTest.php
@@ -35,6 +35,7 @@ class WallabagRestControllerTest extends WallabagTestCase
         $client = $this->createClient();
         $client->request('GET', '/api/salts/admin.json');
         $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $this->assertNotEmpty(json_decode($client->getResponse()->getContent()));
 
         $client->request('GET', '/api/salts/notfound.json');
         $this->assertEquals(404, $client->getResponse()->getStatusCode());