wikimedia/mediawiki-extensions-SpamBlacklist
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/SpamBlacklist synced 2024-11-23 22:54:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unbreak BaseBlacklist::getTypeFromTitle() and add tests

Browse source 
The first part of the title is supposed to be capitalized, so call
ucfirst on it, and then make blacklist and whitelist lowercase. Add
tests to verify the known blacklist and whitelist types are recognized
correctly.

This will make validation of SpamBlacklist messages upon edit work
again.

Bug: T169838
Change-Id: I98688362f222ab65115fbec46e0f67587d19022d
This commit is contained in:
Kunal Mehta 2017-07-05 18:13:28 -07:00 committed by Legoktm
parent e6b3d85641
commit 66e8e29ea6
2 changed files with 56 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
BaseBlacklist.php
View file

@ -179,12 +179,15 @@ abstract class BaseBlacklist {
/**
* Returns the type of blacklist from the given title
*
* @todo building a regex for this is pretty overkill
* @param Title $title
* @return bool|string
*/
public static function getTypeFromTitle( Title $title ) {
$types = array_map( 'preg_quote', array_keys( self::$blacklistTypes ), [ '/' ] );
$regex = '/(' . implode( '|', $types ). ')-(?:Blacklist|Whitelist)/';
global $wgContLang;
$types = array_map( [ $wgContLang, 'ucfirst' ], array_keys( self::$blacklistTypes ) );
$regex = '/(' . implode( '|', $types ). ')-(?:blacklist|whitelist)/';
if ( preg_match( $regex, $title->getDBkey(), $m ) ) {
return strtolower( $m[1] );

51
tests/phpunit/BaseBlacklistTest.php Normal file
View file

@ -0,0 +1,51 @@
<?php
/**
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* http://www.gnu.org/copyleft/gpl.html
*
* @file
*/
/**
* @covers BaseBlacklist
*/
class BaseBlacklistTest extends MediaWikiTestCase {
/**
* @return array
*/
public static function provideGetTypeFromTitle() {
return [
[ 'MediaWiki:Spam-blacklist', 'spam' ],
[ 'MediaWiki:Spam-whitelist', 'spam' ],
[ 'MediaWiki:Email-whitelist', 'email' ],
[ 'MediaWiki:Email-blacklist', 'email' ],
[ 'MediaWiki:A random page', false ],
[ 'Another random page', false ],
];
}
/**
* @dataProvider provideGetTypeFromTitle
* @param string $title
* @param string|bool $expected
*/
public function testGetTypeFromTitle( $title, $expected ) {
$title = Title::newFromText( $title );
$output = BaseBlacklist::getTypeFromTitle( $title );
$this->assertEquals( $expected, $output );
}
}