aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-04-23 11:52:32 +0200
committerMario Vavti <mario@mariovavti.com>2018-04-23 11:52:32 +0200
commit5bd1ea0b959494bb981335c992783b69f9a9de6d (patch)
treec5130ae2b01ca204cdc44370476fbfc2c49ca1d9 /tests
parent689ced2ac007f086ba72151c94f4d4975e3ed9de (diff)
parent9ac67b44e42f433e34f60556e631b7573a83eb50 (diff)
downloadvolse-hubzilla-5bd1ea0b959494bb981335c992783b69f9a9de6d.tar.gz
volse-hubzilla-5bd1ea0b959494bb981335c992783b69f9a9de6d.tar.bz2
volse-hubzilla-5bd1ea0b959494bb981335c992783b69f9a9de6d.zip
Merge branch 'dev' into 3.4RC
Diffstat (limited to 'tests')
-rw-r--r--tests/unit/Access/PermissionLimitsTest.php2
-rw-r--r--tests/unit/Access/PermissionRolesTest.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/unit/Access/PermissionLimitsTest.php b/tests/unit/Access/PermissionLimitsTest.php
index 58595111a..57ad42a19 100644
--- a/tests/unit/Access/PermissionLimitsTest.php
+++ b/tests/unit/Access/PermissionLimitsTest.php
@@ -66,7 +66,7 @@ class PermissionLimitsTest extends UnitTestCase {
$this->assertEquals(PERMS_SPECIFIC, $stdlimits['write_pages']);
$this->assertEquals(PERMS_SPECIFIC, $stdlimits['write_wiki']);
$this->assertEquals(PERMS_SPECIFIC, $stdlimits['post_wall']);
- $this->assertEquals(PERMS_PUBLIC, $stdlimits['post_comments']);
+ $this->assertEquals(PERMS_SPECIFIC, $stdlimits['post_comments']);
$this->assertEquals(PERMS_SPECIFIC, $stdlimits['post_mail']);
$this->assertEquals(PERMS_SPECIFIC, $stdlimits['post_like']);
$this->assertEquals(PERMS_SPECIFIC, $stdlimits['tag_deliver']);
diff --git a/tests/unit/Access/PermissionRolesTest.php b/tests/unit/Access/PermissionRolesTest.php
index f2636da62..58fd88bb1 100644
--- a/tests/unit/Access/PermissionRolesTest.php
+++ b/tests/unit/Access/PermissionRolesTest.php
@@ -62,7 +62,7 @@ class PermissionRolesTest extends UnitTestCase {
$this->assertEquals($roles, $r->roles());
$socialNetworking = [
- 'social_party' => 'Social - Party',
+ 'social_federation' => 'Social - Federation',
'social' => 'Social - Mostly Public',
'social_restricted' => 'Social - Restricted',
'social_private' => 'Social - Private'