Merge branch 'master' of git://github.com/gallery/gallery3

2 files changed, 4 insertions, 12 deletions

diff --git a/modules/user/tests/User_Groups_Test.php b/modules/user/tests/User_Groups_Test.php
index 3da8dd34..163b7d79 100644
--- a/modules/user/tests/User_Groups_Test.php
+++ b/modules/user/tests/User_Groups_Test.php
@@ -21,15 +21,15 @@
 class User_Groups_Test extends Unit_Test_Case {
   public function teardown() {
     try {
-      $group = ORM::factory("group")->where("name", "user_groups_test")->find();
-      if ($group->loaded) {
+      $group = ORM::factory("group")->where("name", "=", "user_groups_test")->find();
+      if ($group->loaded()) {
         $group->delete();
       }
     } catch (Exception $e) { }
 
     try {
-      $user = ORM::factory("user")->where("name", "user_groups_test")->find();
-      if ($user->loaded) {
+      $user = ORM::factory("user")->where("name", "=", "user_groups_test")->find();
+      if ($user->loaded()) {
         $user->delete();
       }
     } catch (Exception $e) { }
diff --git a/modules/user/tests/User_Installer_Test.php b/modules/user/tests/User_Installer_Test.php
index 37498454..12a10eda 100644
--- a/modules/user/tests/User_Installer_Test.php
+++ b/modules/user/tests/User_Installer_Test.php
@@ -41,18 +41,10 @@ class User_Installer_Test extends Unit_Test_Case {
     $group = ORM::factory("group", 1);
     $this->assert_equal("Everybody", $group->name);
     $this->assert_true($group->special);
-
-    $this->assert_equal(
-      array("guest", "admin"),
-      array_keys($group->users->select_list("name")));
   }
 
   public function install_creates_registered_group_test() {
     $group = ORM::factory("group", 2);
     $this->assert_equal("Registered Users", $group->name);
-
-    $this->assert_equal(
-      array("admin"),
-      array_keys($group->users->select_list("name")));
   }
 }