Update to MediaWiki 1.22.5

9 files changed, 3484 insertions, 0 deletions

diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js
new file mode 100644
index 00000000..ab96f753
--- /dev/null
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js
@@ -0,0 +1,416 @@
+( function ( mw, $ ) {
+	// mw.Title relies on these three config vars
+	// Restore them after each test run
+	var config = {
+		wgFormattedNamespaces: {
+			'-2': 'Media',
+			'-1': 'Special',
+			0: '',
+			1: 'Talk',
+			2: 'User',
+			3: 'User talk',
+			4: 'Wikipedia',
+			5: 'Wikipedia talk',
+			6: 'File',
+			7: 'File talk',
+			8: 'MediaWiki',
+			9: 'MediaWiki talk',
+			10: 'Template',
+			11: 'Template talk',
+			12: 'Help',
+			13: 'Help talk',
+			14: 'Category',
+			15: 'Category talk',
+			// testing custom / localized namespace
+			100: 'Penguins'
+		},
+		wgNamespaceIds: {
+			/*jshint camelcase: false */
+			media: -2,
+			special: -1,
+			'': 0,
+			talk: 1,
+			user: 2,
+			user_talk: 3,
+			wikipedia: 4,
+			wikipedia_talk: 5,
+			file: 6,
+			file_talk: 7,
+			mediawiki: 8,
+			mediawiki_talk: 9,
+			template: 10,
+			template_talk: 11,
+			help: 12,
+			help_talk: 13,
+			category: 14,
+			category_talk: 15,
+			image: 6,
+			image_talk: 7,
+			project: 4,
+			project_talk: 5,
+			/* testing custom / alias */
+			penguins: 100,
+			antarctic_waterfowl: 100
+		},
+		wgCaseSensitiveNamespaces: []
+	},
+	repeat = function ( input, multiplier ) {
+		return new Array( multiplier + 1 ).join( input );
+	},
+	cases = {
+		// See also TitleTest.php#testSecureAndSplit
+		valid: [
+			'Sandbox',
+			'A "B"',
+			'A \'B\'',
+			'.com',
+			'~',
+			'"',
+			'\'',
+			'Talk:Sandbox',
+			'Talk:Foo:Sandbox',
+			'File:Example.svg',
+			'File_talk:Example.svg',
+			'Foo/.../Sandbox',
+			'Sandbox/...',
+			'A~~',
+			// Length is 256 total, but only title part matters
+			'Category:' + repeat( 'x', 248 ),
+			repeat( 'x', 252 )
+		],
+		invalid: [
+			'',
+			'__  __',
+			'  __  ',
+			// Bad characters forbidden regardless of wgLegalTitleChars
+			'A [ B',
+			'A ] B',
+			'A { B',
+			'A } B',
+			'A < B',
+			'A > B',
+			'A | B',
+			// URL encoding
+			'A%20B',
+			'A%23B',
+			'A%2523B',
+			// XML/HTML character entity references
+			// Note: The ones with # are commented out as those are interpreted as fragment and
+			// as such end up being valid.
+			'A &eacute; B',
+			//'A &#233; B',
+			//'A &#x00E9; B',
+			// Subject of NS_TALK does not roundtrip to NS_MAIN
+			'Talk:File:Example.svg',
+			// Directory navigation
+			'.',
+			'..',
+			'./Sandbox',
+			'../Sandbox',
+			'Foo/./Sandbox',
+			'Foo/../Sandbox',
+			'Sandbox/.',
+			'Sandbox/..',
+			// Tilde
+			'A ~~~ Name',
+			'A ~~~~ Signature',
+			'A ~~~~~ Timestamp',
+			repeat( 'x', 256 ),
+			// Extension separation is a js invention, for length
+			// purposes it is part of the title
+			repeat( 'x', 252 ) + '.json',
+			// Namespace prefix without actual title
+			// ':', // bug 54044
+			'Talk:',
+			'Category: ',
+			'Category: #bar'
+		]
+	};
+
+	QUnit.module( 'mediawiki.Title', QUnit.newMwEnvironment( { config: config } ) );
+
+	QUnit.test( 'constructor', cases.invalid.length, function ( assert ) {
+		var i, title;
+		for ( i = 0; i < cases.valid.length; i++ ) {
+			title = new mw.Title( cases.valid[i] );
+		}
+		for ( i = 0; i < cases.invalid.length; i++ ) {
+			/*jshint loopfunc:true */
+			title = cases.invalid[i];
+			assert.throws( function () {
+				return new mw.Title( title );
+			}, cases.invalid[i] );
+		}
+	} );
+
+	QUnit.test( 'newFromText', cases.valid.length + cases.invalid.length, function ( assert ) {
+		var i;
+		for ( i = 0; i < cases.valid.length; i++ ) {
+			assert.equal(
+				$.type( mw.Title.newFromText( cases.valid[i] ) ),
+				'object',
+				cases.valid[i]
+			);
+		}
+		for ( i = 0; i < cases.invalid.length; i++ ) {
+			assert.equal(
+				$.type( mw.Title.newFromText( cases.invalid[i] ) ),
+				'null',
+				cases.invalid[i]
+			);
+		}
+	} );
+
+	QUnit.test( 'Basic parsing', 12, function ( assert ) {
+		var title;
+		title = new mw.Title( 'File:Foo_bar.JPG' );
+
+		assert.equal( title.getNamespaceId(), 6 );
+		assert.equal( title.getNamespacePrefix(), 'File:' );
+		assert.equal( title.getName(), 'Foo_bar' );
+		assert.equal( title.getNameText(), 'Foo bar' );
+		assert.equal( title.getExtension(), 'JPG' );
+		assert.equal( title.getDotExtension(), '.JPG' );
+		assert.equal( title.getMain(), 'Foo_bar.JPG' );
+		assert.equal( title.getMainText(), 'Foo bar.JPG' );
+		assert.equal( title.getPrefixedDb(), 'File:Foo_bar.JPG' );
+		assert.equal( title.getPrefixedText(), 'File:Foo bar.JPG' );
+
+		title = new mw.Title( 'Foo#bar' );
+		assert.equal( title.getPrefixedText(), 'Foo' );
+		assert.equal( title.getFragment(), 'bar' );
+	} );
+
+	QUnit.test( 'Transformation', 11, function ( assert ) {
+		var title;
+
+		title = new mw.Title( 'File:quux pif.jpg' );
+		assert.equal( title.getNameText(), 'Quux pif', 'First character of title' );
+
+		title = new mw.Title( 'File:Glarg_foo_glang.jpg' );
+		assert.equal( title.getNameText(), 'Glarg foo glang', 'Underscores' );
+
+		title = new mw.Title( 'User:ABC.DEF' );
+		assert.equal( title.toText(), 'User:ABC.DEF', 'Round trip text' );
+		assert.equal( title.getNamespaceId(), 2, 'Parse canonical namespace prefix' );
+
+		title = new mw.Title( 'Image:quux pix.jpg' );
+		assert.equal( title.getNamespacePrefix(), 'File:', 'Transform alias to canonical namespace' );
+
+		title = new mw.Title( 'uSEr:hAshAr' );
+		assert.equal( title.toText(), 'User:HAshAr' );
+		assert.equal( title.getNamespaceId(), 2, 'Case-insensitive namespace prefix' );
+
+		// Don't ask why, it's the way the backend works. One space is kept of each set.
+		title = new mw.Title( 'Foo  __  \t __ bar' );
+		assert.equal( title.getMain(), 'Foo_bar', 'Merge multiple types of whitespace/underscores into a single underscore' );
+
+		// Regression test: Previously it would only detect an extension if there is no space after it
+		title = new mw.Title( 'Example.js  ' );
+		assert.equal( title.getExtension(), 'js', 'Space after an extension is stripped' );
+
+		title = new mw.Title( 'Example#foo' );
+		assert.equal( title.getFragment(), 'foo', 'Fragment' );
+
+		title = new mw.Title( 'Example#_foo_bar baz_' );
+		assert.equal( title.getFragment(), ' foo bar baz', 'Fragment' );
+	} );
+
+	QUnit.test( 'Namespace detection and conversion', 10, function ( assert ) {
+		var title;
+
+		title = new mw.Title( 'File:User:Example' );
+		assert.equal( title.getNamespaceId(), 6, 'Titles can contain namespace prefixes, which are otherwise ignored' );
+
+		title = new mw.Title( 'Example', 6 );
+		assert.equal( title.getNamespaceId(), 6, 'Default namespace passed is used' );
+
+		title = new mw.Title( 'User:Example', 6 );
+		assert.equal( title.getNamespaceId(), 2, 'Included namespace prefix overrides the given default' );
+
+		title = new mw.Title( ':Example', 6 );
+		assert.equal( title.getNamespaceId(), 0, 'Colon forces main namespace' );
+
+		title = new mw.Title( 'something.PDF', 6 );
+		assert.equal( title.toString(), 'File:Something.PDF' );
+
+		title = new mw.Title( 'NeilK', 3 );
+		assert.equal( title.toString(), 'User_talk:NeilK' );
+		assert.equal( title.toText(), 'User talk:NeilK' );
+
+		title = new mw.Title( 'Frobisher', 100 );
+		assert.equal( title.toString(), 'Penguins:Frobisher' );
+
+		title = new mw.Title( 'antarctic_waterfowl:flightless_yet_cute.jpg' );
+		assert.equal( title.toString(), 'Penguins:Flightless_yet_cute.jpg' );
+
+		title = new mw.Title( 'Penguins:flightless_yet_cute.jpg' );
+		assert.equal( title.toString(), 'Penguins:Flightless_yet_cute.jpg' );
+	} );
+
+	QUnit.test( 'Throw error on invalid title', 1, function ( assert ) {
+		assert.throws( function () {
+			return new mw.Title( '' );
+		}, 'Throw error on empty string' );
+	} );
+
+	QUnit.test( 'Case-sensivity', 3, function ( assert ) {
+		var title;
+
+		// Default config
+		mw.config.set( 'wgCaseSensitiveNamespaces', [] );
+
+		title = new mw.Title( 'article' );
+		assert.equal( title.toString(), 'Article', 'Default config: No sensitive namespaces by default. First-letter becomes uppercase' );
+
+		// $wgCapitalLinks = false;
+		mw.config.set( 'wgCaseSensitiveNamespaces', [0, -2, 1, 4, 5, 6, 7, 10, 11, 12, 13, 14, 15] );
+
+		title = new mw.Title( 'article' );
+		assert.equal( title.toString(), 'article', '$wgCapitalLinks=false: Article namespace is sensitive, first-letter case stays lowercase' );
+
+		title = new mw.Title( 'john', 2 );
+		assert.equal( title.toString(), 'User:John', '$wgCapitalLinks=false: User namespace is insensitive, first-letter becomes uppercase' );
+	} );
+
+	QUnit.test( 'toString / toText', 2, function ( assert ) {
+		var title = new mw.Title( 'Some random page' );
+
+		assert.equal( title.toString(), title.getPrefixedDb() );
+		assert.equal( title.toText(), title.getPrefixedText() );
+	} );
+
+	QUnit.test( 'getExtension', 7, function ( assert ) {
+		function extTest( pagename, ext, description ) {
+			var title = new mw.Title( pagename );
+			assert.equal( title.getExtension(), ext, description || pagename );
+		}
+
+		extTest( 'MediaWiki:Vector.js', 'js' );
+		extTest( 'User:Example/common.css', 'css' );
+		extTest( 'File:Example.longextension', 'longextension', 'Extension parsing not limited (bug 36151)' );
+		extTest( 'Example/information.json', 'json', 'Extension parsing not restricted from any namespace' );
+		extTest( 'Foo.', null, 'Trailing dot is not an extension' );
+		extTest( 'Foo..', null, 'Trailing dots are not an extension' );
+		extTest( 'Foo.a.', null, 'Page name with dots and ending in a dot does not have an extension' );
+
+		// @broken: Throws an exception
+		// extTest( '.NET', null, 'Leading dot is (or is not?) an extension' );
+	} );
+
+	QUnit.test( 'exists', 3, function ( assert ) {
+		var title;
+
+		// Empty registry, checks default to null
+
+		title = new mw.Title( 'Some random page', 4 );
+		assert.strictEqual( title.exists(), null, 'Return null with empty existance registry' );
+
+		// Basic registry, checks default to boolean
+		mw.Title.exist.set( ['Does_exist', 'User_talk:NeilK', 'Wikipedia:Sandbox_rules'], true );
+		mw.Title.exist.set( ['Does_not_exist', 'User:John', 'Foobar'], false );
+
+		title = new mw.Title( 'Project:Sandbox rules' );
+		assert.assertTrue( title.exists(), 'Return true for page titles marked as existing' );
+		title = new mw.Title( 'Foobar' );
+		assert.assertFalse( title.exists(), 'Return false for page titles marked as nonexistent' );
+
+	} );
+
+	QUnit.test( 'getUrl', 2, function ( assert ) {
+		var title;
+
+		// Config
+		mw.config.set( 'wgArticlePath', '/wiki/$1' );
+
+		title = new mw.Title( 'Foobar' );
+		assert.equal( title.getUrl(), '/wiki/Foobar', 'Basic functionally, getUrl uses mw.util.getUrl' );
+
+		title = new mw.Title( 'John Doe', 3 );
+		assert.equal( title.getUrl(), '/wiki/User_talk:John_Doe', 'Escaping in title and namespace for urls' );
+	} );
+
+	QUnit.test( 'newFromImg', 28, function ( assert ) {
+		var title, i, thisCase, prefix,
+			cases = [
+				{
+					url: '/wiki/images/thumb/9/91/Anticlockwise_heliotrope%27s.jpg/99px-Anticlockwise_heliotrope%27s.jpg',
+					typeOfUrl: 'Normal hashed directory thumbnail',
+					nameText: 'Anticlockwise heliotrope\'s',
+					prefixedText: 'File:Anticlockwise heliotrope\'s.jpg'
+				},
+
+				{
+					url: '//upload.wikimedia.org/wikipedia/commons/thumb/8/80/Wikipedia-logo-v2.svg/150px-Wikipedia-logo-v2.svg.png',
+					typeOfUrl: 'Commons thumbnail',
+					nameText: 'Wikipedia-logo-v2',
+					prefixedText: 'File:Wikipedia-logo-v2.svg'
+				},
+
+				{
+					url: '/wiki/images/9/91/Anticlockwise_heliotrope%27s.jpg',
+					typeOfUrl: 'Full image',
+					nameText: 'Anticlockwise heliotrope\'s',
+					prefixedText: 'File:Anticlockwise heliotrope\'s.jpg'
+				},
+
+				{
+					url: 'http://localhost/thumb.php?f=Stuffless_Figaro%27s.jpg&width=180',
+					typeOfUrl: 'thumb.php-based thumbnail',
+					nameText: 'Stuffless Figaro\'s',
+					prefixedText: 'File:Stuffless Figaro\'s.jpg'
+				},
+
+				{
+					url: '/wikipedia/commons/thumb/Wikipedia-logo-v2.svg/150px-Wikipedia-logo-v2.svg.png',
+					typeOfUrl: 'Commons unhashed thumbnail',
+					nameText: 'Wikipedia-logo-v2',
+					prefixedText: 'File:Wikipedia-logo-v2.svg'
+				},
+
+				{
+					url: '/wiki/images/Anticlockwise_heliotrope%27s.jpg',
+					typeOfUrl: 'Unhashed local file',
+					nameText: 'Anticlockwise heliotrope\'s',
+					prefixedText: 'File:Anticlockwise heliotrope\'s.jpg'
+				},
+
+				{
+					url: '',
+					typeOfUrl: 'Empty string'
+				},
+
+				{
+					url: 'foo',
+					typeOfUrl: 'String with only alphabet characters'
+				},
+
+				{
+					url: 'foobar.foobar',
+					typeOfUrl: 'Not a file path'
+				},
+
+				{
+					url: '/a/a0/blah blah blah',
+					typeOfUrl: 'Space characters'
+				}
+			];
+
+		for ( i = 0; i < cases.length; i++ ) {
+			thisCase = cases[i];
+			title = mw.Title.newFromImg( { src: thisCase.url } );
+
+			if ( thisCase.nameText !== undefined ) {
+				prefix = '[' + thisCase.typeOfUrl + ' URL' + '] ';
+
+				assert.notStrictEqual( title, null, prefix + 'Parses successfully' );
+				assert.equal( title.getNameText(), thisCase.nameText, prefix + 'Filename matches original' );
+				assert.equal( title.getPrefixedText(), thisCase.prefixedText, prefix + 'File page title matches original' );
+				assert.equal( title.getNamespaceId(), 6, prefix + 'Namespace ID matches File namespace' );
+			} else {
+				assert.strictEqual( title, null, thisCase.typeOfUrl + ', should not produce an mw.Title object' );
+			}
+		}
+	} );
+
+}( mediaWiki, jQuery ) );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js
new file mode 100644
index 00000000..9913f5e6
--- /dev/null
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js
@@ -0,0 +1,433 @@
+( function ( mw, $ ) {
+	QUnit.module( 'mediawiki.Uri', QUnit.newMwEnvironment( {
+		setup: function () {
+			this.mwUriOrg = mw.Uri;
+			mw.Uri = mw.UriRelative( 'http://example.org/w/index.php' );
+		},
+		teardown: function () {
+			mw.Uri = this.mwUriOrg;
+			delete this.mwUriOrg;
+		}
+	} ) );
+
+	$.each( [true, false], function ( i, strictMode ) {
+		QUnit.test( 'Basic construction and properties (' + ( strictMode ? '' : 'non-' ) + 'strict mode)', 2, function ( assert ) {
+			var uriString, uri;
+			uriString = 'http://www.ietf.org/rfc/rfc2396.txt';
+			uri = new mw.Uri( uriString, {
+				strictMode: strictMode
+			} );
+
+			assert.deepEqual(
+				{
+					protocol: uri.protocol,
+					host: uri.host,
+					port: uri.port,
+					path: uri.path,
+					query: uri.query,
+					fragment: uri.fragment
+				}, {
+					protocol: 'http',
+					host: 'www.ietf.org',
+					port: undefined,
+					path: '/rfc/rfc2396.txt',
+					query: {},
+					fragment: undefined
+				},
+				'basic object properties'
+			);
+
+			assert.deepEqual(
+				{
+					userInfo: uri.getUserInfo(),
+					authority: uri.getAuthority(),
+					hostPort: uri.getHostPort(),
+					queryString: uri.getQueryString(),
+					relativePath: uri.getRelativePath(),
+					toString: uri.toString()
+				},
+				{
+					userInfo: '',
+					authority: 'www.ietf.org',
+					hostPort: 'www.ietf.org',
+					queryString: '',
+					relativePath: '/rfc/rfc2396.txt',
+					toString: uriString
+				},
+				'construct composite components of URI on request'
+			);
+		} );
+	} );
+
+	QUnit.test( 'Constructor( String[, Object ] )', 10, function ( assert ) {
+		var uri;
+
+		uri = new mw.Uri( 'http://www.example.com/dir/?m=foo&m=bar&n=1', {
+			overrideKeys: true
+		} );
+
+		// Strict comparison to assert that numerical values stay strings
+		assert.strictEqual( uri.query.n, '1', 'Simple parameter with overrideKeys:true' );
+		assert.strictEqual( uri.query.m, 'bar', 'Last key overrides earlier keys with overrideKeys:true' );
+
+		uri = new mw.Uri( 'http://www.example.com/dir/?m=foo&m=bar&n=1', {
+			overrideKeys: false
+		} );
+
+		assert.strictEqual( uri.query.n, '1', 'Simple parameter with overrideKeys:false' );
+		assert.strictEqual( uri.query.m[0], 'foo', 'Order of multi-value parameters with overrideKeys:true' );
+		assert.strictEqual( uri.query.m[1], 'bar', 'Order of multi-value parameters with overrideKeys:true' );
+		assert.strictEqual( uri.query.m.length, 2, 'Number of mult-value field is correct' );
+
+		uri = new mw.Uri( 'ftp://usr:pwd@192.0.2.16/' );
+
+		assert.deepEqual(
+			{
+				protocol: uri.protocol,
+				user: uri.user,
+				password: uri.password,
+				host: uri.host,
+				port: uri.port,
+				path: uri.path,
+				query: uri.query,
+				fragment: uri.fragment
+			},
+			{
+				protocol: 'ftp',
+				user: 'usr',
+				password: 'pwd',
+				host: '192.0.2.16',
+				port: undefined,
+				path: '/',
+				query: {},
+				fragment: undefined
+			},
+			'Parse an ftp URI correctly with user and password'
+		);
+
+		assert.throws(
+			function () {
+				return new mw.Uri( 'glaswegian penguins' );
+			},
+			function ( e ) {
+				return e.message === 'Bad constructor arguments';
+			},
+			'throw error on non-URI as argument to constructor'
+		);
+
+		assert.throws(
+			function () {
+				return new mw.Uri( 'foo.com/bar/baz', {
+					strictMode: true
+				} );
+			},
+			function ( e ) {
+				return e.message === 'Bad constructor arguments';
+			},
+			'throw error on URI without protocol or // or leading / in strict mode'
+		);
+
+		uri = new mw.Uri( 'foo.com/bar/baz', {
+			strictMode: false
+		} );
+		assert.equal( uri.toString(), 'http://foo.com/bar/baz', 'normalize URI without protocol or // in loose mode' );
+	} );
+
+	QUnit.test( 'Constructor( Object )', 3, function ( assert ) {
+		var uri = new mw.Uri( {
+			protocol: 'http',
+			host: 'www.foo.local',
+			path: '/this'
+		} );
+		assert.equal( uri.toString(), 'http://www.foo.local/this', 'Basic properties' );
+
+		uri = new mw.Uri( {
+			protocol: 'http',
+			host: 'www.foo.local',
+			path: '/this',
+			query: { hi: 'there' },
+			fragment: 'blah'
+		} );
+		assert.equal( uri.toString(), 'http://www.foo.local/this?hi=there#blah', 'More complex properties' );
+
+		assert.throws(
+			function () {
+				return new mw.Uri( {
+					protocol: 'http',
+					host: 'www.foo.local'
+				} );
+			},
+			function ( e ) {
+				return e.message === 'Bad constructor arguments';
+			},
+			'Construction failed when missing required properties'
+		);
+	} );
+
+	QUnit.test( 'Constructor( empty )', 4, function ( assert ) {
+		var testuri, MyUri, uri;
+
+		testuri = 'http://example.org/w/index.php';
+		MyUri = mw.UriRelative( testuri );
+
+		uri = new MyUri();
+		assert.equal( uri.toString(), testuri, 'no arguments' );
+
+		uri = new MyUri( undefined );
+		assert.equal( uri.toString(), testuri, 'undefined' );
+
+		uri = new MyUri( null );
+		assert.equal( uri.toString(), testuri, 'null' );
+
+		uri = new MyUri( '' );
+		assert.equal( uri.toString(), testuri, 'empty string' );
+	} );
+
+	QUnit.test( 'Properties', 8, function ( assert ) {
+		var uriBase, uri;
+
+		uriBase = new mw.Uri( 'http://en.wiki.local/w/api.php' );
+
+		uri = uriBase.clone();
+		uri.fragment = 'frag';
+		assert.equal( uri.toString(), 'http://en.wiki.local/w/api.php#frag', 'add a fragment' );
+
+		uri = uriBase.clone();
+		uri.host = 'fr.wiki.local';
+		uri.port = '8080';
+		assert.equal( uri.toString(), 'http://fr.wiki.local:8080/w/api.php', 'change host and port' );
+
+		uri = uriBase.clone();
+		uri.query.foo = 'bar';
+		assert.equal( uri.toString(), 'http://en.wiki.local/w/api.php?foo=bar', 'add query arguments' );
+
+		delete uri.query.foo;
+		assert.equal( uri.toString(), 'http://en.wiki.local/w/api.php', 'delete query arguments' );
+
+		uri = uriBase.clone();
+		uri.query.foo = 'bar';
+		assert.equal( uri.toString(), 'http://en.wiki.local/w/api.php?foo=bar', 'extend query arguments' );
+		uri.extend( {
+			foo: 'quux',
+			pif: 'paf'
+		} );
+		assert.ok( uri.toString().indexOf( 'foo=quux' ) >= 0, 'extend query arguments' );
+		assert.ok( uri.toString().indexOf( 'foo=bar' ) === -1, 'extend query arguments' );
+		assert.ok( uri.toString().indexOf( 'pif=paf' ) >= 0, 'extend query arguments' );
+	} );
+
+	QUnit.test( '.getQueryString()', 2, function ( assert ) {
+		var uri = new mw.Uri( 'http://www.google.com/?q=uri' );
+
+		assert.deepEqual(
+			{
+				protocol: uri.protocol,
+				host: uri.host,
+				port: uri.port,
+				path: uri.path,
+				query: uri.query,
+				fragment: uri.fragment,
+				queryString: uri.getQueryString()
+			},
+			{
+				protocol: 'http',
+				host: 'www.google.com',
+				port: undefined,
+				path: '/',
+				query: { q: 'uri' },
+				fragment: undefined,
+				queryString: 'q=uri'
+			},
+			'basic object properties'
+		);
+
+		uri = new mw.Uri( 'https://example.org/mw/index.php?title=Sandbox/7&other=Sandbox/7&foo' );
+		assert.equal(
+			uri.getQueryString(),
+			'title=Sandbox/7&other=Sandbox%2F7&foo',
+			'title parameter is escaped the wiki-way'
+		);
+
+	} );
+
+	QUnit.test( '.clone()', 6, function ( assert ) {
+		var original, clone;
+
+		original = new mw.Uri( 'http://foo.example.org/index.php?one=1&two=2' );
+		clone = original.clone();
+
+		assert.deepEqual( clone, original, 'clone has equivalent properties' );
+		assert.equal( original.toString(), clone.toString(), 'toString matches original' );
+
+		assert.notStrictEqual( clone, original, 'clone is a different object when compared by reference' );
+
+		clone.host = 'bar.example.org';
+		assert.notEqual( original.host, clone.host, 'manipulating clone did not effect original' );
+		assert.notEqual( original.toString(), clone.toString(), 'Stringified url no longer matches original' );
+
+		clone.query.three = 3;
+
+		assert.deepEqual(
+			original.query,
+			{ 'one': '1', 'two': '2' },
+			'Properties is deep cloned (bug 37708)'
+		);
+	} );
+
+	QUnit.test( '.toString() after query manipulation', 8, function ( assert ) {
+		var uri;
+
+		uri = new mw.Uri( 'http://www.example.com/dir/?m=foo&m=bar&n=1', {
+			overrideKeys: true
+		} );
+
+		uri.query.n = [ 'x', 'y', 'z' ];
+
+		// Verify parts and total length instead of entire string because order
+		// of iteration can vary.
+		assert.ok( uri.toString().indexOf( 'm=bar' ), 'toString preserves other values' );
+		assert.ok( uri.toString().indexOf( 'n=x&n=y&n=z' ), 'toString parameter includes all values of an array query parameter' );
+		assert.equal( uri.toString().length, 'http://www.example.com/dir/?m=bar&n=x&n=y&n=z'.length, 'toString matches expected string' );
+
+		uri = new mw.Uri( 'http://www.example.com/dir/?m=foo&m=bar&n=1', {
+			overrideKeys: false
+		} );
+
+		// Change query values
+		uri.query.n = [ 'x', 'y', 'z' ];
+
+		// Verify parts and total length instead of entire string because order
+		// of iteration can vary.
+		assert.ok( uri.toString().indexOf( 'm=foo&m=bar' ) >= 0, 'toString preserves other values' );
+		assert.ok( uri.toString().indexOf( 'n=x&n=y&n=z' ) >= 0, 'toString parameter includes all values of an array query parameter' );
+		assert.equal( uri.toString().length, 'http://www.example.com/dir/?m=foo&m=bar&n=x&n=y&n=z'.length, 'toString matches expected string' );
+
+		// Remove query values
+		uri.query.m.splice( 0, 1 );
+		delete uri.query.n;
+
+		assert.equal( uri.toString(), 'http://www.example.com/dir/?m=bar', 'deletion properties' );
+
+		// Remove more query values, leaving an empty array
+		uri.query.m.splice( 0, 1 );
+		assert.equal( uri.toString(), 'http://www.example.com/dir/', 'empty array value is ommitted' );
+	} );
+
+	QUnit.test( 'Advanced URL', 11, function ( assert ) {
+		var uri, queryString, relativePath;
+
+		uri = new mw.Uri( 'http://auth@www.example.com:81/dir/dir.2/index.htm?q1=0&&test1&test2=value+%28escaped%29#top' );
+
+		assert.deepEqual(
+			{
+				protocol: uri.protocol,
+				user: uri.user,
+				password: uri.password,
+				host: uri.host,
+				port: uri.port,
+				path: uri.path,
+				query: uri.query,
+				fragment: uri.fragment
+			},
+			{
+				protocol: 'http',
+				user: 'auth',
+				password: undefined,
+				host: 'www.example.com',
+				port: '81',
+				path: '/dir/dir.2/index.htm',
+				query: { q1: '0', test1: null, test2: 'value (escaped)' },
+				fragment: 'top'
+			},
+			'basic object properties'
+		);
+
+		assert.equal( uri.getUserInfo(), 'auth', 'user info' );
+
+		assert.equal( uri.getAuthority(), 'auth@www.example.com:81', 'authority equal to auth@hostport' );
+
+		assert.equal( uri.getHostPort(), 'www.example.com:81', 'hostport equal to host:port' );
+
+		queryString = uri.getQueryString();
+		assert.ok( queryString.indexOf( 'q1=0' ) >= 0, 'query param with numbers' );
+		assert.ok( queryString.indexOf( 'test1' ) >= 0, 'query param with null value is included' );
+		assert.ok( queryString.indexOf( 'test1=' ) === -1, 'query param with null value does not generate equals sign' );
+		assert.ok( queryString.indexOf( 'test2=value+%28escaped%29' ) >= 0, 'query param is url escaped' );
+
+		relativePath = uri.getRelativePath();
+		assert.ok( relativePath.indexOf( uri.path ) >= 0, 'path in relative path' );
+		assert.ok( relativePath.indexOf( uri.getQueryString() ) >= 0, 'query string in relative path' );
+		assert.ok( relativePath.indexOf( uri.fragment ) >= 0, 'fragement in relative path' );
+	} );
+
+	QUnit.test( 'Parse a uri with an @ symbol in the path and query', 1, function ( assert ) {
+		var uri = new mw.Uri( 'http://www.example.com/test@test?x=@uri&y@=uri&z@=@' );
+
+		assert.deepEqual(
+			{
+				protocol: uri.protocol,
+				user: uri.user,
+				password: uri.password,
+				host: uri.host,
+				port: uri.port,
+				path: uri.path,
+				query: uri.query,
+				fragment: uri.fragment,
+				queryString: uri.getQueryString()
+			},
+			{
+				protocol: 'http',
+				user: undefined,
+				password: undefined,
+				host: 'www.example.com',
+				port: undefined,
+				path: '/test@test',
+				query: { x: '@uri', 'y@': 'uri', 'z@': '@' },
+				fragment: undefined,
+				queryString: 'x=%40uri&y%40=uri&z%40=%40'
+			},
+			'basic object properties'
+		);
+	} );
+
+	QUnit.test( 'Handle protocol-relative URLs', 5, function ( assert ) {
+		var UriRel, uri;
+
+		UriRel = mw.UriRelative( 'glork://en.wiki.local/foo.php' );
+
+		uri = new UriRel( '//en.wiki.local/w/api.php' );
+		assert.equal( uri.protocol, 'glork', 'create protocol-relative URLs with same protocol as document' );
+
+		uri = new UriRel( '/foo.com' );
+		assert.equal( uri.toString(), 'glork://en.wiki.local/foo.com', 'handle absolute paths by supplying protocol and host from document in loose mode' );
+
+		uri = new UriRel( 'http:/foo.com' );
+		assert.equal( uri.toString(), 'http://en.wiki.local/foo.com', 'handle absolute paths by supplying host from document in loose mode' );
+
+		uri = new UriRel( '/foo.com', true );
+		assert.equal( uri.toString(), 'glork://en.wiki.local/foo.com', 'handle absolute paths by supplying protocol and host from document in strict mode' );
+
+		uri = new UriRel( 'http:/foo.com', true );
+		assert.equal( uri.toString(), 'http://en.wiki.local/foo.com', 'handle absolute paths by supplying host from document in strict mode' );
+	} );
+
+	QUnit.test( 'bug 35658', 2, function ( assert ) {
+		var testProtocol, testServer, testPort, testPath, UriClass, uri, href;
+
+		testProtocol = 'https://';
+		testServer = 'foo.example.org';
+		testPort = '3004';
+		testPath = '/!1qy';
+
+		UriClass = mw.UriRelative( testProtocol + testServer + '/some/path/index.html' );
+		uri = new UriClass( testPath );
+		href = uri.toString();
+		assert.equal( href, testProtocol + testServer + testPath, 'Root-relative URL gets host & protocol supplied' );
+
+		UriClass = mw.UriRelative( testProtocol + testServer + ':' + testPort + '/some/path.php' );
+		uri = new UriClass( testPath );
+		href = uri.toString();
+		assert.equal( href, testProtocol + testServer + ':' + testPort + testPath, 'Root-relative URL gets host, protocol, and port supplied' );
+
+	} );
+}( mediaWiki, jQuery ) );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.cldr.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.cldr.test.js
new file mode 100644
index 00000000..779a0ed4
--- /dev/null
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.cldr.test.js
@@ -0,0 +1,81 @@
+( function ( mw, $ ) {
+	QUnit.module( 'mediawiki.cldr', QUnit.newMwEnvironment() );
+
+	var pluralTestcases = {
+		/*
+		 * Sample:
+		 * languagecode : [
+		 *   [ number, [ 'form1', 'form2', ... ],  'expected', 'description' ]
+		 * ];
+		 */
+		en: [
+			[ 0, [ 'one', 'other' ], 'other', 'English plural test- 0 is other' ],
+			[ 1, [ 'one', 'other' ], 'one', 'English plural test- 1 is one' ]
+		],
+		fa: [
+			[ 0, [ 'one', 'other' ], 'other', 'Persian plural test- 0 is other' ],
+			[ 1, [ 'one', 'other' ], 'one', 'Persian plural test- 1 is one' ],
+			[ 2, [ 'one', 'other' ], 'other', 'Persian plural test- 2 is other' ]
+		],
+		fr: [
+			[ 0, [ 'one', 'other' ], 'other', 'French plural test- 0 is other' ],
+			[ 1, [ 'one', 'other' ], 'one', 'French plural test- 1 is one' ]
+		],
+		hi: [
+			[ 0, [ 'one', 'other' ], 'one', 'Hindi plural test- 0 is one' ],
+			[ 1, [ 'one', 'other' ], 'one', 'Hindi plural test- 1 is one' ],
+			[ 2, [ 'one', 'other' ], 'other', 'Hindi plural test- 2 is other' ]
+		],
+		he: [
+			[ 0, [ 'one', 'other' ], 'other', 'Hebrew plural test- 0 is other' ],
+			[ 1, [ 'one', 'other' ], 'one', 'Hebrew plural test- 1 is one' ],
+			[ 2, [ 'one', 'other' ], 'other', 'Hebrew plural test- 2 is other with 2 forms' ],
+			[ 2, [ 'one', 'dual', 'other' ], 'dual', 'Hebrew plural test- 2 is dual with 3 forms' ]
+		],
+		hu: [
+			[ 0, [ 'one', 'other' ], 'other', 'Hungarian plural test- 0 is other' ],
+			[ 1, [ 'one', 'other' ], 'one', 'Hungarian plural test- 1 is one' ],
+			[ 2, [ 'one', 'other' ], 'other', 'Hungarian plural test- 2 is other' ]
+		],
+		hy: [
+			[ 0, [ 'one', 'other' ], 'other', 'Armenian plural test- 0 is other' ],
+			[ 1, [ 'one', 'other' ], 'one', 'Armenian plural test- 1 is one' ],
+			[ 2, [ 'one', 'other' ], 'other', 'Armenian plural test- 2 is other' ]
+		],
+		ar: [
+			[ 0, [ 'zero', 'one', 'two', 'few', 'many', 'other' ], 'zero', 'Arabic plural test - 0 is zero' ],
+			[ 1, [ 'zero', 'one', 'two', 'few', 'many', 'other' ], 'one', 'Arabic plural test - 1 is one' ],
+			[ 2, [ 'zero', 'one', 'two', 'few', 'many', 'other' ], 'two', 'Arabic plural test - 2 is two' ],
+			[ 3, [ 'zero', 'one', 'two', 'few', 'many', 'other' ], 'few', 'Arabic plural test - 3 is few' ],
+			[ 9, [ 'zero', 'one', 'two', 'few', 'many', 'other' ], 'few', 'Arabic plural test - 9 is few' ],
+			[ '9', [ 'zero', 'one', 'two', 'few', 'many', 'other' ], 'few', 'Arabic plural test - 9 is few' ],
+			[ 110, [ 'zero', 'one', 'two', 'few', 'many', 'other' ], 'few', 'Arabic plural test - 110 is few' ],
+			[ 11, [ 'zero', 'one', 'two', 'few', 'many', 'other' ], 'many', 'Arabic plural test - 11 is many' ],
+			[ 15, [ 'zero', 'one', 'two', 'few', 'many', 'other' ], 'many', 'Arabic plural test - 15 is many' ],
+			[ 99, [ 'zero', 'one', 'two', 'few', 'many', 'other' ], 'many', 'Arabic plural test - 99 is many' ],
+			[ 9999, [ 'zero', 'one', 'two', 'few', 'many', 'other' ], 'many', 'Arabic plural test - 9999 is many' ],
+			[ 100, [ 'zero', 'one', 'two', 'few', 'many', 'other' ], 'other', 'Arabic plural test - 100 is other' ],
+			[ 102, [ 'zero', 'one', 'two', 'few', 'many', 'other' ], 'other', 'Arabic plural test - 102 is other' ],
+			[ 1000, [ 'zero', 'one', 'two', 'few', 'many', 'other' ], 'other', 'Arabic plural test - 1000 is other' ],
+			[ 1.7, [ 'zero', 'one', 'two', 'few', 'many', 'other' ], 'other', 'Arabic plural test - 1.7 is other' ]
+		]
+	};
+
+	function pluralTest( langCode, tests ) {
+		QUnit.test( 'Plural Test for ' + langCode, tests.length, function ( assert ) {
+			for ( var i = 0; i < tests.length; i++ ) {
+				assert.equal(
+					mw.language.convertPlural( tests[i][0], tests[i][1] ),
+					tests[i][2],
+					tests[i][3]
+				);
+			}
+		} );
+	}
+
+	$.each( pluralTestcases, function ( langCode, tests ) {
+		if ( langCode === mw.config.get( 'wgUserLanguage' ) ) {
+			pluralTest( langCode, tests );
+		}
+	} );
+}( mediaWiki, jQuery ) );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
new file mode 100644
index 00000000..802634ce
--- /dev/null
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
@@ -0,0 +1,714 @@
+( function ( mw, $ ) {
+	var mwLanguageCache = {}, formatText, formatParse, formatnumTests, specialCharactersPageName,
+		expectedListUsers, expectedEntrypoints;
+
+	// When the expected result is the same in both modes
+	function assertBothModes( assert, parserArguments, expectedResult, assertMessage ) {
+		assert.equal( formatText.apply( null, parserArguments ), expectedResult, assertMessage + ' when format is \'text\'' );
+		assert.equal( formatParse.apply( null, parserArguments ), expectedResult, assertMessage + ' when format is \'parse\'' );
+	}
+
+	QUnit.module( 'mediawiki.jqueryMsg', QUnit.newMwEnvironment( {
+		setup: function () {
+			this.orgMwLangauge = mw.language;
+			mw.language = $.extend( true, {}, this.orgMwLangauge );
+
+			// Messages that are reused in multiple tests
+			mw.messages.set( {
+				// The values for gender are not significant,
+				// what matters is which of the values is choosen by the parser
+				'gender-msg': '$1: {{GENDER:$2|blue|pink|green}}',
+
+				'plural-msg': 'Found $1 {{PLURAL:$1|item|items}}',
+
+				// Assume the grammar form grammar_case_foo is not valid in any language
+				'grammar-msg': 'Przeszukaj {{GRAMMAR:grammar_case_foo|{{SITENAME}}}}',
+
+				'formatnum-msg': '{{formatnum:$1}}',
+
+				'portal-url': 'Project:Community portal',
+				'see-portal-url': '{{Int:portal-url}} is an important community page.',
+
+				'jquerymsg-test-statistics-users': '注册[[Special:ListUsers|用户]]',
+
+				'jquerymsg-test-version-entrypoints-index-php': '[https://www.mediawiki.org/wiki/Manual:index.php index.php]',
+
+				'external-link-replace': 'Foo [$1 bar]'
+			} );
+
+			mw.config.set( {
+				wgArticlePath: '/wiki/$1'
+			} );
+
+			specialCharactersPageName = '"Who" wants to be a millionaire & live on \'Exotic Island\'?';
+
+			expectedListUsers = '注册<a title="Special:ListUsers" href="/wiki/Special:ListUsers">用户</a>';
+
+			expectedEntrypoints = '<a href="https://www.mediawiki.org/wiki/Manual:index.php">index.php</a>';
+
+			formatText = mw.jqueryMsg.getMessageFunction( {
+				format: 'text'
+			} );
+
+			formatParse = mw.jqueryMsg.getMessageFunction( {
+				format: 'parse'
+			} );
+		},
+		teardown: function () {
+			mw.language = this.orgMwLangauge;
+		}
+	} ) );
+
+	function getMwLanguage( langCode, cb ) {
+		if ( mwLanguageCache[langCode] !== undefined ) {
+			mwLanguageCache[langCode].add( cb );
+			return;
+		}
+		mwLanguageCache[langCode] = $.Callbacks( 'once memory' );
+		mwLanguageCache[langCode].add( cb );
+		$.ajax( {
+			url: mw.util.wikiScript( 'load' ),
+			data: {
+				skin: mw.config.get( 'skin' ),
+				lang: langCode,
+				debug: mw.config.get( 'debug' ),
+				modules: [
+					'mediawiki.language.data',
+					'mediawiki.language'
+				].join( '|' ),
+				only: 'scripts'
+			},
+			dataType: 'script'
+		} ).done(function () {
+				mwLanguageCache[langCode].fire( mw.language );
+			} ).fail( function () {
+				mwLanguageCache[langCode].fire( false );
+			} );
+	}
+
+	QUnit.test( 'Replace', 9, function ( assert ) {
+		mw.messages.set( 'simple', 'Foo $1 baz $2' );
+
+		assert.equal( formatParse( 'simple' ), 'Foo $1 baz $2', 'Replacements with no substitutes' );
+		assert.equal( formatParse( 'simple', 'bar' ), 'Foo bar baz $2', 'Replacements with less substitutes' );
+		assert.equal( formatParse( 'simple', 'bar', 'quux' ), 'Foo bar baz quux', 'Replacements with all substitutes' );
+
+		mw.messages.set( 'plain-input', '<foo foo="foo">x$1y&lt;</foo>z' );
+
+		assert.equal(
+			formatParse( 'plain-input', 'bar' ),
+			'&lt;foo foo="foo"&gt;xbary&amp;lt;&lt;/foo&gt;z',
+			'Input is not considered html'
+		);
+
+		mw.messages.set( 'plain-replace', 'Foo $1' );
+
+		assert.equal(
+			formatParse( 'plain-replace', '<bar bar="bar">&gt;</bar>' ),
+			'Foo &lt;bar bar="bar"&gt;&amp;gt;&lt;/bar&gt;',
+			'Replacement is not considered html'
+		);
+
+		mw.messages.set( 'object-replace', 'Foo $1' );
+
+		assert.equal(
+			formatParse( 'object-replace', $( '<div class="bar">&gt;</div>' ) ),
+			'Foo <div class="bar">&gt;</div>',
+			'jQuery objects are preserved as raw html'
+		);
+
+		assert.equal(
+			formatParse( 'object-replace', $( '<div class="bar">&gt;</div>' ).get( 0 ) ),
+			'Foo <div class="bar">&gt;</div>',
+			'HTMLElement objects are preserved as raw html'
+		);
+
+		assert.equal(
+			formatParse( 'object-replace', $( '<div class="bar">&gt;</div>' ).toArray() ),
+			'Foo <div class="bar">&gt;</div>',
+			'HTMLElement[] arrays are preserved as raw html'
+		);
+
+		assert.equal(
+			formatParse( 'external-link-replace', 'http://example.org/?x=y&z' ),
+			'Foo <a href="http://example.org/?x=y&amp;z">bar</a>',
+			'Href is not double-escaped in wikilink function'
+		);
+	} );
+
+	QUnit.test( 'Plural', 3, function ( assert ) {
+		assert.equal( formatParse( 'plural-msg', 0 ), 'Found 0 items', 'Plural test for english with zero as count' );
+		assert.equal( formatParse( 'plural-msg', 1 ), 'Found 1 item', 'Singular test for english' );
+		assert.equal( formatParse( 'plural-msg', 2 ), 'Found 2 items', 'Plural test for english' );
+	} );
+
+	QUnit.test( 'Gender', 11, function ( assert ) {
+		// TODO: These tests should be for mw.msg once mw.msg integrated with mw.jqueryMsg
+		// TODO: English may not be the best language for these tests. Use a language like Arabic or Russian
+		var user = mw.user;
+
+		user.options.set( 'gender', 'male' );
+		assert.equal(
+			formatParse( 'gender-msg', 'Bob', 'male' ),
+			'Bob: blue',
+			'Masculine from string "male"'
+		);
+		assert.equal(
+			formatParse( 'gender-msg', 'Bob', user ),
+			'Bob: blue',
+			'Masculine from mw.user object'
+		);
+
+		user.options.set( 'gender', 'unknown' );
+		assert.equal(
+			formatParse( 'gender-msg', 'Foo', user ),
+			'Foo: green',
+			'Neutral from mw.user object' );
+		assert.equal(
+			formatParse( 'gender-msg', 'Alice', 'female' ),
+			'Alice: pink',
+			'Feminine from string "female"' );
+		assert.equal(
+			formatParse( 'gender-msg', 'User' ),
+			'User: green',
+			'Neutral when no parameter given' );
+		assert.equal(
+			formatParse( 'gender-msg', 'User', 'unknown' ),
+			'User: green',
+			'Neutral from string "unknown"'
+		);
+
+		mw.messages.set( 'gender-msg-one-form', '{{GENDER:$1|User}}: $2 {{PLURAL:$2|edit|edits}}' );
+
+		assert.equal(
+			formatParse( 'gender-msg-one-form', 'male', 10 ),
+			'User: 10 edits',
+			'Gender neutral and plural form'
+		);
+		assert.equal(
+			formatParse( 'gender-msg-one-form', 'female', 1 ),
+			'User: 1 edit',
+			'Gender neutral and singular form'
+		);
+
+		mw.messages.set( 'gender-msg-lowercase', '{{gender:$1|he|she}} is awesome' );
+		assert.equal(
+			formatParse( 'gender-msg-lowercase', 'male' ),
+			'he is awesome',
+			'Gender masculine'
+		);
+		assert.equal(
+			formatParse( 'gender-msg-lowercase', 'female' ),
+			'she is awesome',
+			'Gender feminine'
+		);
+
+		mw.messages.set( 'gender-msg-wrong', '{{gender}} test' );
+		assert.equal(
+			formatParse( 'gender-msg-wrong', 'female' ),
+			' test',
+			'Invalid syntax should result in {{gender}} simply being stripped away'
+		);
+	} );
+
+	QUnit.test( 'Grammar', 2, function ( assert ) {
+		assert.equal( formatParse( 'grammar-msg' ), 'Przeszukaj ' + mw.config.get( 'wgSiteName' ), 'Grammar Test with sitename' );
+
+		mw.messages.set( 'grammar-msg-wrong-syntax', 'Przeszukaj {{GRAMMAR:grammar_case_xyz}}' );
+		assert.equal( formatParse( 'grammar-msg-wrong-syntax' ), 'Przeszukaj ', 'Grammar Test with wrong grammar template syntax' );
+	} );
+
+	QUnit.test( 'Match PHP parser', mw.libs.phpParserData.tests.length, function ( assert ) {
+		mw.messages.set( mw.libs.phpParserData.messages );
+		$.each( mw.libs.phpParserData.tests, function ( i, test ) {
+			QUnit.stop();
+			getMwLanguage( test.lang, function ( langClass ) {
+				QUnit.start();
+				if ( !langClass ) {
+					assert.ok( false, 'Language "' + test.lang + '" failed to load' );
+					return;
+				}
+				mw.config.set( 'wgUserLanguage', test.lang );
+				var parser = new mw.jqueryMsg.parser( { language: langClass } );
+				assert.equal(
+					parser.parse( test.key, test.args ).html(),
+					test.result,
+					test.name
+				);
+			} );
+		} );
+	} );
+
+	QUnit.test( 'Links', 6, function ( assert ) {
+		var expectedDisambiguationsText,
+			expectedMultipleBars,
+			expectedSpecialCharacters;
+
+		/*
+		 The below three are all identical to or based on real messages.  For disambiguations-text,
+		 the bold was removed because it is not yet implemented.
+		 */
+
+		assert.htmlEqual(
+			formatParse( 'jquerymsg-test-statistics-users' ),
+			expectedListUsers,
+			'Piped wikilink'
+		);
+
+		expectedDisambiguationsText = 'The following pages contain at least one link to a disambiguation page.\nThey may have to link to a more appropriate page instead.\nA page is treated as a disambiguation page if it uses a template that is linked from ' +
+			'<a title="MediaWiki:Disambiguationspage" href="/wiki/MediaWiki:Disambiguationspage">MediaWiki:Disambiguationspage</a>.';
+
+		mw.messages.set( 'disambiguations-text', 'The following pages contain at least one link to a disambiguation page.\nThey may have to link to a more appropriate page instead.\nA page is treated as a disambiguation page if it uses a template that is linked from [[MediaWiki:Disambiguationspage]].' );
+		assert.htmlEqual(
+			formatParse( 'disambiguations-text' ),
+			expectedDisambiguationsText,
+			'Wikilink without pipe'
+		);
+
+		assert.htmlEqual(
+			formatParse( 'jquerymsg-test-version-entrypoints-index-php' ),
+			expectedEntrypoints,
+			'External link'
+		);
+
+		// Pipe trick is not supported currently, but should not parse as text either.
+		mw.messages.set( 'pipe-trick', '[[Tampa, Florida|]]' );
+		assert.equal(
+			formatParse( 'pipe-trick' ),
+			'pipe-trick: Parse error at position 0 in input: [[Tampa, Florida|]]',
+			'Pipe trick should return error string.'
+		);
+
+		expectedMultipleBars = '<a title="Main Page" href="/wiki/Main_Page">Main|Page</a>';
+		mw.messages.set( 'multiple-bars', '[[Main Page|Main|Page]]' );
+		assert.htmlEqual(
+			formatParse( 'multiple-bars' ),
+			expectedMultipleBars,
+			'Bar in anchor'
+		);
+
+		expectedSpecialCharacters = '<a title="&quot;Who&quot; wants to be a millionaire &amp; live on &#039;Exotic Island&#039;?" href="/wiki/%22Who%22_wants_to_be_a_millionaire_%26_live_on_%27Exotic_Island%27%3F">&quot;Who&quot; wants to be a millionaire &amp; live on &#039;Exotic Island&#039;?</a>';
+
+		mw.messages.set( 'special-characters', '[[' + specialCharactersPageName + ']]' );
+		assert.htmlEqual(
+			formatParse( 'special-characters' ),
+			expectedSpecialCharacters,
+			'Special characters'
+		);
+	} );
+
+// Tests that {{-transformation vs. general parsing are done as requested
+	QUnit.test( 'Curly brace transformation', 14, function ( assert ) {
+		var oldUserLang = mw.config.get( 'wgUserLanguage' );
+
+		assertBothModes( assert, ['gender-msg', 'Bob', 'male'], 'Bob: blue', 'gender is resolved' );
+
+		assertBothModes( assert, ['plural-msg', 5], 'Found 5 items', 'plural is resolved' );
+
+		assertBothModes( assert, ['grammar-msg'], 'Przeszukaj ' + mw.config.get( 'wgSiteName' ), 'grammar is resolved' );
+
+		mw.config.set( 'wgUserLanguage', 'en' );
+		assertBothModes( assert, ['formatnum-msg', '987654321.654321'], '987,654,321.654', 'formatnum is resolved' );
+
+		// Test non-{{ wikitext, where behavior differs
+
+		// Wikilink
+		assert.equal(
+			formatText( 'jquerymsg-test-statistics-users' ),
+			mw.messages.get( 'jquerymsg-test-statistics-users' ),
+			'Internal link message unchanged when format is \'text\''
+		);
+		assert.htmlEqual(
+			formatParse( 'jquerymsg-test-statistics-users' ),
+			expectedListUsers,
+			'Internal link message parsed when format is \'parse\''
+		);
+
+		// External link
+		assert.equal(
+			formatText( 'jquerymsg-test-version-entrypoints-index-php' ),
+			mw.messages.get( 'jquerymsg-test-version-entrypoints-index-php' ),
+			'External link message unchanged when format is \'text\''
+		);
+		assert.htmlEqual(
+			formatParse( 'jquerymsg-test-version-entrypoints-index-php' ),
+			expectedEntrypoints,
+			'External link message processed when format is \'parse\''
+		);
+
+		// External link with parameter
+		assert.equal(
+			formatText( 'external-link-replace', 'http://example.com' ),
+			'Foo [http://example.com bar]',
+			'External link message only substitutes parameter when format is \'text\''
+		);
+		assert.htmlEqual(
+			formatParse( 'external-link-replace', 'http://example.com' ),
+			'Foo <a href="http://example.com">bar</a>',
+			'External link message processed when format is \'parse\''
+		);
+
+		mw.config.set( 'wgUserLanguage', oldUserLang );
+	} );
+
+	QUnit.test( 'Int', 4, function ( assert ) {
+		var newarticletextSource = 'You have followed a link to a page that does not exist yet. To create the page, start typing in the box below (see the [[{{Int:Foobar}}|foobar]] for more info). If you are here by mistake, click your browser\'s back button.',
+			expectedNewarticletext,
+			helpPageTitle = 'Help:Foobar';
+
+		mw.messages.set( 'foobar', helpPageTitle );
+
+		expectedNewarticletext = 'You have followed a link to a page that does not exist yet. To create the page, start typing in the box below (see the ' +
+			'<a title="Help:Foobar" href="/wiki/Help:Foobar">foobar</a> for more info). If you are here by mistake, click your browser\'s back button.';
+
+		mw.messages.set( 'newarticletext', newarticletextSource );
+
+		assert.htmlEqual(
+			formatParse( 'newarticletext' ),
+			expectedNewarticletext,
+			'Link with nested message'
+		);
+
+		assert.equal(
+			formatParse( 'see-portal-url' ),
+			'Project:Community portal is an important community page.',
+			'Nested message'
+		);
+
+		mw.messages.set( 'newarticletext-lowercase',
+			newarticletextSource.replace( 'Int:Helppage', 'int:helppage' ) );
+
+		assert.htmlEqual(
+			formatParse( 'newarticletext-lowercase' ),
+			expectedNewarticletext,
+			'Link with nested message, lowercase include'
+		);
+
+		mw.messages.set( 'uses-missing-int', '{{int:doesnt-exist}}' );
+
+		assert.equal(
+			formatParse( 'uses-missing-int' ),
+			'[doesnt-exist]',
+			'int: where nested message does not exist'
+		);
+	} );
+
+// Tests that getMessageFunction is used for non-plain messages with curly braces or
+// square brackets, but not otherwise.
+	QUnit.test( 'mw.Message.prototype.parser monkey-patch', 22, function ( assert ) {
+		var oldGMF, outerCalled, innerCalled;
+
+		mw.messages.set( {
+			'curly-brace': '{{int:message}}',
+			'single-square-bracket': '[https://www.mediawiki.org/ MediaWiki]',
+			'double-square-bracket': '[[Some page]]',
+			'regular': 'Other message'
+		} );
+
+		oldGMF = mw.jqueryMsg.getMessageFunction;
+
+		mw.jqueryMsg.getMessageFunction = function () {
+			outerCalled = true;
+			return function () {
+				innerCalled = true;
+			};
+		};
+
+		function verifyGetMessageFunction( key, format, shouldCall ) {
+			var message;
+			outerCalled = false;
+			innerCalled = false;
+			message = mw.message( key );
+			message[format]();
+			assert.strictEqual( outerCalled, shouldCall, 'Outer function called for ' + key );
+			assert.strictEqual( innerCalled, shouldCall, 'Inner function called for ' + key );
+		}
+
+		verifyGetMessageFunction( 'curly-brace', 'parse', true );
+		verifyGetMessageFunction( 'curly-brace', 'plain', false );
+
+		verifyGetMessageFunction( 'single-square-bracket', 'parse', true );
+		verifyGetMessageFunction( 'single-square-bracket', 'plain', false );
+
+		verifyGetMessageFunction( 'double-square-bracket', 'parse', true );
+		verifyGetMessageFunction( 'double-square-bracket', 'plain', false );
+
+		verifyGetMessageFunction( 'regular', 'parse', false );
+		verifyGetMessageFunction( 'regular', 'plain', false );
+
+		verifyGetMessageFunction( 'jquerymsg-test-pagetriage-del-talk-page-notify-summary', 'plain', false );
+		verifyGetMessageFunction( 'jquerymsg-test-categorytree-collapse-bullet', 'plain', false );
+		verifyGetMessageFunction( 'jquerymsg-test-wikieditor-toolbar-help-content-signature-result', 'plain', false );
+
+		mw.jqueryMsg.getMessageFunction = oldGMF;
+	} );
+
+formatnumTests = [
+	{
+		lang: 'en',
+		number: 987654321.654321,
+		result: '987,654,321.654',
+		description: 'formatnum test for English, decimal seperator'
+	},
+	{
+		lang: 'ar',
+		number: 987654321.654321,
+		result: '٩٨٧٬٦٥٤٬٣٢١٫٦٥٤',
+		description: 'formatnum test for Arabic, with decimal seperator'
+	},
+	{
+		lang: 'ar',
+		number: '٩٨٧٦٥٤٣٢١٫٦٥٤٣٢١',
+		result: 987654321,
+		integer: true,
+		description: 'formatnum test for Arabic, with decimal seperator, reverse'
+	},
+	{
+		lang: 'ar',
+		number: -12.89,
+		result: '-١٢٫٨٩',
+		description: 'formatnum test for Arabic, negative number'
+	},
+	{
+		lang: 'ar',
+		number: '-١٢٫٨٩',
+		result: -12,
+		integer: true,
+		description: 'formatnum test for Arabic, negative number, reverse'
+	},
+	{
+		lang: 'nl',
+		number: 987654321.654321,
+		result: '987.654.321,654',
+		description: 'formatnum test for Nederlands, decimal seperator'
+	},
+	{
+		lang: 'nl',
+		number: -12.89,
+		result: '-12,89',
+		description: 'formatnum test for Nederlands, negative number'
+	},
+	{
+		lang: 'nl',
+		number: '.89',
+		result: '0,89',
+		description: 'formatnum test for Nederlands'
+	},
+	{
+		lang: 'nl',
+		number: 'invalidnumber',
+		result: 'invalidnumber',
+		description: 'formatnum test for Nederlands, invalid number'
+	},
+	{
+		lang: 'ml',
+		number: '1000000000',
+		result: '1,00,00,00,000',
+		description: 'formatnum test for Malayalam'
+	},
+	{
+		lang: 'ml',
+		number: '-1000000000',
+		result: '-1,00,00,00,000',
+		description: 'formatnum test for Malayalam, negative number'
+	},
+	/*
+	 * This will fail because of wrong pattern for ml in MW(different from CLDR)
+	{
+		lang: 'ml',
+		number: '1000000000.000',
+		result: '1,00,00,00,000.000',
+		description: 'formatnum test for Malayalam with decimal place'
+	},
+	*/
+	{
+		lang: 'hi',
+		number: '123456789.123456789',
+		result: '१२,३४,५६,७८९',
+		description: 'formatnum test for Hindi'
+	},
+	{
+		lang: 'hi',
+		number: '१२,३४,५६,७८९',
+		result: '१२,३४,५६,७८९',
+		description: 'formatnum test for Hindi, Devanagari digits passed'
+	},
+	{
+		lang: 'hi',
+		number: '१२३४५६,७८९',
+		result: '123456',
+		integer: true,
+		description: 'formatnum test for Hindi, Devanagari digits passed to get integer value'
+	}
+];
+
+QUnit.test( 'formatnum', formatnumTests.length, function ( assert ) {
+	mw.messages.set( 'formatnum-msg', '{{formatnum:$1}}' );
+	mw.messages.set( 'formatnum-msg-int', '{{formatnum:$1|R}}' );
+	$.each( formatnumTests, function ( i, test ) {
+		QUnit.stop();
+		getMwLanguage( test.lang, function ( langClass ) {
+			QUnit.start();
+			if ( !langClass ) {
+				assert.ok( false, 'Language "' + test.lang + '" failed to load' );
+				return;
+			}
+			mw.messages.set(test.message );
+			mw.config.set( 'wgUserLanguage', test.lang ) ;
+			var parser = new mw.jqueryMsg.parser( { language: langClass } );
+			assert.equal(
+				parser.parse( test.integer ? 'formatnum-msg-int' : 'formatnum-msg',
+					[ test.number ] ).html(),
+				test.result,
+				test.description
+			);
+		} );
+	} );
+} );
+
+// HTML in wikitext
+QUnit.test( 'HTML', 26, function ( assert ) {
+	mw.messages.set( 'jquerymsg-italics-msg', '<i>Very</i> important' );
+
+	assertBothModes( assert, ['jquerymsg-italics-msg'], mw.messages.get( 'jquerymsg-italics-msg' ), 'Simple italics unchanged' );
+
+	mw.messages.set( 'jquerymsg-bold-msg', '<b>Strong</b> speaker' );
+	assertBothModes( assert, ['jquerymsg-bold-msg'], mw.messages.get( 'jquerymsg-bold-msg' ), 'Simple bold unchanged' );
+
+	mw.messages.set( 'jquerymsg-bold-italics-msg', 'It is <b><i>key</i></b>' );
+	assertBothModes( assert, ['jquerymsg-bold-italics-msg'], mw.messages.get( 'jquerymsg-bold-italics-msg' ), 'Bold and italics nesting order preserved' );
+
+	mw.messages.set( 'jquerymsg-italics-bold-msg', 'It is <i><b>vital</b></i>' );
+	assertBothModes( assert, ['jquerymsg-italics-bold-msg'], mw.messages.get( 'jquerymsg-italics-bold-msg' ), 'Italics and bold nesting order preserved' );
+
+	mw.messages.set( 'jquerymsg-italics-with-link', 'An <i>italicized [[link|wiki-link]]</i>' );
+
+	assert.htmlEqual(
+		formatParse( 'jquerymsg-italics-with-link' ),
+		'An <i>italicized <a title="link" href="' + mw.html.escape( mw.util.getUrl( 'link' ) ) + '">wiki-link</i>',
+		'Italics with link inside in parse mode'
+	);
+
+	assert.equal(
+		formatText( 'jquerymsg-italics-with-link' ),
+		mw.messages.get( 'jquerymsg-italics-with-link' ),
+		'Italics with link unchanged in text mode'
+	);
+
+	mw.messages.set( 'jquerymsg-italics-id-class', '<i id="foo" class="bar">Foo</i>' );
+	assert.htmlEqual(
+		formatParse( 'jquerymsg-italics-id-class' ),
+		mw.messages.get( 'jquerymsg-italics-id-class' ),
+		'ID and class are allowed'
+	);
+
+	mw.messages.set( 'jquerymsg-italics-onclick', '<i onclick="alert(\'foo\')">Foo</i>' );
+	assert.htmlEqual(
+		formatParse( 'jquerymsg-italics-onclick' ),
+		'&lt;i onclick=&quot;alert(\'foo\')&quot;&gt;Foo&lt;/i&gt;',
+		'element with onclick is escaped because it is not allowed'
+	);
+
+	mw.messages.set( 'jquerymsg-script-msg', '<script  >alert( "Who put this tag here?" );</script>' );
+	assert.htmlEqual(
+		formatParse( 'jquerymsg-script-msg' ),
+		'&lt;script  &gt;alert( &quot;Who put this tag here?&quot; );&lt;/script&gt;',
+		'Tag outside whitelist escaped in parse mode'
+	);
+
+	assert.equal(
+		formatText( 'jquerymsg-script-msg' ),
+		mw.messages.get( 'jquerymsg-script-msg' ),
+		'Tag outside whitelist unchanged in text mode'
+	);
+
+	mw.messages.set( 'jquerymsg-script-link-msg', '<script>[[Foo|bar]]</script>' );
+	assert.htmlEqual(
+		formatParse( 'jquerymsg-script-link-msg' ),
+		'&lt;script&gt;<a title="Foo" href="' + mw.html.escape( mw.util.getUrl( 'Foo' ) ) + '">bar</a>&lt;/script&gt;',
+		'Script tag text is escaped because that element is not allowed, but link inside is still HTML'
+	);
+
+	mw.messages.set( 'jquerymsg-mismatched-html', '<i class="important">test</b>' );
+	assert.htmlEqual(
+		formatParse( 'jquerymsg-mismatched-html' ),
+		'&lt;i class=&quot;important&quot;&gt;test&lt;/b&gt;',
+		'Mismatched HTML start and end tag treated as text'
+	);
+
+	// TODO (mattflaschen, 2013-03-18): It's not a security issue, but there's no real
+	// reason the htmlEmitter span needs to be here. It's an artifact of how emitting works.
+	mw.messages.set( 'jquerymsg-script-and-external-link', '<script>alert( "jquerymsg-script-and-external-link test" );</script> [http://example.com <i>Foo</i> bar]' );
+	assert.htmlEqual(
+		formatParse( 'jquerymsg-script-and-external-link' ),
+		'&lt;script&gt;alert( "jquerymsg-script-and-external-link test" );&lt;/script&gt; <a href="http://example.com"><span class="mediaWiki_htmlEmitter"><i>Foo</i> bar</span></a>',
+		'HTML tags in external links not interfering with escaping of other tags'
+	);
+
+	mw.messages.set( 'jquerymsg-link-script', '[http://example.com <script>alert( "jquerymsg-link-script test" );</script>]' );
+	assert.htmlEqual(
+		formatParse( 'jquerymsg-link-script' ),
+		'<a href="http://example.com"><span class="mediaWiki_htmlEmitter">&lt;script&gt;alert( "jquerymsg-link-script test" );&lt;/script&gt;</span></a>',
+		'Non-whitelisted HTML tag in external link anchor treated as text'
+	);
+
+	// Intentionally not using htmlEqual for the quote tests
+	mw.messages.set( 'jquerymsg-double-quotes-preserved', '<i id="double">Double</i>' );
+	assert.equal(
+		formatParse( 'jquerymsg-double-quotes-preserved' ),
+		mw.messages.get( 'jquerymsg-double-quotes-preserved' ),
+		'Attributes with double quotes are preserved as such'
+	);
+
+	mw.messages.set( 'jquerymsg-single-quotes-normalized-to-double', '<i id=\'single\'>Single</i>' );
+	assert.equal(
+		formatParse( 'jquerymsg-single-quotes-normalized-to-double' ),
+		'<i id="single">Single</i>',
+		'Attributes with single quotes are normalized to double'
+	);
+
+	mw.messages.set( 'jquerymsg-escaped-double-quotes-attribute', '<i style="font-family:&quot;Arial&quot;">Styled</i>' );
+	assert.htmlEqual(
+		formatParse( 'jquerymsg-escaped-double-quotes-attribute' ),
+		mw.messages.get( 'jquerymsg-escaped-double-quotes-attribute' ),
+		'Escaped attributes are parsed correctly'
+	);
+
+	mw.messages.set( 'jquerymsg-escaped-single-quotes-attribute', '<i style=\'font-family:&#039;Arial&#039;\'>Styled</i>' );
+	assert.htmlEqual(
+		formatParse( 'jquerymsg-escaped-single-quotes-attribute' ),
+		mw.messages.get( 'jquerymsg-escaped-single-quotes-attribute' ),
+		'Escaped attributes are parsed correctly'
+	);
+
+
+	mw.messages.set( 'jquerymsg-wikitext-contents-parsed', '<i>[http://example.com Example]</i>' );
+	assert.htmlEqual(
+		formatParse( 'jquerymsg-wikitext-contents-parsed' ),
+		'<i><a href="http://example.com">Example</a></i>',
+		'Contents of valid tag are treated as wikitext, so external link is parsed'
+	);
+
+	mw.messages.set( 'jquerymsg-wikitext-contents-script', '<i><script>Script inside</script></i>' );
+	assert.htmlEqual(
+		formatParse( 'jquerymsg-wikitext-contents-script' ),
+		'<i><span class="mediaWiki_htmlEmitter">&lt;script&gt;Script inside&lt;/script&gt;</span></i>',
+		'Contents of valid tag are treated as wikitext, so invalid HTML element is treated as text'
+	);
+
+	mw.messages.set( 'jquerymsg-unclosed-tag', 'Foo<tag>bar' );
+	assert.htmlEqual(
+		formatParse( 'jquerymsg-unclosed-tag' ),
+		'Foo&lt;tag&gt;bar',
+		'Nonsupported unclosed tags are escaped'
+	);
+
+	mw.messages.set( 'jquerymsg-self-closing-tag', 'Foo<tag/>bar' );
+	assert.htmlEqual(
+		formatParse( 'jquerymsg-self-closing-tag' ),
+		'Foo&lt;tag/&gt;bar',
+		'Self-closing tags don\'t cause a parse error'
+	);
+} );
+
+}( mediaWiki, jQuery ) );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.jscompat.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.jscompat.test.js
new file mode 100644
index 00000000..3328ce3f
--- /dev/null
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.jscompat.test.js
@@ -0,0 +1,70 @@
+/**
+ * Some misc JavaScript compatibility tests,
+ * just to make sure the environments we run in are consistent.
+ */
+( function ( $ ) {
+	QUnit.module( 'mediawiki.jscompat', QUnit.newMwEnvironment() );
+
+	QUnit.test( 'Variable with Unicode letter in name', 3, function ( assert ) {
+		var orig, ŝablono;
+
+		orig = 'some token';
+		ŝablono = orig;
+
+		assert.deepEqual( ŝablono, orig, 'ŝablono' );
+		assert.deepEqual( \u015dablono, orig, '\\u015dablono' );
+		assert.deepEqual( \u015Dablono, orig, '\\u015Dablono' );
+	} );
+
+	/*
+	// Not that we need this. ;)
+	// This fails on IE 6-8
+	// Works on IE 9, Firefox 6, Chrome 14
+	QUnit.test( 'Keyword workaround: "if" as variable name using Unicode escapes', function ( assert ) {
+		var orig = "another token";
+		\u0069\u0066 = orig;
+		assert.deepEqual( \u0069\u0066, orig, '\\u0069\\u0066' );
+	});
+	*/
+
+	/*
+	// Not that we need this. ;)
+	// This fails on IE 6-9
+	// Works on Firefox 6, Chrome 14
+	QUnit.test( 'Keyword workaround: "if" as member variable name using Unicode escapes', function ( assert ) {
+		var orig = "another token";
+		var foo = {};
+		foo.\u0069\u0066 = orig;
+		assert.deepEqual( foo.\u0069\u0066, orig, 'foo.\\u0069\\u0066' );
+	});
+	*/
+
+	QUnit.test( 'Stripping of single initial newline from textarea\'s literal contents (bug 12130)', function ( assert ) {
+		var maxn, n,
+			expected, $textarea;
+
+		maxn = 4;
+		QUnit.expect( maxn * 2 );
+
+		function repeat( str, n ) {
+			var out;
+			if ( n <= 0 ) {
+				return '';
+			} else {
+				out = [];
+				out.length = n + 1;
+				return out.join( str );
+			}
+		}
+
+		for ( n = 0; n < maxn; n++ ) {
+			expected = repeat( '\n', n ) + 'some text';
+
+			$textarea = $( '<textarea>\n' + expected + '</textarea>' );
+			assert.equal( $textarea.val(), expected, 'Expecting ' + n + ' newlines (HTML contained ' + (n + 1) + ')' );
+
+			$textarea = $( '<textarea>' ).val( expected );
+			assert.equal( $textarea.val(), expected, 'Expecting ' + n + ' newlines (from DOM set with ' + n + ')' );
+		}
+	} );
+}( jQuery ) );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
new file mode 100644
index 00000000..9ca434f1
--- /dev/null
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
@@ -0,0 +1,443 @@
+( function ( mw, $ ) {
+	'use strict';
+
+	QUnit.module( 'mediawiki.language', QUnit.newMwEnvironment( {
+		setup: function () {
+			this.liveLangData = mw.language.data.values;
+			mw.language.data.values = $.extend( true, {}, this.liveLangData );
+		},
+		teardown: function () {
+			mw.language.data.values = this.liveLangData;
+		}
+	} ) );
+
+	QUnit.test( 'mw.language getData and setData', 2, function ( assert ) {
+		mw.language.setData( 'en', 'testkey', 'testvalue' );
+		assert.equal( mw.language.getData( 'en', 'testkey' ), 'testvalue', 'Getter setter test for mw.language' );
+		assert.equal( mw.language.getData( 'en', 'invalidkey' ), undefined, 'Getter setter test for mw.language with invalid key' );
+	} );
+
+	function grammarTest( langCode, test ) {
+		// The test works only if the content language is opt.language
+		// because it requires [lang].js to be loaded.
+		QUnit.test( 'Grammar test for lang=' + langCode, function ( assert ) {
+			QUnit.expect( test.length );
+
+			for ( var i = 0; i < test.length; i++ ) {
+				assert.equal(
+					mw.language.convertGrammar( test[i].word, test[i].grammarForm ),
+					test[i].expected,
+					test[i].description
+				);
+			}
+		} );
+	}
+
+	// These tests run only for the current UI language.
+	var grammarTests = {
+		bs: [
+			{
+				word: 'word',
+				grammarForm: 'instrumental',
+				expected: 's word',
+				description: 'Grammar test for instrumental case'
+			},
+			{
+				word: 'word',
+				grammarForm: 'lokativ',
+				expected: 'o word',
+				description: 'Grammar test for lokativ case'
+			}
+		],
+
+		he: [
+			{
+				word: 'ויקיפדיה',
+				grammarForm: 'prefixed',
+				expected: 'וויקיפדיה',
+				description: 'Duplicate the "Waw" if prefixed'
+			},
+			{
+				word: 'וולפגנג',
+				grammarForm: 'prefixed',
+				expected: 'וולפגנג',
+				description: 'Duplicate the "Waw" if prefixed, but not if it is already duplicated.'
+			},
+			{
+				word: 'הקובץ',
+				grammarForm: 'prefixed',
+				expected: 'קובץ',
+				description: 'Remove the "He" if prefixed'
+			},
+			{
+				word: 'Wikipedia',
+				grammarForm: 'תחילית',
+				expected: '־Wikipedia',
+				description: 'GAdd a hyphen (maqaf) before non-Hebrew letters'
+			},
+			{
+				word: '1995',
+				grammarForm: 'תחילית',
+				expected: '־1995',
+				description: 'Add a hyphen (maqaf) before numbers'
+			}
+		],
+
+		hsb: [
+			{
+				word: 'word',
+				grammarForm: 'instrumental',
+				expected: 'z word',
+				description: 'Grammar test for instrumental case'
+			},
+			{
+				word: 'word',
+				grammarForm: 'lokatiw',
+				expected: 'wo word',
+				description: 'Grammar test for lokatiw case'
+			}
+		],
+
+		dsb: [
+			{
+				word: 'word',
+				grammarForm: 'instrumental',
+				expected: 'z word',
+				description: 'Grammar test for instrumental case'
+			},
+			{
+				word: 'word',
+				grammarForm: 'lokatiw',
+				expected: 'wo word',
+				description: 'Grammar test for lokatiw case'
+			}
+		],
+
+		hy: [
+			{
+				word: 'Մաունա',
+				grammarForm: 'genitive',
+				expected: 'Մաունայի',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: 'հետո',
+				grammarForm: 'genitive',
+				expected: 'հետոյի',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: 'գիրք',
+				grammarForm: 'genitive',
+				expected: 'գրքի',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: 'ժամանակի',
+				grammarForm: 'genitive',
+				expected: 'ժամանակիի',
+				description: 'Grammar test for genitive case'
+			}
+		],
+
+		fi: [
+			{
+				word: 'talo',
+				grammarForm: 'genitive',
+				expected: 'talon',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: 'linux',
+				grammarForm: 'genitive',
+				expected: 'linuxin',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: 'talo',
+				grammarForm: 'elative',
+				expected: 'talosta',
+				description: 'Grammar test for elative case'
+			},
+			{
+				word: 'pastöroitu',
+				grammarForm: 'partitive',
+				expected: 'pastöroitua',
+				description: 'Grammar test for partitive case'
+			},
+			{
+				word: 'talo',
+				grammarForm: 'partitive',
+				expected: 'taloa',
+				description: 'Grammar test for partitive case'
+			},
+			{
+				word: 'talo',
+				grammarForm: 'illative',
+				expected: 'taloon',
+				description: 'Grammar test for illative case'
+			},
+			{
+				word: 'linux',
+				grammarForm: 'inessive',
+				expected: 'linuxissa',
+				description: 'Grammar test for inessive case'
+			}
+		],
+
+		ru: [
+			{
+				word: 'тесть',
+				grammarForm: 'genitive',
+				expected: 'тестя',
+				description: 'Grammar test for genitive case, тесть -> тестя'
+			},
+			{
+				word: 'привилегия',
+				grammarForm: 'genitive',
+				expected: 'привилегии',
+				description: 'Grammar test for genitive case, привилегия -> привилегии'
+			},
+			{
+				word: 'установка',
+				grammarForm: 'genitive',
+				expected: 'установки',
+				description: 'Grammar test for genitive case, установка -> установки'
+			},
+			{
+				word: 'похоти',
+				grammarForm: 'genitive',
+				expected: 'похотей',
+				description: 'Grammar test for genitive case, похоти -> похотей'
+			},
+			{
+				word: 'доводы',
+				grammarForm: 'genitive',
+				expected: 'доводов',
+				description: 'Grammar test for genitive case, доводы -> доводов'
+			},
+			{
+				word: 'песчаник',
+				grammarForm: 'genitive',
+				expected: 'песчаника',
+				description: 'Grammar test for genitive case, песчаник -> песчаника'
+			},
+			{
+				word: 'данные',
+				grammarForm: 'genitive',
+				expected: 'данных',
+				description: 'Grammar test for genitive case, данные -> данных'
+			},
+			{
+				word: 'тесть',
+				grammarForm: 'prepositional',
+				expected: 'тесте',
+				description: 'Grammar test for prepositional case, тесть -> тесте'
+			},
+			{
+				word: 'привилегия',
+				grammarForm: 'prepositional',
+				expected: 'привилегии',
+				description: 'Grammar test for prepositional case, привилегия -> привилегии'
+			},
+			{
+				word: 'установка',
+				grammarForm: 'prepositional',
+				expected: 'установке',
+				description: 'Grammar test for prepositional case, установка -> установке'
+			},
+			{
+				word: 'похоти',
+				grammarForm: 'prepositional',
+				expected: 'похотях',
+				description: 'Grammar test for prepositional case, похоти -> похотях'
+			},
+			{
+				word: 'доводы',
+				grammarForm: 'prepositional',
+				expected: 'доводах',
+				description: 'Grammar test for prepositional case, доводы -> доводах'
+			},
+			{
+				word: 'песчаник',
+				grammarForm: 'prepositional',
+				expected: 'песчанике',
+				description: 'Grammar test for prepositional case, песчаник -> песчанике'
+			},
+			{
+				word: 'данные',
+				grammarForm: 'prepositional',
+				expected: 'данных',
+				description: 'Grammar test for prepositional case, данные -> данных'
+			}
+		],
+
+		hu: [
+			{
+				word: 'Wikipédiá',
+				grammarForm: 'rol',
+				expected: 'Wikipédiáról',
+				description: 'Grammar test for rol case'
+			},
+			{
+				word: 'Wikipédiá',
+				grammarForm: 'ba',
+				expected: 'Wikipédiába',
+				description: 'Grammar test for ba case'
+			},
+			{
+				word: 'Wikipédiá',
+				grammarForm: 'k',
+				expected: 'Wikipédiák',
+				description: 'Grammar test for k case'
+			}
+		],
+
+		ga: [
+			{
+				word: 'an Domhnach',
+				grammarForm: 'ainmlae',
+				expected: 'Dé Domhnaigh',
+				description: 'Grammar test for ainmlae case'
+			},
+			{
+				word: 'an Luan',
+				grammarForm: 'ainmlae',
+				expected: 'Dé Luain',
+				description: 'Grammar test for ainmlae case'
+			},
+			{
+				word: 'an Satharn',
+				grammarForm: 'ainmlae',
+				expected: 'Dé Sathairn',
+				description: 'Grammar test for ainmlae case'
+			}
+		],
+
+		uk: [
+			{
+				word: 'тесть',
+				grammarForm: 'genitive',
+				expected: 'тестя',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: 'Вікіпедія',
+				grammarForm: 'genitive',
+				expected: 'Вікіпедії',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: 'установка',
+				grammarForm: 'genitive',
+				expected: 'установки',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: 'похоти',
+				grammarForm: 'genitive',
+				expected: 'похотей',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: 'доводы',
+				grammarForm: 'genitive',
+				expected: 'доводов',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: 'песчаник',
+				grammarForm: 'genitive',
+				expected: 'песчаника',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: 'Вікіпедія',
+				grammarForm: 'accusative',
+				expected: 'Вікіпедію',
+				description: 'Grammar test for accusative case'
+			}
+		],
+
+		sl: [
+			{
+				word: 'word',
+				grammarForm: 'orodnik',
+				expected: 'z word',
+				description: 'Grammar test for orodnik case'
+			},
+			{
+				word: 'word',
+				grammarForm: 'mestnik',
+				expected: 'o word',
+				description: 'Grammar test for mestnik case'
+			}
+		],
+
+		os: [
+			{
+				word: 'бæстæ',
+				grammarForm: 'genitive',
+				expected: 'бæсты',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: 'бæстæ',
+				grammarForm: 'allative',
+				expected: 'бæстæм',
+				description: 'Grammar test for allative case'
+			},
+			{
+				word: 'Тигр',
+				grammarForm: 'dative',
+				expected: 'Тигрæн',
+				description: 'Grammar test for dative case'
+			},
+			{
+				word: 'цъити',
+				grammarForm: 'dative',
+				expected: 'цъитийæн',
+				description: 'Grammar test for dative case'
+			},
+			{
+				word: 'лæппу',
+				grammarForm: 'genitive',
+				expected: 'лæппуйы',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: '2011',
+				grammarForm: 'equative',
+				expected: '2011-ау',
+				description: 'Grammar test for equative case'
+			}
+		],
+
+		la: [
+			{
+				word: 'Translatio',
+				grammarForm: 'genitive',
+				expected: 'Translationis',
+				description: 'Grammar test for genitive case'
+			},
+			{
+				word: 'Translatio',
+				grammarForm: 'accusative',
+				expected: 'Translationem',
+				description: 'Grammar test for accusative case'
+			},
+			{
+				word: 'Translatio',
+				grammarForm: 'ablative',
+				expected: 'Translatione',
+				description: 'Grammar test for ablative case'
+			}
+		]
+	};
+
+	$.each( grammarTests, function ( langCode, test ) {
+		if ( langCode === mw.config.get( 'wgUserLanguage' ) ) {
+			grammarTest( langCode, test );
+		}
+	} );
+}( mediaWiki, jQuery ) );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
new file mode 100644
index 00000000..bd4d1d21
--- /dev/null
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
@@ -0,0 +1,916 @@
+( function ( mw, $ ) {
+	var specialCharactersPageName;
+
+	// Since QUnitTestResources.php loads both mediawiki and mediawiki.jqueryMsg as
+	// dependencies, this only tests the monkey-patched behavior with the two of them combined.
+
+	// See mediawiki.jqueryMsg.test.js for unit tests for jqueryMsg-specific functionality.
+
+	QUnit.module( 'mediawiki', QUnit.newMwEnvironment( {
+		setup: function () {
+			// Messages used in multiple tests
+			mw.messages.set( {
+				'other-message': 'Other Message',
+				'mediawiki-test-pagetriage-del-talk-page-notify-summary': 'Notifying author of deletion nomination for [[$1]]',
+				'gender-plural-msg': '{{GENDER:$1|he|she|they}} {{PLURAL:$2|is|are}} awesome',
+				'grammar-msg': 'Przeszukaj {{GRAMMAR:grammar_case_foo|{{SITENAME}}}}',
+				'formatnum-msg': '{{formatnum:$1}}',
+				'int-msg': 'Some {{int:other-message}}',
+				'mediawiki-test-version-entrypoints-index-php': '[https://www.mediawiki.org/wiki/Manual:index.php index.php]',
+				'external-link-replace': 'Foo [$1 bar]'
+			} );
+
+			mw.config.set( {
+				wgArticlePath: '/wiki/$1',
+
+				// For formatnum tests
+				wgUserLanguage: 'en'
+			} );
+
+			specialCharactersPageName = '"Who" wants to be a millionaire & live on \'Exotic Island\'?';
+		}
+	} ) );
+
+	QUnit.test( 'Initial check', 8, function ( assert ) {
+		assert.ok( window.jQuery, 'jQuery defined' );
+		assert.ok( window.$, '$j defined' );
+		assert.ok( window.$j, '$j defined' );
+		assert.strictEqual( window.$, window.jQuery, '$ alias to jQuery' );
+		assert.strictEqual( window.$j, window.jQuery, '$j alias to jQuery' );
+
+		assert.ok( window.mediaWiki, 'mediaWiki defined' );
+		assert.ok( window.mw, 'mw defined' );
+		assert.strictEqual( window.mw, window.mediaWiki, 'mw alias to mediaWiki' );
+	} );
+
+	QUnit.test( 'mw.Map', 27, function ( assert ) {
+		var arry, conf, funky, globalConf, nummy, someValues;
+
+		conf = new mw.Map();
+		// Dummy variables
+		funky = function () {};
+		arry = [];
+		nummy = 7;
+
+		// Single get and set
+
+		assert.strictEqual( conf.set( 'foo', 'Bar' ), true, 'Map.set returns boolean true if a value was set for a valid key string' );
+		assert.equal( conf.get( 'foo' ), 'Bar', 'Map.get returns a single value value correctly' );
+
+		assert.strictEqual( conf.get( 'example' ), null, 'Map.get returns null if selection was a string and the key was not found' );
+		assert.strictEqual( conf.get( 'example', arry ), arry, 'Map.get returns fallback by reference if the key was not found' );
+		assert.strictEqual( conf.get( 'example', undefined ), undefined, 'Map.get supports `undefined` as fallback instead of `null`' );
+
+		assert.strictEqual( conf.get( 'constructor' ), null, 'Map.get does not look at Object.prototype of internal storage (constructor)' );
+		assert.strictEqual( conf.get( 'hasOwnProperty' ), null, 'Map.get does not look at Object.prototype of internal storage (hasOwnProperty)' );
+
+		conf.set( 'hasOwnProperty', function () { return true; } );
+		assert.strictEqual( conf.get( 'example', 'missing' ), 'missing', 'Map.get uses neutral hasOwnProperty method (positive)' );
+
+		conf.set( 'example', 'Foo' );
+		conf.set( 'hasOwnProperty', function () { return false; } );
+		assert.strictEqual( conf.get( 'example' ), 'Foo', 'Map.get uses neutral hasOwnProperty method (negative)' );
+
+		assert.strictEqual( conf.set( 'constructor', 42 ), true, 'Map.set for key "constructor"' );
+		assert.strictEqual( conf.get( 'constructor' ), 42, 'Map.get for key "constructor"' );
+
+		assert.strictEqual( conf.set( 'ImUndefined', undefined ), true, 'Map.set allows setting value to `undefined`' );
+		assert.equal( conf.get( 'ImUndefined', 'fallback' ), undefined , 'Map.get supports retreiving value of `undefined`' );
+
+		assert.strictEqual( conf.set( funky, 'Funky' ), false, 'Map.set returns boolean false if key was invalid (Function)' );
+		assert.strictEqual( conf.set( arry, 'Arry' ), false, 'Map.set returns boolean false if key was invalid (Array)' );
+		assert.strictEqual( conf.set( nummy, 'Nummy' ), false, 'Map.set returns boolean false if key was invalid (Number)' );
+
+		assert.strictEqual( conf.get( funky ), null, 'Map.get ruturns null if selection was invalid (Function)' );
+		assert.strictEqual( conf.get( nummy ), null, 'Map.get ruturns null if selection was invalid (Number)' );
+
+		conf.set( String( nummy ), 'I used to be a number' );
+
+		assert.strictEqual( conf.exists( 'doesNotExist' ), false, 'Map.exists where property does not exist' );
+		assert.strictEqual( conf.exists( 'ImUndefined' ), true, 'Map.exists where value is `undefined`' );
+		assert.strictEqual( conf.exists( nummy ), false, 'Map.exists where key is invalid but looks like an existing key' );
+
+		// Multiple values at once
+		someValues = {
+			'foo': 'bar',
+			'lorem': 'ipsum',
+			'MediaWiki': true
+		};
+		assert.strictEqual( conf.set( someValues ), true, 'Map.set returns boolean true if multiple values were set by passing an object' );
+		assert.deepEqual( conf.get( ['foo', 'lorem'] ), {
+			'foo': 'bar',
+			'lorem': 'ipsum'
+		}, 'Map.get returns multiple values correctly as an object' );
+
+		assert.deepEqual( conf.get( ['foo', 'notExist'] ), {
+			'foo': 'bar',
+			'notExist': null
+		}, 'Map.get return includes keys that were not found as null values' );
+
+
+		// Interacting with globals and accessing the values object
+		assert.strictEqual( conf.get(), conf.values, 'Map.get returns the entire values object by reference (if called without arguments)' );
+
+		conf.set( 'globalMapChecker', 'Hi' );
+
+		assert.ok( 'globalMapChecker' in window === false, 'new mw.Map did not store its values in the global window object by default' );
+
+		globalConf = new mw.Map( true );
+		globalConf.set( 'anotherGlobalMapChecker', 'Hello' );
+
+		assert.ok( 'anotherGlobalMapChecker' in window, 'new mw.Map( true ) did store its values in the global window object' );
+
+		// Whitelist this global variable for QUnit's 'noglobal' mode
+		if ( QUnit.config.noglobals ) {
+			QUnit.config.pollution.push( 'anotherGlobalMapChecker' );
+		}
+	} );
+
+	QUnit.test( 'mw.config', 1, function ( assert ) {
+		assert.ok( mw.config instanceof mw.Map, 'mw.config instance of mw.Map' );
+	} );
+
+	QUnit.test( 'mw.message & mw.messages', 100, function ( assert ) {
+		var goodbye, hello;
+
+		// Convenience method for asserting the same result for multiple formats
+		function assertMultipleFormats( messageArguments, formats, expectedResult, assertMessage ) {
+			var len = formats.length, format, i;
+			for ( i = 0; i < len; i++ ) {
+				format = formats[i];
+				assert.equal( mw.message.apply( null, messageArguments )[format](), expectedResult, assertMessage + ' when format is ' + format );
+			}
+		}
+
+		assert.ok( mw.messages, 'messages defined' );
+		assert.ok( mw.messages instanceof mw.Map, 'mw.messages instance of mw.Map' );
+		assert.ok( mw.messages.set( 'hello', 'Hello <b>awesome</b> world' ), 'mw.messages.set: Register' );
+
+		hello = mw.message( 'hello' );
+
+		// https://bugzilla.wikimedia.org/show_bug.cgi?id=44459
+		assert.equal( hello.format, 'text', 'Message property "format" defaults to "text"' );
+
+		assert.strictEqual( hello.map, mw.messages, 'Message property "map" defaults to the global instance in mw.messages' );
+		assert.equal( hello.key, 'hello', 'Message property "key" (currect key)' );
+		assert.deepEqual( hello.parameters, [], 'Message property "parameters" defaults to an empty array' );
+
+		// Todo
+		assert.ok( hello.params, 'Message prototype "params"' );
+
+		hello.format = 'plain';
+		assert.equal( hello.toString(), 'Hello <b>awesome</b> world', 'Message.toString returns the message as a string with the current "format"' );
+
+		assert.equal( hello.escaped(), 'Hello &lt;b&gt;awesome&lt;/b&gt; world', 'Message.escaped returns the escaped message' );
+		assert.equal( hello.format, 'escaped', 'Message.escaped correctly updated the "format" property' );
+
+		assert.ok( mw.messages.set( 'multiple-curly-brace', '"{{SITENAME}}" is the home of {{int:other-message}}' ), 'mw.messages.set: Register' );
+		assertMultipleFormats( ['multiple-curly-brace'], ['text', 'parse'], '"' + mw.config.get( 'wgSiteName') + '" is the home of Other Message', 'Curly brace format works correctly' );
+		assert.equal( mw.message( 'multiple-curly-brace' ).plain(), mw.messages.get( 'multiple-curly-brace' ), 'Plain format works correctly for curly brace message' );
+		assert.equal( mw.message( 'multiple-curly-brace' ).escaped(), mw.html.escape( '"' + mw.config.get( 'wgSiteName') + '" is the home of Other Message' ), 'Escaped format works correctly for curly brace message' );
+
+		assert.ok( mw.messages.set( 'multiple-square-brackets-and-ampersand', 'Visit the [[Project:Community portal|community portal]] & [[Project:Help desk|help desk]]' ), 'mw.messages.set: Register' );
+		assertMultipleFormats( ['multiple-square-brackets-and-ampersand'], ['plain', 'text'], mw.messages.get( 'multiple-square-brackets-and-ampersand' ), 'Square bracket message is not processed' );
+		assert.equal( mw.message( 'multiple-square-brackets-and-ampersand' ).escaped(), 'Visit the [[Project:Community portal|community portal]] &amp; [[Project:Help desk|help desk]]', 'Escaped format works correctly for square bracket message' );
+		assert.htmlEqual( mw.message( 'multiple-square-brackets-and-ampersand' ).parse(), 'Visit the ' +
+			'<a title="Project:Community portal" href="/wiki/Project:Community_portal">community portal</a>' +
+			' &amp; <a title="Project:Help desk" href="/wiki/Project:Help_desk">help desk</a>', 'Internal links work with parse' );
+
+		assertMultipleFormats( ['mediawiki-test-version-entrypoints-index-php'], ['plain', 'text', 'escaped'], mw.messages.get( 'mediawiki-test-version-entrypoints-index-php' ), 'External link markup is unprocessed' );
+		assert.htmlEqual( mw.message( 'mediawiki-test-version-entrypoints-index-php' ).parse(), '<a href="https://www.mediawiki.org/wiki/Manual:index.php">index.php</a>', 'External link works correctly in parse mode' );
+
+		assertMultipleFormats( ['external-link-replace', 'http://example.org/?x=y&z'], ['plain', 'text'] , 'Foo [http://example.org/?x=y&z bar]', 'Parameters are substituted but external link is not processed' );
+		assert.equal( mw.message( 'external-link-replace', 'http://example.org/?x=y&z' ).escaped(), 'Foo [http://example.org/?x=y&amp;z bar]', 'In escaped mode, parameters are substituted and ampersand is escaped, but external link is not processed' );
+		assert.htmlEqual( mw.message( 'external-link-replace', 'http://example.org/?x=y&z' ).parse(), 'Foo <a href="http://example.org/?x=y&amp;z">bar</a>', 'External link with replacement works in parse mode without double-escaping' );
+
+		hello.parse();
+		assert.equal( hello.format, 'parse', 'Message.parse correctly updated the "format" property' );
+
+		hello.plain();
+		assert.equal( hello.format, 'plain', 'Message.plain correctly updated the "format" property' );
+
+		hello.text();
+		assert.equal( hello.format, 'text', 'Message.text correctly updated the "format" property' );
+
+		assert.strictEqual( hello.exists(), true, 'Message.exists returns true for existing messages' );
+
+		goodbye = mw.message( 'goodbye' );
+		assert.strictEqual( goodbye.exists(), false, 'Message.exists returns false for nonexistent messages' );
+
+		assertMultipleFormats( ['goodbye'], ['plain', 'text'], '<goodbye>', 'Message.toString returns <key> if key does not exist' );
+		// bug 30684
+		assertMultipleFormats( ['goodbye'], ['parse', 'escaped'], '&lt;goodbye&gt;', 'Message.toString returns properly escaped &lt;key&gt; if key does not exist' );
+
+		assert.ok( mw.messages.set( 'plural-test-msg', 'There {{PLURAL:$1|is|are}} $1 {{PLURAL:$1|result|results}}' ), 'mw.messages.set: Register' );
+		assertMultipleFormats( ['plural-test-msg', 6], ['text', 'parse', 'escaped'], 'There are 6 results', 'plural get resolved' );
+		assert.equal( mw.message( 'plural-test-msg', 6 ).plain(), 'There {{PLURAL:6|is|are}} 6 {{PLURAL:6|result|results}}', 'Parameter is substituted but plural is not resolved in plain' );
+
+		assert.ok( mw.messages.set( 'plural-test-msg-explicit', 'There {{plural:$1|is one car|are $1 cars|0=are no cars|12=are a dozen cars}}' ), 'mw.messages.set: Register message with explicit plural forms' );
+		assertMultipleFormats( ['plural-test-msg-explicit', 12], ['text', 'parse', 'escaped'], 'There are a dozen cars', 'explicit plural get resolved' );
+
+		assert.ok( mw.messages.set( 'plural-test-msg-explicit-beginning', 'Basket has {{plural:$1|0=no eggs|12=a dozen eggs|6=half a dozen eggs|one egg|$1 eggs}}' ), 'mw.messages.set: Register message with explicit plural forms' );
+		assertMultipleFormats( ['plural-test-msg-explicit-beginning', 1], ['text', 'parse', 'escaped'], 'Basket has one egg', 'explicit plural given at beginning get resolved for singular' );
+		assertMultipleFormats( ['plural-test-msg-explicit-beginning', 4], ['text', 'parse', 'escaped'], 'Basket has 4 eggs', 'explicit plural given at beginning get resolved for plural' );
+		assertMultipleFormats( ['plural-test-msg-explicit-beginning', 6], ['text', 'parse', 'escaped'], 'Basket has half a dozen eggs', 'explicit plural given at beginning get resolved for 6' );
+		assertMultipleFormats( ['plural-test-msg-explicit-beginning', 0], ['text', 'parse', 'escaped'], 'Basket has no eggs', 'explicit plural given at beginning get resolved for 0' );
+
+
+		assertMultipleFormats( ['mediawiki-test-pagetriage-del-talk-page-notify-summary'], ['plain', 'text'], mw.messages.get( 'mediawiki-test-pagetriage-del-talk-page-notify-summary' ), 'Double square brackets with no parameters unchanged' );
+
+		assertMultipleFormats( ['mediawiki-test-pagetriage-del-talk-page-notify-summary', specialCharactersPageName], ['plain', 'text'], 'Notifying author of deletion nomination for [[' + specialCharactersPageName + ']]', 'Double square brackets with one parameter' );
+
+		assert.equal( mw.message( 'mediawiki-test-pagetriage-del-talk-page-notify-summary', specialCharactersPageName ).escaped(), 'Notifying author of deletion nomination for [[' + mw.html.escape( specialCharactersPageName ) + ']]', 'Double square brackets with one parameter, when escaped' );
+
+
+		assert.ok( mw.messages.set( 'mediawiki-test-categorytree-collapse-bullet', '[<b>−</b>]' ), 'mw.messages.set: Register' );
+		assert.equal( mw.message( 'mediawiki-test-categorytree-collapse-bullet' ).plain(), mw.messages.get( 'mediawiki-test-categorytree-collapse-bullet' ), 'Single square brackets unchanged in plain mode' );
+
+		assert.ok( mw.messages.set( 'mediawiki-test-wikieditor-toolbar-help-content-signature-result', '<a href=\'#\' title=\'{{#special:mypage}}\'>Username</a> (<a href=\'#\' title=\'{{#special:mytalk}}\'>talk</a>)' ), 'mw.messages.set: Register' );
+		assert.equal( mw.message( 'mediawiki-test-wikieditor-toolbar-help-content-signature-result' ).plain(), mw.messages.get( 'mediawiki-test-wikieditor-toolbar-help-content-signature-result' ), 'HTML message with curly braces is not changed in plain mode' );
+
+		assertMultipleFormats( ['gender-plural-msg', 'male', 1], ['text', 'parse', 'escaped'], 'he is awesome', 'Gender and plural are resolved' );
+		assert.equal( mw.message( 'gender-plural-msg', 'male', 1 ).plain(), '{{GENDER:male|he|she|they}} {{PLURAL:1|is|are}} awesome', 'Parameters are substituted, but gender and plural are not resolved in plain mode' );
+
+		assert.equal( mw.message( 'grammar-msg' ).plain(), mw.messages.get( 'grammar-msg' ), 'Grammar is not resolved in plain mode' );
+		assertMultipleFormats( ['grammar-msg'], ['text', 'parse'], 'Przeszukaj ' + mw.config.get( 'wgSiteName' ), 'Grammar is resolved' );
+		assert.equal( mw.message( 'grammar-msg' ).escaped(), 'Przeszukaj ' + mw.html.escape( mw.config.get( 'wgSiteName' ) ), 'Grammar is resolved in escaped mode' );
+
+		assertMultipleFormats( ['formatnum-msg', '987654321.654321'], ['text', 'parse', 'escaped'], '987,654,321.654', 'formatnum is resolved' );
+		assert.equal( mw.message( 'formatnum-msg' ).plain(), mw.messages.get( 'formatnum-msg' ), 'formatnum is not resolved in plain mode' );
+
+		assertMultipleFormats( ['int-msg'], ['text', 'parse', 'escaped'], 'Some Other Message', 'int is resolved' );
+		assert.equal( mw.message( 'int-msg' ).plain(), mw.messages.get( 'int-msg' ), 'int is not resolved in plain mode' );
+
+		assert.ok( mw.messages.set( 'mediawiki-italics-msg', '<i>Very</i> important' ),	'mw.messages.set: Register' );
+		assertMultipleFormats( ['mediawiki-italics-msg'], ['plain', 'text', 'parse'], mw.messages.get( 'mediawiki-italics-msg' ), 'Simple italics unchanged' );
+		assert.htmlEqual(
+			mw.message( 'mediawiki-italics-msg' ).escaped(),
+			'&lt;i&gt;Very&lt;/i&gt; important',
+			'Italics are escaped in	escaped mode'
+		);
+
+		assert.ok( mw.messages.set( 'mediawiki-italics-with-link', 'An <i>italicized [[link|wiki-link]]</i>' ), 'mw.messages.set: Register' );
+		assertMultipleFormats( ['mediawiki-italics-with-link'], ['plain', 'text'], mw.messages.get( 'mediawiki-italics-with-link' ), 'Italics with link unchanged' );
+		assert.htmlEqual(
+			mw.message( 'mediawiki-italics-with-link' ).escaped(),
+			'An &lt;i&gt;italicized [[link|wiki-link]]&lt;/i&gt;',
+			'Italics and link unchanged except for escaping in escaped mode'
+		);
+		assert.htmlEqual(
+			mw.message( 'mediawiki-italics-with-link' ).parse(),
+			'An <i>italicized <a title="link" href="' + mw.util.getUrl( 'link' ) + '">wiki-link</i>',
+			'Italics with link inside in parse mode'
+		);
+
+		assert.ok( mw.messages.set( 'mediawiki-script-msg', '<script  >alert( "Who put this script here?" );</script>' ), 'mw.messages.set: Register' );
+		assertMultipleFormats( ['mediawiki-script-msg'], ['plain', 'text'], mw.messages.get( 'mediawiki-script-msg' ), 'Script unchanged' );
+		assert.htmlEqual(
+			mw.message( 'mediawiki-script-msg' ).escaped(),
+			'&lt;script  &gt;alert( "Who put this script here?" );&lt;/script&gt;',
+			'Script escaped when using escaped format'
+		);
+		assert.htmlEqual(
+			mw.message( 'mediawiki-script-msg' ).parse(),
+			'&lt;script  &gt;alert( "Who put this script here?" );&lt;/script&gt;',
+			'Script escaped when using parse format'
+		);
+
+
+	} );
+
+	QUnit.test( 'mw.msg', 14, function ( assert ) {
+		assert.ok( mw.messages.set( 'hello', 'Hello <b>awesome</b> world' ), 'mw.messages.set: Register' );
+		assert.equal( mw.msg( 'hello' ), 'Hello <b>awesome</b> world', 'Gets message with default options (existing message)' );
+		assert.equal( mw.msg( 'goodbye' ), '<goodbye>', 'Gets message with default options (nonexistent message)' );
+
+		assert.ok( mw.messages.set( 'plural-item' , 'Found $1 {{PLURAL:$1|item|items}}' ), 'mw.messages.set: Register' );
+		assert.equal( mw.msg( 'plural-item', 5 ), 'Found 5 items', 'Apply plural for count 5' );
+		assert.equal( mw.msg( 'plural-item', 0 ), 'Found 0 items', 'Apply plural for count 0' );
+		assert.equal( mw.msg( 'plural-item', 1 ), 'Found 1 item', 'Apply plural for count 1' );
+
+		assert.equal( mw.msg( 'mediawiki-test-pagetriage-del-talk-page-notify-summary', specialCharactersPageName ), 'Notifying author of deletion nomination for [[' + specialCharactersPageName + ']]', 'Double square brackets in mw.msg one parameter' );
+
+		assert.equal( mw.msg( 'gender-plural-msg', 'male', 1 ), 'he is awesome', 'Gender test for male, plural count 1' );
+		assert.equal( mw.msg( 'gender-plural-msg', 'female', '1' ), 'she is awesome', 'Gender test for female, plural count 1' );
+		assert.equal( mw.msg( 'gender-plural-msg', 'unknown', 10 ), 'they are awesome', 'Gender test for neutral, plural count 10' );
+
+		assert.equal( mw.msg( 'grammar-msg' ), 'Przeszukaj ' + mw.config.get( 'wgSiteName' ), 'Grammar is resolved' );
+
+		assert.equal( mw.msg( 'formatnum-msg', '987654321.654321' ), '987,654,321.654', 'formatnum is resolved' );
+
+		assert.equal( mw.msg( 'int-msg' ), 'Some Other Message', 'int is resolved' );
+	} );
+
+	/**
+	 * The sync style load test (for @import). This is, in a way, also an open bug for
+	 * ResourceLoader ("execute js after styles are loaded"), but browsers don't offer a
+	 * way to get a callback from when a stylesheet is loaded (that is, including any
+	 * @import rules inside). To work around this, we'll have a little time loop to check
+	 * if the styles apply.
+	 * Note: This test originally used new Image() and onerror to get a callback
+	 * when the url is loaded, but that is fragile since it doesn't monitor the
+	 * same request as the css @import, and Safari 4 has issues with
+	 * onerror/onload not being fired at all in weird cases like this.
+	 */
+	function assertStyleAsync( assert, $element, prop, val, fn ) {
+		var styleTestStart,
+			el = $element.get( 0 ),
+			styleTestTimeout = ( QUnit.config.testTimeout || 5000 ) - 200;
+
+		function isCssImportApplied() {
+			// Trigger reflow, repaint, redraw, whatever (cross-browser)
+			var x = $element.css( 'height' );
+			x = el.innerHTML;
+			el.className = el.className;
+			x = document.documentElement.clientHeight;
+
+			return $element.css( prop ) === val;
+		}
+
+		function styleTestLoop() {
+			var styleTestSince = new Date().getTime() - styleTestStart;
+			// If it is passing or if we timed out, run the real test and stop the loop
+			if ( isCssImportApplied() || styleTestSince > styleTestTimeout ) {
+				assert.equal( $element.css( prop ), val,
+					'style "' + prop + ': ' + val + '" from url is applied (after ' + styleTestSince + 'ms)'
+				);
+
+				if ( fn ) {
+					fn();
+				}
+
+				return;
+			}
+			// Otherwise, keep polling
+			setTimeout( styleTestLoop, 150 );
+		}
+
+		// Start the loop
+		styleTestStart = new Date().getTime();
+		styleTestLoop();
+	}
+
+	function urlStyleTest( selector, prop, val ) {
+		return QUnit.fixurl(
+			mw.config.get( 'wgScriptPath' ) +
+				'/tests/qunit/data/styleTest.css.php?' +
+				$.param( {
+					selector: selector,
+					prop: prop,
+					val: val
+				} )
+		);
+	}
+
+	QUnit.asyncTest( 'mw.loader', 2, function ( assert ) {
+		var isAwesomeDone;
+
+		mw.loader.testCallback = function () {
+			QUnit.start();
+			assert.strictEqual( isAwesomeDone, undefined, 'Implementing module is.awesome: isAwesomeDone should still be undefined' );
+			isAwesomeDone = true;
+		};
+
+		mw.loader.implement( 'test.callback', [QUnit.fixurl( mw.config.get( 'wgScriptPath' ) + '/tests/qunit/data/callMwLoaderTestCallback.js' )], {}, {} );
+
+		mw.loader.using( 'test.callback', function () {
+
+			// /sample/awesome.js declares the "mw.loader.testCallback" function
+			// which contains a call to start() and ok()
+			assert.strictEqual( isAwesomeDone, true, 'test.callback module should\'ve caused isAwesomeDone to be true' );
+			delete mw.loader.testCallback;
+
+		}, function () {
+			QUnit.start();
+			assert.ok( false, 'Error callback fired while loader.using "test.callback" module' );
+		} );
+	} );
+
+	QUnit.asyncTest( 'mw.loader.implement( styles={ "css": [text, ..] } )', 2, function ( assert ) {
+		var $element = $( '<div class="mw-test-implement-a"></div>' ).appendTo( '#qunit-fixture' );
+
+		assert.notEqual(
+			$element.css( 'float' ),
+			'right',
+			'style is clear'
+		);
+
+		mw.loader.implement(
+			'test.implement.a',
+			function () {
+				assert.equal(
+					$element.css( 'float' ),
+					'right',
+					'style is applied'
+				);
+				QUnit.start();
+			},
+			{
+				'all': '.mw-test-implement-a { float: right; }'
+			},
+			{}
+		);
+
+		mw.loader.load( [
+			'test.implement.a'
+		] );
+	} );
+
+	QUnit.asyncTest( 'mw.loader.implement( styles={ "url": { <media>: [url, ..] } } )', 7, function ( assert ) {
+		var $element1 = $( '<div class="mw-test-implement-b1"></div>' ).appendTo( '#qunit-fixture' ),
+			$element2 = $( '<div class="mw-test-implement-b2"></div>' ).appendTo( '#qunit-fixture' ),
+			$element3 = $( '<div class="mw-test-implement-b3"></div>' ).appendTo( '#qunit-fixture' );
+
+		assert.notEqual(
+			$element1.css( 'text-align' ),
+			'center',
+			'style is clear'
+		);
+		assert.notEqual(
+			$element2.css( 'float' ),
+			'left',
+			'style is clear'
+		);
+		assert.notEqual(
+			$element3.css( 'text-align' ),
+			'right',
+			'style is clear'
+		);
+
+		mw.loader.implement(
+			'test.implement.b',
+			function () {
+				// Note: QUnit.start() must only be called when the entire test is
+				// complete. So, make sure that we don't start until *both*
+				// assertStyleAsync calls have completed.
+				var pending = 2;
+				assertStyleAsync( assert, $element2, 'float', 'left', function () {
+					assert.notEqual( $element1.css( 'text-align' ), 'center', 'print style is not applied' );
+
+					pending--;
+					if ( pending === 0 ) {
+						QUnit.start();
+					}
+				} );
+				assertStyleAsync( assert, $element3, 'float', 'right', function () {
+					assert.notEqual( $element1.css( 'text-align' ), 'center', 'print style is not applied' );
+
+					pending--;
+					if ( pending === 0 ) {
+						QUnit.start();
+					}
+				} );
+			},
+			{
+				'url': {
+					'print': [urlStyleTest( '.mw-test-implement-b1', 'text-align', 'center' )],
+					'screen': [
+						// bug 40834: Make sure it actually works with more than 1 stylesheet reference
+						urlStyleTest( '.mw-test-implement-b2', 'float', 'left' ),
+						urlStyleTest( '.mw-test-implement-b3', 'float', 'right' )
+					]
+				}
+			},
+			{}
+		);
+
+		mw.loader.load( [
+			'test.implement.b'
+		] );
+	} );
+
+	// Backwards compatibility
+	QUnit.asyncTest( 'mw.loader.implement( styles={ <media>: text } ) (back-compat)', 2, function ( assert ) {
+		var $element = $( '<div class="mw-test-implement-c"></div>' ).appendTo( '#qunit-fixture' );
+
+		assert.notEqual(
+			$element.css( 'float' ),
+			'right',
+			'style is clear'
+		);
+
+		mw.loader.implement(
+			'test.implement.c',
+			function () {
+				assert.equal(
+					$element.css( 'float' ),
+					'right',
+					'style is applied'
+				);
+				QUnit.start();
+			},
+			{
+				'all': '.mw-test-implement-c { float: right; }'
+			},
+			{}
+		);
+
+		mw.loader.load( [
+			'test.implement.c'
+		] );
+	} );
+
+	// Backwards compatibility
+	QUnit.asyncTest( 'mw.loader.implement( styles={ <media>: [url, ..] } ) (back-compat)', 4, function ( assert ) {
+		var $element = $( '<div class="mw-test-implement-d"></div>' ).appendTo( '#qunit-fixture' ),
+			$element2 = $( '<div class="mw-test-implement-d2"></div>' ).appendTo( '#qunit-fixture' );
+
+		assert.notEqual(
+			$element.css( 'float' ),
+			'right',
+			'style is clear'
+		);
+		assert.notEqual(
+			$element2.css( 'text-align' ),
+			'center',
+			'style is clear'
+		);
+
+		mw.loader.implement(
+			'test.implement.d',
+			function () {
+				assertStyleAsync( assert, $element, 'float', 'right', function () {
+
+					assert.notEqual( $element2.css( 'text-align' ), 'center', 'print style is not applied (bug 40500)' );
+
+					QUnit.start();
+				} );
+			},
+			{
+				'all': [urlStyleTest( '.mw-test-implement-d', 'float', 'right' )],
+				'print': [urlStyleTest( '.mw-test-implement-d2', 'text-align', 'center' )]
+			},
+			{}
+		);
+
+		mw.loader.load( [
+			'test.implement.d'
+		] );
+	} );
+
+	// @import (bug 31676)
+	QUnit.asyncTest( 'mw.loader.implement( styles has @import)', 5, function ( assert ) {
+		var isJsExecuted, $element;
+
+		mw.loader.implement(
+			'test.implement.import',
+			function () {
+				assert.strictEqual( isJsExecuted, undefined, 'javascript not executed multiple times' );
+				isJsExecuted = true;
+
+				assert.equal( mw.loader.getState( 'test.implement.import' ), 'ready', 'module state is "ready" while implement() is executing javascript' );
+
+				$element = $( '<div class="mw-test-implement-import">Foo bar</div>' ).appendTo( '#qunit-fixture' );
+
+				assert.equal( mw.msg( 'test-foobar' ), 'Hello Foobar, $1!', 'Messages are loaded before javascript execution' );
+
+				assertStyleAsync( assert, $element, 'float', 'right', function () {
+					assert.equal( $element.css( 'text-align' ), 'center',
+						'CSS styles after the @import rule are working'
+					);
+
+					QUnit.start();
+				} );
+			},
+			{
+				'css': [
+					'@import url(\''
+						+ urlStyleTest( '.mw-test-implement-import', 'float', 'right' )
+						+ '\');\n'
+						+ '.mw-test-implement-import { text-align: center; }'
+				]
+			},
+			{
+				'test-foobar': 'Hello Foobar, $1!'
+			}
+		);
+
+		mw.loader.load( 'test.implement' );
+
+	} );
+
+	QUnit.asyncTest( 'mw.loader.implement( only messages )', 2, function ( assert ) {
+		assert.assertFalse( mw.messages.exists( 'bug_29107' ), 'Verify that the test message doesn\'t exist yet' );
+
+		mw.loader.implement( 'test.implement.msgs', [], {}, { 'bug_29107': 'loaded' } );
+		mw.loader.using( 'test.implement.msgs', function () {
+			QUnit.start();
+			assert.ok( mw.messages.exists( 'bug_29107' ), 'Bug 29107: messages-only module should implement ok' );
+		}, function () {
+			QUnit.start();
+			assert.ok( false, 'Error callback fired while implementing "test.implement.msgs" module' );
+		} );
+	} );
+
+	QUnit.test( 'mw.loader erroneous indirect dependency', 3, function ( assert ) {
+		mw.loader.register( [
+			['test.module1', '0'],
+			['test.module2', '0', ['test.module1']],
+			['test.module3', '0', ['test.module2']]
+		] );
+		mw.loader.implement( 'test.module1', function () {
+			throw new Error( 'expected' );
+		}, {}, {} );
+		assert.strictEqual( mw.loader.getState( 'test.module1' ), 'error', 'Expected "error" state for test.module1' );
+		assert.strictEqual( mw.loader.getState( 'test.module2' ), 'error', 'Expected "error" state for test.module2' );
+		assert.strictEqual( mw.loader.getState( 'test.module3' ), 'error', 'Expected "error" state for test.module3' );
+	} );
+
+	QUnit.test( 'mw.loader out-of-order implementation', 9, function ( assert ) {
+		mw.loader.register( [
+			['test.module4', '0'],
+			['test.module5', '0', ['test.module4']],
+			['test.module6', '0', ['test.module5']]
+		] );
+		mw.loader.implement( 'test.module4', function () {
+		}, {}, {} );
+		assert.strictEqual( mw.loader.getState( 'test.module4' ), 'ready', 'Expected "ready" state for test.module4' );
+		assert.strictEqual( mw.loader.getState( 'test.module5' ), 'registered', 'Expected "registered" state for test.module5' );
+		assert.strictEqual( mw.loader.getState( 'test.module6' ), 'registered', 'Expected "registered" state for test.module6' );
+		mw.loader.implement( 'test.module6', function () {
+		}, {}, {} );
+		assert.strictEqual( mw.loader.getState( 'test.module4' ), 'ready', 'Expected "ready" state for test.module4' );
+		assert.strictEqual( mw.loader.getState( 'test.module5' ), 'registered', 'Expected "registered" state for test.module5' );
+		assert.strictEqual( mw.loader.getState( 'test.module6' ), 'loaded', 'Expected "loaded" state for test.module6' );
+		mw.loader.implement( 'test.module5', function () {
+		}, {}, {} );
+		assert.strictEqual( mw.loader.getState( 'test.module4' ), 'ready', 'Expected "ready" state for test.module4' );
+		assert.strictEqual( mw.loader.getState( 'test.module5' ), 'ready', 'Expected "ready" state for test.module5' );
+		assert.strictEqual( mw.loader.getState( 'test.module6' ), 'ready', 'Expected "ready" state for test.module6' );
+	} );
+
+	QUnit.test( 'mw.loader missing dependency', 13, function ( assert ) {
+		mw.loader.register( [
+			['test.module7', '0'],
+			['test.module8', '0', ['test.module7']],
+			['test.module9', '0', ['test.module8']]
+		] );
+		mw.loader.implement( 'test.module8', function () {
+		}, {}, {} );
+		assert.strictEqual( mw.loader.getState( 'test.module7' ), 'registered', 'Expected "registered" state for test.module7' );
+		assert.strictEqual( mw.loader.getState( 'test.module8' ), 'loaded', 'Expected "loaded" state for test.module8' );
+		assert.strictEqual( mw.loader.getState( 'test.module9' ), 'registered', 'Expected "registered" state for test.module9' );
+		mw.loader.state( 'test.module7', 'missing' );
+		assert.strictEqual( mw.loader.getState( 'test.module7' ), 'missing', 'Expected "missing" state for test.module7' );
+		assert.strictEqual( mw.loader.getState( 'test.module8' ), 'error', 'Expected "error" state for test.module8' );
+		assert.strictEqual( mw.loader.getState( 'test.module9' ), 'error', 'Expected "error" state for test.module9' );
+		mw.loader.implement( 'test.module9', function () {
+		}, {}, {} );
+		assert.strictEqual( mw.loader.getState( 'test.module7' ), 'missing', 'Expected "missing" state for test.module7' );
+		assert.strictEqual( mw.loader.getState( 'test.module8' ), 'error', 'Expected "error" state for test.module8' );
+		assert.strictEqual( mw.loader.getState( 'test.module9' ), 'error', 'Expected "error" state for test.module9' );
+		mw.loader.using(
+			['test.module7'],
+			function () {
+				assert.ok( false, 'Success fired despite missing dependency' );
+				assert.ok( true, 'QUnit expected() count dummy' );
+			},
+			function ( e, dependencies ) {
+				assert.strictEqual( $.isArray( dependencies ), true, 'Expected array of dependencies' );
+				assert.deepEqual( dependencies, ['test.module7'], 'Error callback called with module test.module7' );
+			}
+		);
+		mw.loader.using(
+			['test.module9'],
+			function () {
+				assert.ok( false, 'Success fired despite missing dependency' );
+				assert.ok( true, 'QUnit expected() count dummy' );
+			},
+			function ( e, dependencies ) {
+				assert.strictEqual( $.isArray( dependencies ), true, 'Expected array of dependencies' );
+				dependencies.sort();
+				assert.deepEqual(
+					dependencies,
+					['test.module7', 'test.module8', 'test.module9'],
+					'Error callback called with all three modules as dependencies'
+				);
+			}
+		);
+	} );
+
+	QUnit.asyncTest( 'mw.loader dependency handling', 5, function ( assert ) {
+		mw.loader.addSource(
+			'testloader',
+			{
+				loadScript: QUnit.fixurl( mw.config.get( 'wgScriptPath' ) + '/tests/qunit/data/load.mock.php' )
+			}
+		);
+
+		mw.loader.register( [
+			// [module, version, dependencies, group, source]
+			['testMissing', '1', [], null, 'testloader'],
+			['testUsesMissing', '1', ['testMissing'], null, 'testloader'],
+			['testUsesNestedMissing', '1', ['testUsesMissing'], null, 'testloader']
+		] );
+
+		function verifyModuleStates() {
+			assert.equal( mw.loader.getState( 'testMissing' ), 'missing', 'Module not known to server must have state "missing"' );
+			assert.equal( mw.loader.getState( 'testUsesMissing' ), 'error', 'Module with missing dependency must have state "error"' );
+			assert.equal( mw.loader.getState( 'testUsesNestedMissing' ), 'error', 'Module with indirect missing dependency must have state "error"' );
+		}
+
+		mw.loader.using( ['testUsesNestedMissing'],
+			function () {
+				assert.ok( false, 'Error handler should be invoked.' );
+				assert.ok( true ); // Dummy to reach QUnit expect()
+
+				verifyModuleStates();
+
+				QUnit.start();
+			},
+			function ( e, badmodules ) {
+				assert.ok( true, 'Error handler should be invoked.' );
+				// As soon as server spits out state('testMissing', 'missing');
+				// it will bubble up and trigger the error callback.
+				// Therefor the badmodules array is not testUsesMissing or testUsesNestedMissing.
+				assert.deepEqual( badmodules, ['testMissing'], 'Bad modules as expected.' );
+
+				verifyModuleStates();
+
+				QUnit.start();
+			}
+		);
+	} );
+
+	QUnit.asyncTest( 'mw.loader( "//protocol-relative" ) (bug 30825)', 2, function ( assert ) {
+		// This bug was actually already fixed in 1.18 and later when discovered in 1.17.
+		// Test is for regressions!
+
+		// Forge an URL to the test callback script
+		var target = QUnit.fixurl(
+			mw.config.get( 'wgServer' ) + mw.config.get( 'wgScriptPath' ) + '/tests/qunit/data/qunitOkCall.js'
+		);
+
+		// Confirm that mw.loader.load() works with protocol-relative URLs
+		target = target.replace( /https?:/, '' );
+
+		assert.equal( target.substr( 0, 2 ), '//',
+			'URL must be relative to test relative URLs!'
+		);
+
+		// Async!
+		// The target calls QUnit.start
+		mw.loader.load( target );
+	} );
+
+	QUnit.test( 'mw.html', 13, function ( assert ) {
+		assert.throws( function () {
+			mw.html.escape();
+		}, TypeError, 'html.escape throws a TypeError if argument given is not a string' );
+
+		assert.equal( mw.html.escape( '<mw awesome="awesome" value=\'test\' />' ),
+			'&lt;mw awesome=&quot;awesome&quot; value=&#039;test&#039; /&gt;', 'escape() escapes special characters to html entities' );
+
+		assert.equal( mw.html.element(),
+			'<undefined/>', 'element() always returns a valid html string (even without arguments)' );
+
+		assert.equal( mw.html.element( 'div' ), '<div/>', 'element() Plain DIV (simple)' );
+
+		assert.equal( mw.html.element( 'div', {}, '' ), '<div></div>', 'element() Basic DIV (simple)' );
+
+		assert.equal(
+			mw.html.element(
+				'div', {
+					id: 'foobar'
+				}
+			),
+			'<div id="foobar"/>',
+			'html.element DIV (attribs)' );
+
+		assert.equal( mw.html.element( 'p', null, 12 ), '<p>12</p>', 'Numbers are valid content and should be casted to a string' );
+
+		assert.equal( mw.html.element( 'p', { title: 12 }, '' ), '<p title="12"></p>', 'Numbers are valid attribute values' );
+
+		// Example from https://www.mediawiki.org/wiki/ResourceLoader/Default_modules#mediaWiki.html
+		assert.equal(
+			mw.html.element(
+				'div',
+				{},
+				new mw.html.Raw(
+					mw.html.element( 'img', { src: '<' } )
+				)
+			),
+			'<div><img src="&lt;"/></div>',
+			'Raw inclusion of another element'
+		);
+
+		assert.equal(
+			mw.html.element(
+				'option', {
+					selected: true
+				}, 'Foo'
+			),
+			'<option selected="selected">Foo</option>',
+			'Attributes may have boolean values. True copies the attribute name to the value.'
+		);
+
+		assert.equal(
+			mw.html.element(
+				'option', {
+					value: 'foo',
+					selected: false
+				}, 'Foo'
+			),
+			'<option value="foo">Foo</option>',
+			'Attributes may have boolean values. False keeps the attribute from output.'
+		);
+
+		assert.equal( mw.html.element( 'div',
+			null, 'a' ),
+			'<div>a</div>',
+			'html.element DIV (content)' );
+
+		assert.equal( mw.html.element( 'a',
+			{ href: 'http://mediawiki.org/w/index.php?title=RL&action=history' }, 'a' ),
+			'<a href="http://mediawiki.org/w/index.php?title=RL&amp;action=history">a</a>',
+			'html.element DIV (attribs + content)' );
+
+	} );
+
+	QUnit.test( 'mw.hook', 10, function ( assert ) {
+		var hook, add, fire, chars, callback;
+
+		mw.hook( 'test.hook.unfired' ).add( function () {
+			assert.ok( false, 'Unfired hook' );
+		} );
+
+		mw.hook( 'test.hook.basic' ).add( function () {
+			assert.ok( true, 'Basic callback' );
+		} );
+		mw.hook( 'test.hook.basic' ).fire();
+
+		mw.hook( 'test.hook.data' ).add( function ( data1, data2 ) {
+			assert.equal( data1, 'example', 'Fire with data (string param)' );
+			assert.deepEqual( data2, ['two'], 'Fire with data (array param)' );
+		} );
+		mw.hook( 'test.hook.data' ).fire( 'example', ['two'] );
+
+		mw.hook( 'test.hook.chainable' ).add( function () {
+			assert.ok( true, 'Chainable' );
+		} ).fire();
+
+		hook = mw.hook( 'test.hook.detach' );
+		add = hook.add;
+		fire = hook.fire;
+		add( function ( x, y ) {
+			assert.deepEqual( [x, y], ['x', 'y'], 'Detached (contextless) with data' );
+		} );
+		fire( 'x', 'y' );
+
+		mw.hook( 'test.hook.fireBefore' ).fire().add( function () {
+			assert.ok( true, 'Invoke handler right away if it was fired before' );
+		} );
+
+		mw.hook( 'test.hook.fireTwiceBefore' ).fire().fire().add( function () {
+			assert.ok( true, 'Invoke handler right away if it was fired before (only last one)' );
+		} );
+
+		chars = [];
+
+		mw.hook( 'test.hook.many' )
+			.add( function ( chr ) {
+				chars.push( chr );
+			} )
+			.fire( 'x' ).fire( 'y' ).fire( 'z' )
+			.add( function ( chr ) {
+				assert.equal( chr, 'z', 'Adding callback later invokes right away with last data' );
+			} );
+
+		assert.deepEqual( chars, ['x', 'y', 'z'], 'Multiple callbacks with multiple fires' );
+
+		chars = [];
+		callback = function ( chr ) {
+			chars.push( chr );
+		};
+
+		mw.hook( 'test.hook.variadic' )
+			.add(
+				callback,
+				callback,
+				function ( chr ) {
+					chars.push( chr );
+				},
+				callback
+			)
+			.fire( 'x' )
+			.remove(
+				function () {
+					'not-added';
+				},
+				callback
+			)
+			.fire( 'y' )
+			.remove( callback )
+			.fire( 'z' );
+
+		assert.deepEqual(
+			chars,
+			['x', 'x', 'x', 'x', 'y', 'z'],
+			'"add" and "remove" support variadic arguments. ' +
+				'"add" does not filter unique. ' +
+				'"remove" removes all equal by reference. ' +
+				'"remove" is silent if the function is not found'
+		);
+	} );
+
+}( mediaWiki, jQuery ) );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js
new file mode 100644
index 00000000..96be3d1f
--- /dev/null
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js
@@ -0,0 +1,57 @@
+( function ( mw, $ ) {
+	QUnit.module( 'mediawiki.user', QUnit.newMwEnvironment() );
+
+	QUnit.test( 'options', 1, function ( assert ) {
+		assert.ok( mw.user.options instanceof mw.Map, 'options instance of mw.Map' );
+	} );
+
+	QUnit.test( 'user status', 11, function ( assert ) {
+		/**
+		 * Tests can be run under three different conditions:
+		 *   1) From tests/qunit/index.html, user will be anonymous.
+		 *   2) Logged in on [[Special:JavaScriptTest/qunit]]
+		 *   3) Anonymously at the same special page.
+		 */
+
+		// Forge an anonymous user:
+		mw.config.set( 'wgUserName', null );
+		delete mw.config.values.wgUserId;
+
+		assert.strictEqual( mw.user.getName(), null, 'user.getName() returns null when anonymous' );
+		assert.strictEqual( mw.user.name(), null, 'user.name() compatibility' );
+		assert.assertTrue( mw.user.isAnon(), 'user.isAnon() returns true when anonymous' );
+		assert.assertTrue( mw.user.anonymous(), 'user.anonymous() compatibility' );
+		assert.strictEqual( mw.user.getId(), 0, 'user.getId() returns 0 when anonymous' );
+
+		// Not part of startUp module
+		mw.config.set( 'wgUserName', 'John' );
+		mw.config.set( 'wgUserId', 123 );
+
+		assert.equal( mw.user.getName(), 'John', 'user.getName() returns username when logged-in' );
+		assert.equal( mw.user.name(), 'John', 'user.name() compatibility' );
+		assert.assertFalse( mw.user.isAnon(), 'user.isAnon() returns false when logged-in' );
+		assert.assertFalse( mw.user.anonymous(), 'user.anonymous() compatibility' );
+		assert.strictEqual( mw.user.getId(), 123, 'user.getId() returns correct ID when logged-in' );
+
+		assert.equal( mw.user.id(), 'John', 'user.id Returns username when logged-in' );
+	} );
+
+	QUnit.asyncTest( 'getGroups', 3, function ( assert ) {
+		mw.user.getGroups( function ( groups ) {
+			// First group should always be '*'
+			assert.equal( $.type( groups ), 'array', 'Callback gets an array' );
+			assert.notStrictEqual( $.inArray( '*', groups ), -1, '"*"" is in the list' );
+			// Sort needed because of different methods if creating the arrays,
+			// only the content matters.
+			assert.deepEqual( groups.sort(), mw.config.get( 'wgUserGroups' ).sort(), 'Array contains all groups, just like wgUserGroups' );
+			QUnit.start();
+		} );
+	} );
+
+	QUnit.asyncTest( 'getRights', 1, function ( assert ) {
+		mw.user.getRights( function ( rights ) {
+			assert.equal( $.type( rights ), 'array', 'Callback gets an array' );
+			QUnit.start();
+		} );
+	} );
+}( mediaWiki, jQuery ) );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
new file mode 100644
index 00000000..9216f0af
--- /dev/null
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
@@ -0,0 +1,354 @@
+( function ( mw, $ ) {
+	QUnit.module( 'mediawiki.util', QUnit.newMwEnvironment( {
+		setup: function () {
+			this.taPrefix = mw.util.tooltipAccessKeyPrefix;
+			mw.util.tooltipAccessKeyPrefix = 'ctrl-alt-';
+		},
+		teardown: function () {
+			mw.util.tooltipAccessKeyPrefix = this.taPrefix;
+		}
+	} ) );
+
+	QUnit.test( 'rawurlencode', 1, function ( assert ) {
+		assert.equal( mw.util.rawurlencode( 'Test:A & B/Here' ), 'Test%3AA%20%26%20B%2FHere' );
+	} );
+
+	QUnit.test( 'wikiUrlencode', 1, function ( assert ) {
+		assert.equal( mw.util.wikiUrlencode( 'Test:A & B/Here' ), 'Test:A_%26_B/Here' );
+	} );
+
+	QUnit.test( 'getUrl', 4, function ( assert ) {
+		// Not part of startUp module
+		mw.config.set( 'wgArticlePath', '/wiki/$1' );
+		mw.config.set( 'wgPageName', 'Foobar' );
+
+		var href = mw.util.getUrl( 'Sandbox' );
+		assert.equal( href, '/wiki/Sandbox', 'Simple title; Get link for "Sandbox"' );
+
+		href = mw.util.getUrl( 'Foo:Sandbox ? 5+5=10 ! (test)/subpage' );
+		assert.equal( href, '/wiki/Foo:Sandbox_%3F_5%2B5%3D10_%21_%28test%29/subpage',
+			'Advanced title; Get link for "Foo:Sandbox ? 5+5=10 ! (test)/subpage"' );
+
+		href = mw.util.getUrl();
+		assert.equal( href, '/wiki/Foobar', 'Default title; Get link for current page ("Foobar")' );
+
+		href = mw.util.getUrl( 'Sandbox', { action: 'edit' } );
+		assert.equal( href, '/wiki/Sandbox?action=edit',
+			'Simple title with query string; Get link for "Sandbox" with action=edit' );
+	} );
+
+	QUnit.test( 'wikiScript', 4, function ( assert ) {
+		mw.config.set( {
+			'wgScript': '/w/i.php', // customized wgScript for bug 39103
+			'wgLoadScript': '/w/l.php', // customized wgLoadScript for bug 39103
+			'wgScriptPath': '/w',
+			'wgScriptExtension': '.php'
+		} );
+
+		assert.equal( mw.util.wikiScript(), mw.config.get( 'wgScript' ),
+			'wikiScript() returns wgScript'
+		);
+		assert.equal( mw.util.wikiScript( 'index' ), mw.config.get( 'wgScript' ),
+			'wikiScript( index ) returns wgScript'
+		);
+		assert.equal( mw.util.wikiScript( 'load' ), mw.config.get( 'wgLoadScript' ),
+			'wikiScript( load ) returns wgLoadScript'
+		);
+		assert.equal( mw.util.wikiScript( 'api' ), '/w/api.php', 'API path' );
+	} );
+
+	QUnit.test( 'addCSS', 3, function ( assert ) {
+		var $el, style;
+		$el = $( '<div>' ).attr( 'id', 'mw-addcsstest' ).appendTo( '#qunit-fixture' );
+
+		style = mw.util.addCSS( '#mw-addcsstest { visibility: hidden; }' );
+		assert.equal( typeof style, 'object', 'addCSS returned an object' );
+		assert.strictEqual( style.disabled, false, 'property "disabled" is available and set to false' );
+
+		assert.equal( $el.css( 'visibility' ), 'hidden', 'Added style properties are in effect' );
+
+		// Clean up
+		$( style.ownerNode ).remove();
+	} );
+
+	QUnit.asyncTest( 'toggleToc', 4, function ( assert ) {
+		var tocHtml, $toggleLink;
+
+		function actionC() {
+			QUnit.start();
+		}
+
+		function actionB() {
+			assert.strictEqual( mw.util.toggleToc( $toggleLink, actionC ), true, 'Return boolean true if the TOC is now visible.' );
+		}
+
+		function actionA() {
+			assert.strictEqual( mw.util.toggleToc( $toggleLink, actionB ), false, 'Return boolean false if the TOC is now hidden.' );
+		}
+
+		assert.strictEqual( mw.util.toggleToc(), null, 'Return null if there is no table of contents on the page.' );
+
+		tocHtml = '<div id="toc" class="toc">' +
+			'<div id="toctitle">' +
+			'<h2>Contents</h2>' +
+			'<span class="toctoggle">&nbsp;[<a href="#" class="internal" id="togglelink">Hide</a>&nbsp;]</span>' +
+			'</div>' +
+			'<ul><li></li></ul>' +
+			'</div>';
+		$( tocHtml ).appendTo( '#qunit-fixture' );
+		$toggleLink = $( '#togglelink' );
+
+		assert.strictEqual( $toggleLink.length, 1, 'Toggle link is appended to the page.' );
+
+		actionA();
+	} );
+
+	QUnit.test( 'getParamValue', 5, function ( assert ) {
+		var url;
+
+		url = 'http://example.org/?foo=wrong&foo=right#&foo=bad';
+		assert.equal( mw.util.getParamValue( 'foo', url ), 'right', 'Use latest one, ignore hash' );
+		assert.strictEqual( mw.util.getParamValue( 'bar', url ), null, 'Return null when not found' );
+
+		url = 'http://example.org/#&foo=bad';
+		assert.strictEqual( mw.util.getParamValue( 'foo', url ), null, 'Ignore hash if param is not in querystring but in hash (bug 27427)' );
+
+		url = 'example.org?' + $.param( { 'TEST': 'a b+c' } );
+		assert.strictEqual( mw.util.getParamValue( 'TEST', url ), 'a b+c', 'Bug 30441: getParamValue must understand "+" encoding of space' );
+
+		url = 'example.org?' + $.param( { 'TEST': 'a b+c d' } ); // check for sloppy code from r95332 :)
+		assert.strictEqual( mw.util.getParamValue( 'TEST', url ), 'a b+c d', 'Bug 30441: getParamValue must understand "+" encoding of space (multiple spaces)' );
+	} );
+
+	QUnit.test( 'tooltipAccessKey', 4, function ( assert ) {
+		assert.equal( typeof mw.util.tooltipAccessKeyPrefix, 'string', 'tooltipAccessKeyPrefix must be a string' );
+		assert.equal( $.type( mw.util.tooltipAccessKeyRegexp ), 'regexp', 'tooltipAccessKeyRegexp is a regexp' );
+		assert.ok( mw.util.updateTooltipAccessKeys, 'updateTooltipAccessKeys is non-empty' );
+
+		'Example [a]'.replace( mw.util.tooltipAccessKeyRegexp, function ( sub, m1, m2, m3, m4, m5, m6 ) {
+			assert.equal( m6, 'a', 'tooltipAccessKeyRegexp finds the accesskey hint' );
+		} );
+	} );
+
+	QUnit.test( '$content', 2, function ( assert ) {
+		assert.ok( mw.util.$content instanceof jQuery, 'mw.util.$content instance of jQuery' );
+		assert.strictEqual( mw.util.$content.length, 1, 'mw.util.$content must have length of 1' );
+	} );
+
+	/**
+	 * Portlet names are prefixed with 'p-test' to avoid conflict with core
+	 * when running the test suite under a wiki page.
+	 * Previously, test elements where invisible to the selector since only
+	 * one element can have a given id.
+	 */
+	QUnit.test( 'addPortletLink', 13, function ( assert ) {
+		var pTestTb, pCustom, vectorTabs, tbRL, cuQuux, $cuQuux, tbMW, $tbMW, tbRLDM, caFoo,
+			addedAfter, tbRLDMnonexistentid, tbRLDMemptyjquery;
+
+		pTestTb = '\
+		<div class="portlet" id="p-test-tb">\
+			<h3>Toolbox</h3>\
+			<ul class="body"></ul>\
+		</div>';
+		pCustom = '\
+		<div class="portlet" id="p-test-custom">\
+			<h3>Views</h3>\
+			<ul class="body">\
+				<li id="c-foo"><a href="#">Foo</a></li>\
+				<li id="c-barmenu">\
+					<ul>\
+						<li id="c-bar-baz"><a href="#">Baz</a></a>\
+					</ul>\
+				</li>\
+			</ul>\
+		</div>';
+		vectorTabs = '\
+		<div id="p-test-views" class="vectorTabs">\
+			<h3>Views</h3>\
+			<ul></ul>\
+		</div>';
+
+		$( '#qunit-fixture' ).append( pTestTb, pCustom, vectorTabs );
+
+		tbRL = mw.util.addPortletLink( 'p-test-tb', '//mediawiki.org/wiki/ResourceLoader',
+			'ResourceLoader', 't-rl', 'More info about ResourceLoader on MediaWiki.org ', 'l'
+		);
+
+		assert.ok( $.isDomElement( tbRL ), 'addPortletLink returns a valid DOM Element according to $.isDomElement' );
+
+		tbMW = mw.util.addPortletLink( 'p-test-tb', '//mediawiki.org/',
+			'MediaWiki.org', 't-mworg', 'Go to MediaWiki.org ', 'm', tbRL );
+		$tbMW = $( tbMW );
+
+		assert.propEqual(
+			$tbMW.getAttrs(),
+			{
+				id: 't-mworg'
+			},
+			'Validate attributes of created element'
+		);
+
+		assert.propEqual(
+			$tbMW.find( 'a' ).getAttrs(),
+			{
+				href: '//mediawiki.org/',
+				title: 'Go to MediaWiki.org [ctrl-alt-m]',
+				accesskey: 'm'
+			},
+			'Validate attributes of anchor tag in created element'
+		);
+
+		assert.equal( $tbMW.closest( '.portlet' ).attr( 'id' ), 'p-test-tb', 'Link was inserted within correct portlet' );
+		assert.strictEqual( $tbMW.next()[0], tbRL, 'Link is in the correct position (by passing nextnode)' );
+
+		cuQuux = mw.util.addPortletLink( 'p-test-custom', '#', 'Quux', null, 'Example [shift-x]', 'q' );
+		$cuQuux = $( cuQuux );
+
+		assert.equal( $cuQuux.find( 'a' ).attr( 'title' ), 'Example [ctrl-alt-q]', 'Existing accesskey is stripped and updated' );
+
+		assert.equal(
+			$( '#p-test-custom #c-barmenu ul li' ).length,
+			1,
+			'addPortletLink did not add the item to all <ul> elements in the portlet (bug 35082)'
+		);
+
+		tbRLDM = mw.util.addPortletLink( 'p-test-tb', '//mediawiki.org/wiki/RL/DM',
+			'Default modules', 't-rldm', 'List of all default modules ', 'd', '#t-rl' );
+
+		assert.equal( $( tbRLDM ).next().attr( 'id' ), 't-rl', 'Link is in the correct position (by passing CSS selector)' );
+
+		caFoo = mw.util.addPortletLink( 'p-test-views', '#', 'Foo' );
+
+		assert.strictEqual( $tbMW.find( 'span' ).length, 0, 'No <span> element should be added for porlets without vectorTabs class.' );
+		assert.strictEqual( $( caFoo ).find( 'span' ).length, 1, 'A <span> element should be added for porlets with vectorTabs class.' );
+
+		addedAfter = mw.util.addPortletLink( 'p-test-tb', '#', 'After foo', 'post-foo', 'After foo', null, $( tbRL ) );
+		assert.strictEqual( $( addedAfter ).next()[0], tbRL, 'Link is in the correct position (by passing a jQuery object as nextnode)' );
+
+		// test case - nonexistent id as next node
+		tbRLDMnonexistentid = mw.util.addPortletLink( 'p-test-tb', '//mediawiki.org/wiki/RL/DM',
+			'Default modules', 't-rldm-nonexistent', 'List of all default modules ', 'd', '#t-rl-nonexistent' );
+
+		assert.equal( tbRLDMnonexistentid, $( '#p-test-tb li:last' )[0], 'Nonexistent id as nextnode adds the portlet at end' );
+
+		// test case - empty jquery object as next node
+		tbRLDMemptyjquery = mw.util.addPortletLink( 'p-test-tb', '//mediawiki.org/wiki/RL/DM',
+			'Default modules', 't-rldm-empty-jquery', 'List of all default modules ', 'd', $( '#t-rl-nonexistent' ) );
+
+		assert.equal( tbRLDMemptyjquery, $( '#p-test-tb li:last' )[0], 'Empty jquery as nextnode adds the portlet at end' );
+	} );
+
+	QUnit.test( 'jsMessage', 1, function ( assert ) {
+		var a = mw.util.jsMessage( 'MediaWiki is <b>Awesome</b>.' );
+		assert.ok( a, 'Basic checking of return value' );
+
+		// Clean up
+		$( '#mw-js-message' ).remove();
+	} );
+
+	QUnit.test( 'validateEmail', 6, function ( assert ) {
+		assert.strictEqual( mw.util.validateEmail( '' ), null, 'Should return null for empty string ' );
+		assert.strictEqual( mw.util.validateEmail( 'user@localhost' ), true, 'Return true for a valid e-mail address' );
+
+		// testEmailWithCommasAreInvalids
+		assert.strictEqual( mw.util.validateEmail( 'user,foo@example.org' ), false, 'Emails with commas are invalid' );
+		assert.strictEqual( mw.util.validateEmail( 'userfoo@ex,ample.org' ), false, 'Emails with commas are invalid' );
+
+		// testEmailWithHyphens
+		assert.strictEqual( mw.util.validateEmail( 'user-foo@example.org' ), true, 'Emails may contain a hyphen' );
+		assert.strictEqual( mw.util.validateEmail( 'userfoo@ex-ample.org' ), true, 'Emails may contain a hyphen' );
+	} );
+
+	QUnit.test( 'isIPv6Address', 40, function ( assert ) {
+		// Shortcuts
+		function assertFalseIPv6( addy, summary ) {
+			return assert.strictEqual( mw.util.isIPv6Address( addy ), false, summary );
+		}
+
+		function assertTrueIPv6( addy, summary ) {
+			return assert.strictEqual( mw.util.isIPv6Address( addy ), true, summary );
+		}
+
+		// Based on IPTest.php > testisIPv6
+		assertFalseIPv6( ':fc:100::', 'IPv6 starting with lone ":"' );
+		assertFalseIPv6( 'fc:100:::', 'IPv6 ending with a ":::"' );
+		assertFalseIPv6( 'fc:300', 'IPv6 with only 2 words' );
+		assertFalseIPv6( 'fc:100:300', 'IPv6 with only 3 words' );
+
+		$.each(
+			['fc:100::',
+				'fc:100:a::',
+				'fc:100:a:d::',
+				'fc:100:a:d:1::',
+				'fc:100:a:d:1:e::',
+				'fc:100:a:d:1:e:ac::'], function ( i, addy ) {
+				assertTrueIPv6( addy, addy + ' is a valid IP' );
+			} );
+
+		assertFalseIPv6( 'fc:100:a:d:1:e:ac:0::', 'IPv6 with 8 words ending with "::"' );
+		assertFalseIPv6( 'fc:100:a:d:1:e:ac:0:1::', 'IPv6 with 9 words ending with "::"' );
+
+		assertFalseIPv6( ':::' );
+		assertFalseIPv6( '::0:', 'IPv6 ending in a lone ":"' );
+
+		assertTrueIPv6( '::', 'IPv6 zero address' );
+		$.each(
+			['::0',
+				'::fc',
+				'::fc:100',
+				'::fc:100:a',
+				'::fc:100:a:d',
+				'::fc:100:a:d:1',
+				'::fc:100:a:d:1:e',
+				'::fc:100:a:d:1:e:ac',
+
+				'fc:100:a:d:1:e:ac:0'], function ( i, addy ) {
+				assertTrueIPv6( addy, addy + ' is a valid IP' );
+			} );
+
+		assertFalseIPv6( '::fc:100:a:d:1:e:ac:0', 'IPv6 with "::" and 8 words' );
+		assertFalseIPv6( '::fc:100:a:d:1:e:ac:0:1', 'IPv6 with 9 words' );
+
+		assertFalseIPv6( ':fc::100', 'IPv6 starting with lone ":"' );
+		assertFalseIPv6( 'fc::100:', 'IPv6 ending with lone ":"' );
+		assertFalseIPv6( 'fc:::100', 'IPv6 with ":::" in the middle' );
+
+		assertTrueIPv6( 'fc::100', 'IPv6 with "::" and 2 words' );
+		assertTrueIPv6( 'fc::100:a', 'IPv6 with "::" and 3 words' );
+		assertTrueIPv6( 'fc::100:a:d', 'IPv6 with "::" and 4 words' );
+		assertTrueIPv6( 'fc::100:a:d:1', 'IPv6 with "::" and 5 words' );
+		assertTrueIPv6( 'fc::100:a:d:1:e', 'IPv6 with "::" and 6 words' );
+		assertTrueIPv6( 'fc::100:a:d:1:e:ac', 'IPv6 with "::" and 7 words' );
+		assertTrueIPv6( '2001::df', 'IPv6 with "::" and 2 words' );
+		assertTrueIPv6( '2001:5c0:1400:a::df', 'IPv6 with "::" and 5 words' );
+		assertTrueIPv6( '2001:5c0:1400:a::df:2', 'IPv6 with "::" and 6 words' );
+
+		assertFalseIPv6( 'fc::100:a:d:1:e:ac:0', 'IPv6 with "::" and 8 words' );
+		assertFalseIPv6( 'fc::100:a:d:1:e:ac:0:1', 'IPv6 with 9 words' );
+	} );
+
+	QUnit.test( 'isIPv4Address', 11, function ( assert ) {
+		// Shortcuts
+		function assertFalseIPv4( addy, summary ) {
+			assert.strictEqual( mw.util.isIPv4Address( addy ), false, summary );
+		}
+
+		function assertTrueIPv4( addy, summary ) {
+			assert.strictEqual( mw.util.isIPv4Address( addy ), true, summary );
+		}
+
+		// Based on IPTest.php > testisIPv4
+		assertFalseIPv4( false, 'Boolean false is not an IP' );
+		assertFalseIPv4( true, 'Boolean true is not an IP' );
+		assertFalseIPv4( '', 'Empty string is not an IP' );
+		assertFalseIPv4( 'abc', '"abc" is not an IP' );
+		assertFalseIPv4( ':', 'Colon is not an IP' );
+		assertFalseIPv4( '124.24.52', 'IPv4 not enough quads' );
+		assertFalseIPv4( '24.324.52.13', 'IPv4 out of range' );
+		assertFalseIPv4( '.24.52.13', 'IPv4 starts with period' );
+
+		assertTrueIPv4( '124.24.52.13', '124.24.52.134 is a valid IP' );
+		assertTrueIPv4( '1.24.52.13', '1.24.52.13 is a valid IP' );
+		assertFalseIPv4( '74.24.52.13/20', 'IPv4 ranges are not recogzized as valid IPs' );
+	} );
+}( mediaWiki, jQuery ) );