Get rid of all pseudo users and pseudo groups, while preserving all

other functionality.  This makes our user/group and access code
fully consistent.

1 files changed, 42 insertions, 40 deletions

diff --git a/core/tests/Access_Helper_Test.php b/core/tests/Access_Helper_Test.php
index 066b0a08..2e8f9f54 100644
--- a/core/tests/Access_Helper_Test.php
+++ b/core/tests/Access_Helper_Test.php
@@ -84,33 +84,33 @@ class Access_Helper_Test extends Unit_Test_Case {
     $intent = ORM::factory("access_intent")->where("item_id", $item)->find();
 
     // Allow
-    access::allow(0, "view", $item);
-    $this->assert_same(access::ALLOW, $intent->reload()->view_0);
+    access::allow(group::everybody(), "view", $item);
+    $this->assert_same(access::ALLOW, $intent->reload()->view_1);
 
     // Deny
-    access::deny(0, "view", $item);
+    access::deny(group::everybody(), "view", $item);
     $this->assert_same(
       access::DENY,
-      ORM::factory("access_intent")->where("item_id", $item)->find()->view_0);
+      ORM::factory("access_intent")->where("item_id", $item)->find()->view_1);
 
     // Allow again.  If the initial value was allow, then the first Allow clause above may not
     // have actually changed any values.
-    access::allow(0, "view", $item);
+    access::allow(group::everybody(), "view", $item);
     $this->assert_same(
       access::ALLOW,
-      ORM::factory("access_intent")->where("item_id", $item)->find()->view_0);
+      ORM::factory("access_intent")->where("item_id", $item)->find()->view_1);
 
-    access::reset(0, "view", $item);
+    access::reset(group::everybody(), "view", $item);
     $this->assert_same(
       null,
-      ORM::factory("access_intent")->where("item_id", $item)->find()->view_0);
+      ORM::factory("access_intent")->where("item_id", $item)->find()->view_1);
 
     $item->delete();
   }
 
   public function cant_reset_root_item_test() {
     try {
-      access::reset(0, "view", ORM::factory("item", 1));
+      access::reset(group::everybody(), "view", ORM::factory("item", 1));
     } catch (Exception $e) {
       return;
     }
@@ -120,8 +120,8 @@ class Access_Helper_Test extends Unit_Test_Case {
 
   public function can_view_item_test() {
     $root = ORM::factory("item", 1);
-    access::allow(0, "view", $root);
-    $this->assert_true(access::group_can(0, "view", $root));
+    access::allow(group::everybody(), "view", $root);
+    $this->assert_true(access::group_can(group::everybody(), "view", $root));
   }
 
   public function cant_view_child_of_hidden_parent_test() {
@@ -129,9 +129,9 @@ class Access_Helper_Test extends Unit_Test_Case {
     $album = ORM::factory("item")->add_to_parent($root);
     access::add_item($album);
 
-    access::deny(0, "view", $root);
-    access::reset(0, "view", $album);
-    $this->assert_false(access::group_can(0, "view", $album));
+    access::deny(group::everybody(), "view", $root);
+    access::reset(group::everybody(), "view", $album);
+    $this->assert_false(access::group_can(group::everybody(), "view", $album));
   }
 
   public function view_permissions_propagate_down_test() {
@@ -139,9 +139,9 @@ class Access_Helper_Test extends Unit_Test_Case {
     $album = ORM::factory("item")->add_to_parent($root);
     access::add_item($album);
 
-    access::allow(0, "view", $root);
-    access::reset(0, "view", $album);
-    $this->assert_true(access::group_can(0, "view", $album));
+    access::allow(group::everybody(), "view", $root);
+    access::reset(group::everybody(), "view", $album);
+    $this->assert_true(access::group_can(group::everybody(), "view", $album));
   }
 
   public function can_toggle_view_permissions_propagate_down_test() {
@@ -171,15 +171,15 @@ class Access_Helper_Test extends Unit_Test_Case {
     $album3->reload();
     $album4->reload();
 
-    access::allow(0, "view", $root);
-    access::deny(0, "view", $album1);
-    access::reset(0, "view", $album2);
-    access::reset(0, "view", $album3);
-    access::reset(0, "view", $album4);
-    $this->assert_false(access::group_can(0, "view", $album4));
+    access::allow(group::everybody(), "view", $root);
+    access::deny(group::everybody(), "view", $album1);
+    access::reset(group::everybody(), "view", $album2);
+    access::reset(group::everybody(), "view", $album3);
+    access::reset(group::everybody(), "view", $album4);
+    $this->assert_false(access::group_can(group::everybody(), "view", $album4));
 
-    access::allow(0, "view", $album1);
-    $this->assert_true(access::group_can(0, "view", $album4));
+    access::allow(group::everybody(), "view", $album1);
+    $this->assert_true(access::group_can(group::everybody(), "view", $album4));
   }
 
   public function revoked_view_permissions_cant_be_allowed_lower_down_test() {
@@ -187,15 +187,15 @@ class Access_Helper_Test extends Unit_Test_Case {
     $album = ORM::factory("item")->add_to_parent($root);
     access::add_item($album);
 
-    access::deny(0, "view", $root);
-    access::allow(0, "view", $album);
-    $this->assert_false(access::group_can(0, "view", $album));
+    access::deny(group::everybody(), "view", $root);
+    access::allow(group::everybody(), "view", $album);
+    $this->assert_false(access::group_can(group::everybody(), "view", $album));
   }
 
   public function can_edit_item_test() {
     $root = ORM::factory("item", 1);
-    access::allow(0, "edit", $root);
-    $this->assert_true(access::group_can(0, "edit", $root));
+    access::allow(group::everybody(), "edit", $root);
+    $this->assert_true(access::group_can(group::everybody(), "edit", $root));
   }
 
   public function non_view_permissions_propagate_down_test() {
@@ -203,9 +203,9 @@ class Access_Helper_Test extends Unit_Test_Case {
     $album = ORM::factory("item")->add_to_parent($root);
     access::add_item($album);
 
-    access::allow(0, "edit", $root);
-    access::reset(0, "edit", $album);
-    $this->assert_true(access::group_can(0, "edit", $album));
+    access::allow(group::everybody(), "edit", $root);
+    access::reset(group::everybody(), "edit", $album);
+    $this->assert_true(access::group_can(group::everybody(), "edit", $album));
   }
 
   public function non_view_permissions_can_be_revoked_lower_down_test() {
@@ -228,13 +228,13 @@ class Access_Helper_Test extends Unit_Test_Case {
     $outer->reload();
     $inner->reload();
 
-    access::allow(0, "edit", $root);
-    access::deny(0, "edit", $outer);
-    access::allow(0, "edit", $inner);
+    access::allow(group::everybody(), "edit", $root);
+    access::deny(group::everybody(), "edit", $outer);
+    access::allow(group::everybody(), "edit", $inner);
 
     // Outer album is not editable, inner one is.
-    $this->assert_false(access::group_can(0, "edit", $outer_photo));
-    $this->assert_true(access::group_can(0, "edit", $inner_photo));
+    $this->assert_false(access::group_can(group::everybody(), "edit", $outer_photo));
+    $this->assert_true(access::group_can(group::everybody(), "edit", $inner_photo));
   }
 
   public function i_can_edit_test() {
@@ -243,7 +243,9 @@ class Access_Helper_Test extends Unit_Test_Case {
     foreach ($user->groups as $group) {
       $user->remove($group);
     }
-    Session::instance()->set("user", $user);
+    // @todo remove this reload when http://dev.kohanaphp.com/ticket/959 is resolved
+    $user->reload();
+    user::set_active($user);
 
     // This user can't edit anything
     $root = ORM::factory("item", 1);
@@ -253,7 +255,7 @@ class Access_Helper_Test extends Unit_Test_Case {
     $group = group::create("access_test");
     $group->add($user);
     access::allow($group, "edit", $root);
-    Session::instance()->set("user", $user->reload());
+    user::set_active($user->reload());
 
     // And verify that the user can edit.
     $this->assert_true(access::can("edit", $root));