Legoktm has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/363514 )
Change subject: Unbreak BaseBlacklist::getTypeFromTitle() and add tests
......................................................................
Unbreak BaseBlacklist::getTypeFromTitle() and add tests
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
---
M BaseBlacklist.php
A tests/phpunit/BaseBlacklistTest.php
2 files changed, 56 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SpamBlacklist
refs/changes/14/363514/1
diff --git a/BaseBlacklist.php b/BaseBlacklist.php
index 77d4545..883d949 100644
--- a/BaseBlacklist.php
+++ b/BaseBlacklist.php
@@ -179,12 +179,15 @@
/**
* 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] );
diff --git a/tests/phpunit/BaseBlacklistTest.php
b/tests/phpunit/BaseBlacklistTest.php
new file mode 100644
index 0000000..634a266
--- /dev/null
+++ b/tests/phpunit/BaseBlacklistTest.php
@@ -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 );
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/363514
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I98688362f222ab65115fbec46e0f67587d19022d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SpamBlacklist
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
