wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-09-24 02:38:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify test parameters

Browse source 
Instead of having lots of huge arrays, use a fixed one and only
overwrite the needed parameters.

Change-Id: I3b2e763bd8835207dc5df1db43d3e1881e6961c3
This commit is contained in:
Daimona Eaytoy 2018-10-12 16:40:44 +02:00
parent c99328a6e6
commit cbd57fe7a1
1 changed files with 31 additions and 228 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

259
tests/phpunit/AbuseFilterSaveTest.php
View file

@ -205,9 +205,38 @@ class AbuseFilterSaveTest extends MediaWikiTestCase {
self::createNewFilters( $args['testData']['needsOtherFilters'] );
}
$fixedParameters = [
'id' => 'new',
'notes' => '',
'group' => 'default',
'enabled' => true,
'hidden' => false,
'global' => false,
'deleted' => false,
'throttled' => 0,
'throttleEnabled' => false,
'throttleCount' => 0,
'throttlePeriod' => 0,
'throttleGroups' => '',
'warnEnabled' => false,
'warnMessage' => 'abusefilter-warning',
'warnMessageOther' => '',
'disallowEnabled' => false,
'blockautopromoteEnabled' => false,
'degroupEnabled' => false,
'blockEnabled' => false,
'blockTalk' => false,
'blockAnons' => 'infinity',
'blockUsers' => 'infinity',
'rangeblockEnabled' => false,
'tagEnabled' => false,
'tagTags' => ''
];
// Extract parameters from testset and build what we need to save a filter
self::$mParameters = $args['filterParameters'];
$filter = $args['filterParameters']['id'];
// The values specified in the testset will overwrite the fixed ones.
self::$mParameters = $args['filterParameters'] + $fixedParameters;
$filter = self::$mParameters['id'];
$viewEdit = self::getViewEdit( $filter );
$request = self::getRequest();
list( $newRow, $actions ) = $viewEdit->loadRequest( $filter );
@ -265,33 +294,9 @@ class AbuseFilterSaveTest extends MediaWikiTestCase {
[
[
'filterParameters' => [
'id' => 'new',
'rules' => '',
'description' => '',
'notes' => '',
'group' => 'default',
'enabled' => true,
'hidden' => false,
'global' => false,
'deleted' => false,
'throttled' => 0,
'throttleEnabled' => false,
'throttleCount' => 0,
'throttlePeriod' => 0,
'throttleGroups' => '',
'warnEnabled' => false,
'warnMessage' => 'abusefilter-warning',
'warnMessageOther' => '',
'disallowEnabled' => false,
'blockautopromoteEnabled' => true,
'degroupEnabled' => false,
'blockEnabled' => false,
'blockTalk' => false,
'blockAnons' => 'infinity',
'blockUsers' => 'infinity',
'rangeblockEnabled' => false,
'tagEnabled' => false,
'tagTags' => ''
],
'testData' => [
'doingWhat' => 'Trying to save a filter without description and rules',
@ -307,33 +312,10 @@ class AbuseFilterSaveTest extends MediaWikiTestCase {
[
[
'filterParameters' => [
'id' => 'new',
'rules' => '/* My rules */',
'description' => 'Some new filter',
'notes' => '',
'group' => 'default',
'enabled' => false,
'hidden' => false,
'global' => false,
'deleted' => true,
'throttled' => 0,
'throttleEnabled' => false,
'throttleCount' => 0,
'throttlePeriod' => 0,
'throttleGroups' => '',
'warnEnabled' => false,
'warnMessage' => 'abusefilter-warning',
'warnMessageOther' => '',
'disallowEnabled' => false,
'blockautopromoteEnabled' => false,
'degroupEnabled' => false,
'blockEnabled' => false,
'blockTalk' => false,
'blockAnons' => 'infinity',
'blockUsers' => 'infinity',
'rangeblockEnabled' => false,
'tagEnabled' => false,
'tagTags' => ''
],
'testData' => [
'doingWhat' => 'Trying to save a filter with only rules and description',
@ -349,33 +331,11 @@ class AbuseFilterSaveTest extends MediaWikiTestCase {
[
[
'filterParameters' => [
'id' => 'new',
'rules' => 'rlike',
'description' => 'This syntax aint good',
'notes' => '',
'group' => 'default',
'enabled' => true,
'hidden' => false,
'global' => false,
'deleted' => false,
'throttled' => 0,
'throttleEnabled' => false,
'throttleCount' => 0,
'throttlePeriod' => 0,
'throttleGroups' => '',
'warnEnabled' => false,
'warnMessage' => 'abusefilter-warning',
'warnMessageOther' => '',
'disallowEnabled' => false,
'blockautopromoteEnabled' => false,
'degroupEnabled' => false,
'blockEnabled' => true,
'blockTalk' => true,
'blockAnons' => '8 hours',
'blockUsers' => 'infinity',
'rangeblockEnabled' => false,
'tagEnabled' => false,
'tagTags' => ''
],
'testData' => [
'doingWhat' => 'Trying to save a filter with wrong syntax',
@ -391,33 +351,12 @@ class AbuseFilterSaveTest extends MediaWikiTestCase {
[
[
'filterParameters' => [
'id' => 'new',
'rules' => '1==1',
'description' => 'Enabled and deleted',
'notes' => '',
'group' => 'default',
'enabled' => true,
'hidden' => false,
'global' => false,
'deleted' => true,
'throttled' => 0,
'throttleEnabled' => false,
'throttleCount' => 0,
'throttlePeriod' => 0,
'throttleGroups' => '',
'warnEnabled' => false,
'warnMessage' => 'abusefilter-warning',
'warnMessageOther' => '',
'disallowEnabled' => false,
'blockautopromoteEnabled' => false,
'degroupEnabled' => false,
'blockEnabled' => true,
'blockTalk' => true,
'blockAnons' => '8 hours',
'blockUsers' => 'infinity',
'rangeblockEnabled' => false,
'tagEnabled' => false,
'tagTags' => ''
],
'testData' => [
'doingWhat' => 'Trying to save a filter marking it both enabled and deleted',
@ -433,31 +372,10 @@ class AbuseFilterSaveTest extends MediaWikiTestCase {
[
[
'filterParameters' => [
'id' => 'new',
'rules' => '1==1',
'description' => 'Reserved tag',
'notes' => 'Some notes',
'group' => 'default',
'enabled' => true,
'hidden' => true,
'global' => false,
'deleted' => false,
'throttled' => 0,
'throttleEnabled' => false,
'throttleCount' => 0,
'throttlePeriod' => 0,
'throttleGroups' => '',
'warnEnabled' => false,
'warnMessage' => 'abusefilter-warning',
'warnMessageOther' => '',
'disallowEnabled' => false,
'blockautopromoteEnabled' => false,
'degroupEnabled' => false,
'blockEnabled' => false,
'blockTalk' => false,
'blockAnons' => 'infinity',
'blockUsers' => 'infinity',
'rangeblockEnabled' => false,
'tagEnabled' => true,
'tagTags' => 'mw-undo'
],
@ -475,31 +393,9 @@ class AbuseFilterSaveTest extends MediaWikiTestCase {
[
[
'filterParameters' => [
'id' => 'new',
'rules' => '1==1',
'description' => 'Invalid tag',
'notes' => 'Some notes',
'group' => 'default',
'enabled' => true,
'hidden' => false,
'global' => false,
'deleted' => false,
'throttled' => 0,
'throttleEnabled' => false,
'throttleCount' => 0,
'throttlePeriod' => 0,
'throttleGroups' => '',
'warnEnabled' => false,
'warnMessage' => 'abusefilter-warning',
'warnMessageOther' => '',
'disallowEnabled' => false,
'blockautopromoteEnabled' => false,
'degroupEnabled' => false,
'blockEnabled' => false,
'blockTalk' => false,
'blockAnons' => 'infinity',
'blockUsers' => 'infinity',
'rangeblockEnabled' => false,
'tagEnabled' => true,
'tagTags' => 'some|tag'
],
@ -517,33 +413,10 @@ class AbuseFilterSaveTest extends MediaWikiTestCase {
[
[
'filterParameters' => [
'id' => 'new',
'rules' => '1==1',
'description' => 'Global without perms',
'notes' => '',
'group' => 'default',
'enabled' => true,
'hidden' => false,
'global' => true,
'deleted' => false,
'throttled' => 0,
'throttleEnabled' => false,
'throttleCount' => 0,
'throttlePeriod' => 0,
'throttleGroups' => '',
'warnEnabled' => false,
'warnMessage' => 'abusefilter-warning',
'warnMessageOther' => '',
'disallowEnabled' => true,
'blockautopromoteEnabled' => false,
'degroupEnabled' => false,
'blockEnabled' => false,
'blockTalk' => false,
'blockAnons' => 'infinity',
'blockUsers' => 'infinity',
'rangeblockEnabled' => false,
'tagEnabled' => false,
'tagTags' => ''
],
'testData' => [
'doingWhat' => 'Trying to save a global filter without enough rights',
@ -559,33 +432,11 @@ class AbuseFilterSaveTest extends MediaWikiTestCase {
[
[
'filterParameters' => [
'id' => 'new',
'rules' => '1==1',
'description' => 'Global with invalid warn message',
'notes' => '',
'group' => 'default',
'enabled' => true,
'hidden' => false,
'global' => true,
'deleted' => false,
'throttled' => 0,
'throttleEnabled' => false,
'throttleCount' => 0,
'throttlePeriod' => 0,
'throttleGroups' => '',
'warnEnabled' => true,
'warnMessage' => 'abusefilter-beautiful-warning',
'warnMessageOther' => '',
'disallowEnabled' => false,
'blockautopromoteEnabled' => false,
'degroupEnabled' => false,
'blockEnabled' => false,
'blockTalk' => false,
'blockAnons' => 'infinity',
'blockUsers' => 'infinity',
'rangeblockEnabled' => false,
'tagEnabled' => false,
'tagTags' => ''
],
'testData' => [
'doingWhat' => 'Trying to save a global filter with a custom warn message',
@ -602,33 +453,9 @@ class AbuseFilterSaveTest extends MediaWikiTestCase {
[
[
'filterParameters' => [
'id' => 'new',
'rules' => '1==1',
'description' => 'Restricted action',
'notes' => '',
'group' => 'default',
'enabled' => true,
'hidden' => false,
'global' => false,
'deleted' => false,
'throttled' => 0,
'throttleEnabled' => false,
'throttleCount' => 0,
'throttlePeriod' => 0,
'throttleGroups' => '',
'warnEnabled' => false,
'warnMessage' => 'abusefilter-warning',
'warnMessageOther' => '',
'disallowEnabled' => false,
'blockautopromoteEnabled' => false,
'degroupEnabled' => true,
'blockEnabled' => false,
'blockTalk' => false,
'blockAnons' => 'infinity',
'blockUsers' => 'infinity',
'rangeblockEnabled' => false,
'tagEnabled' => false,
'tagTags' => ''
],
'testData' => [
'doingWhat' => 'Trying to save a filter with a restricted action',
@ -647,30 +474,6 @@ class AbuseFilterSaveTest extends MediaWikiTestCase {
'id' => '1',
'rules' => '/**/',
'description' => 'Mock filter',
'notes' => '',
'group' => 'default',
'enabled' => true,
'hidden' => false,
'global' => false,
'deleted' => false,
'throttled' => 0,
'throttleEnabled' => false,
'throttleCount' => 0,
'throttlePeriod' => 0,
'throttleGroups' => '',
'warnEnabled' => false,
'warnMessage' => 'abusefilter-warning',
'warnMessageOther' => '',
'disallowEnabled' => false,
'blockautopromoteEnabled' => false,
'degroupEnabled' => false,
'blockEnabled' => false,
'blockTalk' => false,
'blockAnons' => 'infinity',
'blockUsers' => 'infinity',
'rangeblockEnabled' => false,
'tagEnabled' => false,
'tagTags' => ''
],
'testData' => [
'doingWhat' => 'Trying to save a filter without changing anything',