aboutsummaryrefslogtreecommitdiffstats
path: root/tests/unit/Access
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-11-04 18:18:56 -0700
committerzotlabs <mike@macgirvin.com>2017-11-04 18:18:56 -0700
commit65bc146afa82f3f0f2e3921660189892af42c15b (patch)
treeafbe430a72f01a2ba02b05f4587cf42196c6a136 /tests/unit/Access
parent9630d2ef2c042c5531bf3a553317ae3bd115f3dc (diff)
parent6995d54a3cc162d87f881f6e206fa356230fd9e8 (diff)
downloadvolse-hubzilla-65bc146afa82f3f0f2e3921660189892af42c15b.tar.gz
volse-hubzilla-65bc146afa82f3f0f2e3921660189892af42c15b.tar.bz2
volse-hubzilla-65bc146afa82f3f0f2e3921660189892af42c15b.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'tests/unit/Access')
-rw-r--r--tests/unit/Access/AccessListTest.php4
-rw-r--r--tests/unit/Access/PermissionsTest.php4
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/unit/Access/AccessListTest.php b/tests/unit/Access/AccessListTest.php
index 3dbe5cd65..dbc19fabb 100644
--- a/tests/unit/Access/AccessListTest.php
+++ b/tests/unit/Access/AccessListTest.php
@@ -121,7 +121,9 @@ class AccessListTest extends UnitTestCase {
/**
* set_from_array() calls some other functions, too which are not yet unit tested.
- * @uses ::perms2str()
+ * @uses ::perms2str
+ * @uses ::sanitise_acl
+ * @uses ::notags
*/
public function testSetFromArray() {
// array
diff --git a/tests/unit/Access/PermissionsTest.php b/tests/unit/Access/PermissionsTest.php
index 93c641fb1..73d0e7827 100644
--- a/tests/unit/Access/PermissionsTest.php
+++ b/tests/unit/Access/PermissionsTest.php
@@ -57,7 +57,7 @@ class PermissionsTest extends UnitTestCase {
[],
['perm1' => 0, 'perm2' => 0]
],
- 'valild' => [
+ 'valid' => [
[['perm1' => 1]],
['perm1' => 1, 'perm2' => 0]
]
@@ -145,4 +145,4 @@ class PermissionsTest extends UnitTestCase {
]
];
}
-} \ No newline at end of file
+}