From d417de70fcf39e0a7a15ba780b597914d16ca0f7 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Wed, 12 Mar 2014 18:12:23 +0100
Subject: Update to MediaWiki 1.22.4

---
 tests/phpunit/includes/api/ApiBlockTest.php | 95 -----------------------------
 1 file changed, 95 deletions(-)
 delete 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
deleted file mode 100644
index 8afb748a..00000000
--- a/tests/phpunit/includes/api/ApiBlockTest.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-/**
- * @group API
- * @group Database
- * @group medium
- */
-class ApiBlockTest extends ApiTestCase {
-	protected function setUp() {
-		parent::setUp();
-		$this->doLogin();
-	}
-
-	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 );
-	}
-
-	/**
-	 * Attempting to block without a token should give a UsageException with
-	 * error message:
-	 *   "The token parameter must be set"
-	 *
-	 * @dataProvider provideBlockUnblockAction
-	 * @expectedException UsageException
-	 */
-	public function testBlockingActionWithNoToken( $action ) {
-		$this->doApiRequest(
-			array(
-				'action' => $action,
-				'user' => 'UTApiBlockee',
-				'reason' => 'Some reason',
-			),
-			null,
-			false,
-			self::$users['sysop']->user
-		);
-	}
-
-	/**
-	 * Just provide the 'block' and 'unblock' action to test both API calls
-	 */
-	public static function provideBlockUnblockAction() {
-		return array(
-			array( 'block' ),
-			array( 'unblock' ),
-		);
-	}
-}
-- 
cgit v1.2.3-54-g00ecf