From 91e194556c52d2f354344f930419eef2dd6267f0 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Wed, 4 Sep 2013 05:51:59 +0200
Subject: Update to MediaWiki 1.21.2

---
 .../includes/GlobalFunctions/wfExpandUrlTest.php   | 113 +++++++++++++++++++++
 1 file changed, 113 insertions(+)
 create mode 100644 tests/phpunit/includes/GlobalFunctions/wfExpandUrlTest.php

(limited to 'tests/phpunit/includes/GlobalFunctions/wfExpandUrlTest.php')

diff --git a/tests/phpunit/includes/GlobalFunctions/wfExpandUrlTest.php b/tests/phpunit/includes/GlobalFunctions/wfExpandUrlTest.php
new file mode 100644
index 00000000..c1225e3e
--- /dev/null
+++ b/tests/phpunit/includes/GlobalFunctions/wfExpandUrlTest.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Tests for wfExpandUrl()
+ */
+class WfExpandUrlTest extends MediaWikiTestCase {
+	/** @dataProvider provideExpandableUrls */
+	public function testWfExpandUrl( $fullUrl, $shortUrl, $defaultProto, $server, $canServer, $httpsMode, $message ) {
+		// Fake $wgServer and $wgCanonicalServer
+		global $wgServer, $wgCanonicalServer;
+		$oldServer = $wgServer;
+		$oldCanServer = $wgCanonicalServer;
+		$wgServer = $server;
+		$wgCanonicalServer = $canServer;
+
+		// Fake $_SERVER['HTTPS'] if needed
+		if ( $httpsMode ) {
+			$_SERVER['HTTPS'] = 'on';
+		} else {
+			unset( $_SERVER['HTTPS'] );
+		}
+
+		$this->assertEquals( $fullUrl, wfExpandUrl( $shortUrl, $defaultProto ), $message );
+
+		// Restore $wgServer and $wgCanonicalServer
+		$wgServer = $oldServer;
+		$wgCanonicalServer = $oldCanServer;
+	}
+
+	/**
+	 * Provider of URL examples for testing wfExpandUrl()
+	 *
+	 * @return array
+	 */
+	public static function provideExpandableUrls() {
+		$modes = array( 'http', 'https' );
+		$servers = array(
+			'http' => 'http://example.com',
+			'https' => 'https://example.com',
+			'protocol-relative' => '//example.com'
+		);
+		$defaultProtos = array(
+			'http' => PROTO_HTTP,
+			'https' => PROTO_HTTPS,
+			'protocol-relative' => PROTO_RELATIVE,
+			'current' => PROTO_CURRENT,
+			'canonical' => PROTO_CANONICAL
+		);
+
+		$retval = array();
+		foreach ( $modes as $mode ) {
+			$httpsMode = $mode == 'https';
+			foreach ( $servers as $serverDesc => $server ) {
+				foreach ( $modes as $canServerMode ) {
+					$canServer = "$canServerMode://example2.com";
+					foreach ( $defaultProtos as $protoDesc => $defaultProto ) {
+						$retval[] = array(
+							'http://example.com', 'http://example.com',
+							$defaultProto, $server, $canServer, $httpsMode,
+							"Testing fully qualified http URLs (no need to expand) ' .
+							'(defaultProto: $protoDesc , wgServer: $server, wgCanonicalServer: $canServer, current request protocol: $mode )"
+						);
+						$retval[] = array(
+							'https://example.com', 'https://example.com',
+							$defaultProto, $server, $canServer, $httpsMode,
+							"Testing fully qualified https URLs (no need to expand) ' .
+							'(defaultProto: $protoDesc , wgServer: $server, wgCanonicalServer: $canServer, current request protocol: $mode )"
+						);
+						# Would be nice to support this, see fixme on wfExpandUrl()
+						$retval[] = array(
+							"wiki/FooBar", 'wiki/FooBar',
+							$defaultProto, $server, $canServer, $httpsMode,
+							"Test non-expandable relative URLs ' .
+							'(defaultProto: $protoDesc , wgServer: $server, wgCanonicalServer: $canServer, current request protocol: $mode )"
+						);
+
+						// Determine expected protocol
+						if ( $protoDesc == 'protocol-relative' ) {
+							$p = '';
+						} elseif ( $protoDesc == 'current' ) {
+							$p = "$mode:";
+						} elseif ( $protoDesc == 'canonical' ) {
+							$p = "$canServerMode:";
+						} else {
+							$p = $protoDesc . ':';
+						}
+						// Determine expected server name
+						if ( $protoDesc == 'canonical' ) {
+							$srv = $canServer;
+						} elseif ( $serverDesc == 'protocol-relative' ) {
+							$srv = $p . $server;
+						} else {
+							$srv = $server;
+						}
+
+						$retval[] = array(
+							"$p//wikipedia.org", '//wikipedia.org',
+							$defaultProto, $server, $canServer, $httpsMode,
+							"Test protocol-relative URL ' .
+							'(defaultProto: $protoDesc, wgServer: $server, wgCanonicalServer: $canServer, current request protocol: $mode )"
+						);
+						$retval[] = array(
+							"$srv/wiki/FooBar", '/wiki/FooBar',
+							$defaultProto, $server, $canServer, $httpsMode,
+							"Testing expanding URL beginning with / ' .
+							'(defaultProto: $protoDesc , wgServer: $server, wgCanonicalServer: $canServer, current request protocol: $mode )"
+						);
+					}
+				}
+			}
+		}
+		return $retval;
+	}
+}
-- 
cgit v1.2.2