Merge pull request #1434 from wallabag/travis-db

Add multiple database tests on Travis

diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index 73484d86c2f0949a01649a6954cd8985e1893677..5affdee894c66cd2c9afa342f685266b228e4734 100644 (file)
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -98,6 +98,8 @@ class ConfigController extends Controller
 
         // handle adding new user
         $newUser = new User();
+        // enable created user by default
+        $newUser->setEnabled(true);
         $newUserForm = $this->createForm(new NewUserType(), $newUser, array('validation_groups' => array('Profile')));
         $newUserForm->handleRequest($request);
 

diff --git a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
index 116eec602f241c9f67aaf5fb06b945924fde5277..3407fc5e05ceec8f821b44b1ec616ca8c122b2e0 100644 (file)
--- a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
@@ -337,6 +337,14 @@ class ConfigControllerTest extends WallabagCoreTestCase
 
         $this->assertGreaterThan(1, $alert = $crawler->filter('div.messages.success')->extract(array('_text')));
         $this->assertContains('User "wallace" added', $alert[0]);
+
+        $em = $client->getContainer()->get('doctrine.orm.entity_manager');
+        $user = $em
+            ->getRepository('WallabagCoreBundle:User')
+            ->findOneByUsername('wallace');
+
+        $this->assertTrue(false !== $user);
+        $this->assertTrue($user->isEnabled());
     }
 
     public function testRssUpdateResetToken()