Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118729
Change subject: Simplify setup of RevisionCollectionPermissionsTest
......................................................................
Simplify setup of RevisionCollectionPermissionsTest
Change-Id: I0a9587cbc52967d57cdc5d4341d0523268037a5e
---
M tests/RevisionCollectionPermissionsTest.php
1 file changed, 2 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/29/118729/1
diff --git a/tests/RevisionCollectionPermissionsTest.php
b/tests/RevisionCollectionPermissionsTest.php
index c4c7c44..cd11559 100644
--- a/tests/RevisionCollectionPermissionsTest.php
+++ b/tests/RevisionCollectionPermissionsTest.php
@@ -65,11 +65,8 @@
// not our permissions implementation works well.
// This will load default $wgGroupPermissions + Flow settings,
so we can
// test if permissions work well, regardless of any custom
config.
- global $IP, $wgFlowGroupPermissions;
- $wgGroupPermissions = array();
- require "$IP/includes/DefaultSettings.php";
- $wgGroupPermissions = array_merge_recursive(
$wgGroupPermissions, $wgFlowGroupPermissions );
- $this->setMwGlobals( 'wgGroupPermissions', $wgGroupPermissions
);
+ global $wgFlowGroupPermissions;
+ $this->setMwGlobals( 'wgGroupPermissions',
$wgFlowGroupPermissions );
// When external store is used, data is written to "blobs"
table, which
// by default doesn't exist - let's just not use
externalstorage in test
--
To view, visit https://gerrit.wikimedia.org/r/118729
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a9587cbc52967d57cdc5d4341d0523268037a5e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
