From 14f74d141ab5580688bfd46d2f74c026e43ed967 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Wed, 1 Apr 2015 06:11:44 +0200
Subject: Update to MediaWiki 1.24.2

---
 tests/phpunit/includes/api/ApiBlockTest.php | 83 +++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 tests/phpunit/includes/api/ApiBlockTest.php

(limited to 'tests/phpunit/includes/api/ApiBlockTest.php')

diff --git a/tests/phpunit/includes/api/ApiBlockTest.php b/tests/phpunit/includes/api/ApiBlockTest.php
new file mode 100644
index 00000000..d98eec6a
--- /dev/null
+++ b/tests/phpunit/includes/api/ApiBlockTest.php
@@ -0,0 +1,83 @@
+<?php
+
+/**
+ * @group API
+ * @group Database
+ * @group medium
+ *
+ * @covers ApiBlock
+ */
+class ApiBlockTest extends ApiTestCase {
+	protected function setUp() {
+		parent::setUp();
+		$this->doLogin();
+	}
+
+	protected function getTokens() {
+		return $this->getTokenList( self::$users['sysop'] );
+	}
+
+	function addDBData() {
+		$user = User::newFromName( 'UTApiBlockee' );
+
+		if ( $user->getId() == 0 ) {
+			$user->addToDatabase();
+			$user->setPassword( 'UTApiBlockeePassword' );
+
+			$user->saveSettings();
+		}
+	}
+
+	/**
+	 * This test has probably always been broken and use an invalid token
+	 * Bug tracking brokenness is https://bugzilla.wikimedia.org/35646
+	 *
+	 * Root cause is https://gerrit.wikimedia.org/r/3434
+	 * Which made the Block/Unblock API to actually verify the token
+	 * previously always considered valid (bug 34212).
+	 */
+	public function testMakeNormalBlock() {
+		$tokens = $this->getTokens();
+
+		$user = User::newFromName( 'UTApiBlockee' );
+
+		if ( !$user->getId() ) {
+			$this->markTestIncomplete( "The user UTApiBlockee does not exist" );
+		}
+
+		if ( !array_key_exists( 'blocktoken', $tokens ) ) {
+			$this->markTestIncomplete( "No block token found" );
+		}
+
+		$this->doApiRequest( array(
+			'action' => 'block',
+			'user' => 'UTApiBlockee',
+			'reason' => 'Some reason',
+			'token' => $tokens['blocktoken'] ), null, false, self::$users['sysop']->user );
+
+		$block = Block::newFromTarget( 'UTApiBlockee' );
+
+		$this->assertTrue( !is_null( $block ), 'Block is valid' );
+
+		$this->assertEquals( 'UTApiBlockee', (string)$block->getTarget() );
+		$this->assertEquals( 'Some reason', $block->mReason );
+		$this->assertEquals( 'infinity', $block->mExpiry );
+	}
+
+	/**
+	 * @expectedException UsageException
+	 * @expectedExceptionMessage The token parameter must be set
+	 */
+	public function testBlockingActionWithNoToken( ) {
+		$this->doApiRequest(
+			array(
+				'action' => 'block',
+				'user' => 'UTApiBlockee',
+				'reason' => 'Some reason',
+			),
+			null,
+			false,
+			self::$users['sysop']->user
+		);
+	}
+}
-- 
cgit v1.2.3-54-g00ecf