fix tests

Author: microstudi

src/Goteo/Application/EventListener/SessionListener.php

@@ -66,7 +66,9 @@ public function onRequest(GetResponseEvent $event) {
                 // reduce host: ca.goteo.org => goteo.org
                 $host = implode('.', $parts);
             }
-            ini_set('session.cookie_domain', ".$host");
+            if(!Session::getSession()->isStarted()) {
+                ini_set('session.cookie_domain', ".$host");
+            }
         }
         Session::start('goteo-' . Config::get('env'), Config::get('session.time'));
 

src/Goteo/Model/User/UserRoles.php

@@ -121,7 +121,7 @@ public function getRoleNames() {
      */
     public function save(&$errors = []) {
         $values = [':user_id' => $this->user->id];
-        $inserts = '';
+        $inserts = [];
         $i = 0;
         foreach($this as $role => $permissions) {
             if($role !== 'user') {

tests/Goteo/Application/RoleTest.php

@@ -98,7 +98,7 @@ public function testAddPermissions() {
         $this->assertInternalType('array', $permissions);
         $this->assertArrayHasKey('perm-test1', $permissions);
         $this->assertArrayHasKey('perm-test2', $permissions);
-        $this->assertContains('testmodel', $permissions['perm-test2']);
+        $this->assertContains('user_testmodel', $permissions['perm-test2']['relational'], print_r($permissions['perm-test2'], 1));
 
     }
 

tests/Goteo/Model/Blog/Post/CommentTest.php

@@ -4,9 +4,15 @@
 namespace Goteo\Model\Blog\Post\Tests;
 
 use Goteo\Model\Blog\Post\Comment;
+use Goteo\Model\Blog\Post;
 
 class CommentTest extends \PHPUnit_Framework_TestCase {
-    private static $data = array('text' => 'Test comment', 'post' => 1, 'user' => 'test');
+    private static $data = array('text' => 'Test comment');
+    private static $post_data = array('title' => 'Test post', 'text' => 'test text',
+        'blog' => 1,
+        'date' => '2015-01-01',
+        'allow' => 1,
+        'publish' => 1);
 
     public function testInstance() {
         \Goteo\Core\DB::cache(false);
@@ -26,10 +32,23 @@ public function testValidate($ob) {
         $this->assertFalse($ob->save());
     }
 
-    public function testCreate() {
-        $ob = new Comment(self::$data);
+    public function testCreatePost() {
+        $errors = [];
+        $ob = new Post(self::$post_data);
         $this->assertTrue($ob->validate($errors));
-        $this->assertTrue($ob->save());
+        $this->assertTrue($ob->save($errors), print_r($errors, 1));
+        return $ob;
+    }
+    /**
+     * @depends testCreatePost
+     */
+    public function testCreate($post) {
+        $errors = [];
+        self::$data['post'] = $post->id;
+        self::$data['user'] = get_test_user()->id;
+        $ob = new Comment(self::$data);
+        $this->assertTrue($ob->validate($errors), print_r($errors, 1));
+        $this->assertTrue($ob->save($errors), print_r($errors, 1));
         $ob = Comment::get($ob->id);
         $this->assertInstanceOf('\Goteo\Model\Blog\Post\Comment', $ob);
 
@@ -53,4 +72,13 @@ public function testNonExisting($ob) {
         $this->assertFalse($ob);
         $this->assertFalse(Comment::delete($ob->id));
     }
+
+
+    /**
+     * Some cleanup
+     */
+    static function tearDownAfterClass() {
+        Post::query('delete from `post` where id = ?', self::$data['post']);
+        delete_test_user();
+    }
 }

tests/Goteo/Model/LogTest.php

@@ -5,6 +5,7 @@
 
 use Goteo\TestCase;
 use Goteo\Model\Log;
+use Goteo\Application\Session;
 
 class LogTest extends TestCase {
     private static $data = ['scope' => 'test', 'target_type' => 'user', 'text' => 'Log test text'];
@@ -59,6 +60,7 @@ public function testNonExisting($ob) {
      * @depends testDelete
      */
     public function testAppend($ob) {
+        Session::setUser(get_test_user());
         try {
             Log::append();
         } catch(\Exception $e) {
@@ -73,8 +75,8 @@ public function testAppend($ob) {
      * Some cleanup
      */
     static function tearDownAfterClass() {
-        delete_test_node();
-        delete_test_project();
         delete_test_user();
+        delete_test_project();
+        delete_test_node();
     }
 }

tests/Goteo/Model/MatcherTest.php

@@ -121,15 +121,15 @@ public function testAddUsers($ob) {
         //Creates users first
         foreach(self::$user_data as $i => $user) {
             if(!($uob = User::get($user['userid']))) {
-                echo "\nCreating user [{$user[userid]}]";
+                echo "\nCreating user [{$user['userid']}]";
                 $uob = new User($user);
                 $this->assertTrue($uob->save($errors, ['active']), print_r($errors, 1));
             }
 
             $this->assertInstanceOf('\Goteo\Model\User', $uob, print_r($errors, 1));
 
             self::$user_data[$i]['ob'] = $uob;
-            echo "\nSetting user's pool [{$user[userid]}]";
+            echo "\nSetting user's pool [{$user['userid']}]";
             Matcher::query("REPLACE invest (`user`, amount, status, method, invested, charged, pool) VALUES (:user, :amount, :status, 'dummy', NOW(), NOW(), 1)", [':user' => $user['userid'], ':amount' => $user['pool'], ':status' => Invest::STATUS_TO_POOL]);
             Matcher::query("REPLACE user_pool (`user`, amount) VALUES (:user, :amount)", [':user' => $user['userid'], ':amount' => $user['pool']]);
             $this->assertEquals($user['pool'], $uob->getPool()->amount);
@@ -302,11 +302,11 @@ public function testNonExisting($ob) {
 
     public function testCleanUsers() {
         foreach(self::$user_data as $user) {
-            echo "\nDeleting user [{$user[userid]}]";
+            echo "\nDeleting user [{$user['userid']}]";
             Matcher::query("DELETE FROM user_pool WHERE `user` = ?", $user['userid']);
             Matcher::query("DELETE FROM invest WHERE `user` = ?", $user['userid']);
             $user['ob']->dbDelete();
-            $this->assertEquals(0, Matcher::query("SELECT COUNT(*) FROM `user` WHERE id = ?", $user['userid'])->fetchColumn(), "Unable to delete user [{$user[userid]}]. Please delete id manually");
+            $this->assertEquals(0, Matcher::query("SELECT COUNT(*) FROM `user` WHERE id = ?", $user['userid'])->fetchColumn(), "Unable to delete user [{$user['userid']}]. Please delete id manually");
         }
     }
 

tests/Goteo/Model/User/UserRolesTest.php

@@ -60,8 +60,8 @@ public function testAddRoles($roles) {
      */
     public function testRoleNames($roles) {
         $this->assertInternalType('array', $roles->getRoleNames());
-        $this->assertContains('user', $roles->getRoleNames());
-        $this->assertContains('admin', $roles->getRoleNames());
+        $this->assertArrayHasKey('user', $roles->getRoleNames(), print_r($roles->getRoleNames(), 1));
+        $this->assertArrayHasKey('admin', $roles->getRoleNames());
     }
 
     /**
@@ -88,6 +88,7 @@ public function testRemoveRoles($roles) {
      * @depends testRemoveRoles
      */
     public function testPersistence($roles) {
+        $errors = [];
         $this->assertInstanceOf('Goteo\Model\User\UserRoles', $roles->addRole('admin'));
         $this->assertTrue($roles->save($errors), print_r($errors, true));
         return $roles;

tests/Goteo/Util/MatcherProcessor/DuplicateInvestMatcherProcessorTest.php

@@ -47,7 +47,7 @@ public function testAddUsers($matcher) {
         //Creates users first
         foreach(self::$user_data as $i => $user) {
             if(!($uob = User::get($user['userid']))) {
-                echo "\nCreating user [{$user[userid]}]";
+                echo "\nCreating user [{$user['userid']}]";
                 $uob = new User($user);
                 $this->assertTrue($uob->save($errors, ['active']), print_r($errors, 1));
             }
@@ -57,7 +57,7 @@ public function testAddUsers($matcher) {
             self::$user_data[$i]['ob'] = $uob;
             if(isset($user['pool'])) {
 
-                echo "\nSetting user's pool [{$user[userid]}]";
+                echo "\nSetting user's pool [{$user['userid']}]";
                 Matcher::query("REPLACE invest (`user`, amount, status, method, invested, charged, pool) VALUES (:user, :amount, :status, 'dummy', NOW(), NOW(), 1)", [':user' => $user['userid'], ':amount' => $user['pool'], ':status' => Invest::STATUS_TO_POOL]);
 
                 Matcher::query("REPLACE user_pool (`user`, amount) VALUES (:user, :amount)", [':user' => $user['userid'], ':amount' => $user['pool']]);
@@ -251,11 +251,11 @@ public function testDelete($matcher) {
     }
     public function testCleanUsers() {
         foreach(self::$user_data as $user) {
-            echo "\nDeleting user [{$user[userid]}]";
+            echo "\nDeleting user [{$user['userid']}]";
             Matcher::query("DELETE FROM invest WHERE `user` = ?", $user['userid']);
             Matcher::query("DELETE FROM user_pool WHERE `user` = ?", $user['userid']);
             $user['ob']->dbDelete();
-            $this->assertEquals(0, Matcher::query("SELECT COUNT(*) FROM `user` WHERE id = ?", $user['userid'])->fetchColumn(), "Unable to delete user [{$user[userid]}]. Please delete id manually");
+            $this->assertEquals(0, Matcher::query("SELECT COUNT(*) FROM `user` WHERE id = ?", $user['userid'])->fetchColumn(), "Unable to delete user [{$user['userid']}]. Please delete id manually");
         }
     }