summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/tests/Access_Helper_Test.php4
-rw-r--r--core/tests/Photo_Helper_Test.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/core/tests/Access_Helper_Test.php b/core/tests/Access_Helper_Test.php
index 4b53c0ce..f629ef06 100644
--- a/core/tests/Access_Helper_Test.php
+++ b/core/tests/Access_Helper_Test.php
@@ -45,7 +45,7 @@ class Access_Helper_Test extends Unit_Test_Case {
}
public function groups_and_permissions_are_bound_to_columns_test() {
- access::register_permission("access_test");
+ access::register_permission("access_test", "Access Test");
$group = group::create("access_test");
// We have a new column for this perm / group combo
@@ -67,7 +67,7 @@ class Access_Helper_Test extends Unit_Test_Case {
$item->rand_key = ((float)mt_rand()) / (float)mt_getrandmax();
$item->sort_column = "id";
$item->sort_order = "ASC";
-
+
$item->add_to_parent($root);
// Simulate an event
diff --git a/core/tests/Photo_Helper_Test.php b/core/tests/Photo_Helper_Test.php
index 2219a846..2f2488bf 100644
--- a/core/tests/Photo_Helper_Test.php
+++ b/core/tests/Photo_Helper_Test.php
@@ -35,7 +35,7 @@ class Photo_Helper_Test extends Unit_Test_Case {
$this->assert_true(is_file($photo->resize_path()), "missing: {$photo->resize_path()}");
$this->assert_true(is_file($photo->thumb_path()), "missing: {$photo->thumb_path()}");
- $this->assert_equal($root, $photo->parent_id); // MPTT tests will cover other hierarchy checks
+ $this->assert_equal($root->id, $photo->parent_id); // MPTT tests cover other hierarchy checks
$this->assert_equal("$rand.jpg", $photo->name);
$this->assert_equal($rand, $photo->title);
$this->assert_equal($rand, $photo->description);