1 files changed, 118 insertions, 116 deletions
diff --git a/tests/qunit/suites/resources/jquery/jquery.localize.test.js b/tests/qunit/suites/resources/jquery/jquery.localize.test.js
index c8e1d9f9..3ef27903 100644
--- a/tests/qunit/suites/resources/jquery/jquery.localize.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.localize.test.js
@@ -1,133 +1,135 @@
-QUnit.module( 'jquery.localize', QUnit.newMwEnvironment() );
+( function ( $, mw ) {
+	QUnit.module( 'jquery.localize', QUnit.newMwEnvironment() );
 
-QUnit.test( 'Handle basic replacements', 4, function ( assert ) {
-	var html, $lc;
-	mw.messages.set( 'basic', 'Basic stuff' );
+	QUnit.test( 'Handle basic replacements', 4, function ( assert ) {
+		var html, $lc;
+		mw.messages.set( 'basic', 'Basic stuff' );
 
-	// Tag: html:msg
-	html = '<div><span><html:msg key="basic" /></span></div>';
-	$lc = $( html ).localize().find( 'span' );
+		// Tag: html:msg
+		html = '<div><span><html:msg key="basic" /></span></div>';
+		$lc = $( html ).localize().find( 'span' );
 
-	assert.strictEqual( $lc.text(), 'Basic stuff', 'Tag: html:msg' );
+		assert.strictEqual( $lc.text(), 'Basic stuff', 'Tag: html:msg' );
 
-	// Attribute: title-msg
-	html = '<div><span title-msg="basic"></span></div>';
-	$lc = $( html ).localize().find( 'span' );
+		// Attribute: title-msg
+		html = '<div><span title-msg="basic"></span></div>';
+		$lc = $( html ).localize().find( 'span' );
 
-	assert.strictEqual( $lc.attr( 'title' ), 'Basic stuff', 'Attribute: title-msg' );
+		assert.strictEqual( $lc.attr( 'title' ), 'Basic stuff', 'Attribute: title-msg' );
 
-	// Attribute: alt-msg
-	html = '<div><span alt-msg="basic"></span></div>';
-	$lc = $( html ).localize().find( 'span' );
+		// Attribute: alt-msg
+		html = '<div><span alt-msg="basic"></span></div>';
+		$lc = $( html ).localize().find( 'span' );
 
-	assert.strictEqual( $lc.attr( 'alt' ), 'Basic stuff', 'Attribute: alt-msg' );
+		assert.strictEqual( $lc.attr( 'alt' ), 'Basic stuff', 'Attribute: alt-msg' );
 
-	// Attribute: placeholder-msg
-	html = '<div><input placeholder-msg="basic" /></div>';
-	$lc = $( html ).localize().find( 'input' );
+		// Attribute: placeholder-msg
+		html = '<div><input placeholder-msg="basic" /></div>';
+		$lc = $( html ).localize().find( 'input' );
 
-	assert.strictEqual( $lc.attr( 'placeholder' ), 'Basic stuff', 'Attribute: placeholder-msg' );
-} );
+		assert.strictEqual( $lc.attr( 'placeholder' ), 'Basic stuff', 'Attribute: placeholder-msg' );
+	} );
+
+	QUnit.test( 'Proper escaping', 2, function ( assert ) {
+		var html, $lc;
+		mw.messages.set( 'properfoo', '<proper esc="test">' );
+
+		// This is handled by jQuery inside $.fn.localize, just a simple sanity checked
+		// making sure it is actually using text() and attr() (or something with the same effect)
 
-QUnit.test( 'Proper escaping', 2, function ( assert ) {
-	var html, $lc;
-	mw.messages.set( 'properfoo', '<proper esc="test">' );
+		// Text escaping
+		html = '<div><span><html:msg key="properfoo" /></span></div>';
+		$lc = $( html ).localize().find( 'span' );
 
-	// This is handled by jQuery inside $.fn.localize, just a simple sanity checked
-	// making sure it is actually using text() and attr() (or something with the same effect)
+		assert.strictEqual( $lc.text(), mw.msg( 'properfoo' ), 'Content is inserted as text, not as html.' );
 
-	// Text escaping
-	html = '<div><span><html:msg key="properfoo"></span></div>';
-	$lc = $( html ).localize().find( 'span' );
+		// Attribute escaping
+		html = '<div><span title-msg="properfoo"></span></div>';
+		$lc = $( html ).localize().find( 'span' );
 
-	assert.strictEqual( $lc.text(), mw.msg( 'properfoo' ), 'Content is inserted as text, not as html.' );
+		assert.strictEqual( $lc.attr( 'title' ), mw.msg( 'properfoo' ), 'Attributes are not inserted raw.' );
+	} );
 
-	// Attribute escaping
-	html = '<div><span title-msg="properfoo"></span></div>';
-	$lc = $( html ).localize().find( 'span' );
+	QUnit.test( 'Options', 7, function ( assert ) {
+		mw.messages.set( {
+			'foo-lorem': 'Lorem',
+			'foo-ipsum': 'Ipsum',
+			'foo-bar-title': 'Read more about bars',
+			'foo-bar-label': 'The Bars',
+			'foo-bazz-title': 'Read more about bazz at $1 (last modified: $2)',
+			'foo-bazz-label': 'The Bazz ($1)',
+			'foo-welcome': 'Welcome to $1! (last visit: $2)'
+		} );
+		var html, $lc, x, sitename = 'Wikipedia';
+
+		// Message key prefix
+		html = '<div><span title-msg="lorem"><html:msg key="ipsum" /></span></div>';
+		$lc = $( html ).localize( {
+			prefix: 'foo-'
+		} ).find( 'span' );
+
+		assert.strictEqual( $lc.attr( 'title' ), 'Lorem', 'Message key prefix - attr' );
+		assert.strictEqual( $lc.text(), 'Ipsum', 'Message key prefix - text' );
+
+		// Variable keys mapping
+		x = 'bar';
+		html = '<div><span title-msg="title"><html:msg key="label" /></span></div>';
+		$lc = $( html ).localize( {
+			keys: {
+				'title': 'foo-' + x + '-title',
+				'label': 'foo-' + x + '-label'
+			}
+		} ).find( 'span' );
+
+		assert.strictEqual( $lc.attr( 'title' ), 'Read more about bars', 'Variable keys mapping - attr' );
+		assert.strictEqual( $lc.text(), 'The Bars', 'Variable keys mapping - text' );
+
+		// Passing parameteters to mw.msg
+		html = '<div><span><html:msg key="foo-welcome" /></span></div>';
+		$lc = $( html ).localize( {
+			params: {
+				'foo-welcome': [sitename, 'yesterday']
+			}
+		} ).find( 'span' );
+
+		assert.strictEqual( $lc.text(), 'Welcome to Wikipedia! (last visit: yesterday)', 'Passing parameteters to mw.msg' );
+
+		// Combination of options prefix, params and keys
+		x = 'bazz';
+		html = '<div><span title-msg="title"><html:msg key="label" /></span></div>';
+		$lc = $( html ).localize( {
+			prefix: 'foo-',
+			keys: {
+				'title': x + '-title',
+				'label': x + '-label'
+			},
+			params: {
+				'title': [sitename, '3 minutes ago'],
+				'label': [sitename, '3 minutes ago']
+
+			}
+		} ).find( 'span' );
+
+		assert.strictEqual( $lc.text(), 'The Bazz (Wikipedia)', 'Combination of options prefix, params and keys - text' );
+		assert.strictEqual( $lc.attr( 'title' ), 'Read more about bazz at Wikipedia (last modified: 3 minutes ago)', 'Combination of options prefix, params and keys - attr' );
+	} );
 
-	assert.strictEqual( $lc.attr( 'title' ), mw.msg( 'properfoo' ), 'Attributes are not inserted raw.' );
-} );
+	QUnit.test( 'Handle data text', 2, function ( assert ) {
+		var html, $lc;
+		mw.messages.set( 'option-one', 'Item 1' );
+		mw.messages.set( 'option-two', 'Item 2' );
+		html = '<select><option data-msg-text="option-one"></option><option data-msg-text="option-two"></option></select>';
+		$lc = $( html ).localize().find( 'option' );
+		assert.strictEqual( $lc.eq( 0 ).text(), mw.msg( 'option-one' ), 'data-msg-text becomes text of options' );
+		assert.strictEqual( $lc.eq( 1 ).text(), mw.msg( 'option-two' ), 'data-msg-text becomes text of options' );
+	} );
 
-QUnit.test( 'Options', 7, function ( assert ) {
-	mw.messages.set( {
-		'foo-lorem': 'Lorem',
-		'foo-ipsum': 'Ipsum',
-		'foo-bar-title': 'Read more about bars',
-		'foo-bar-label': 'The Bars',
-		'foo-bazz-title': 'Read more about bazz at $1 (last modified: $2)',
-		'foo-bazz-label': 'The Bazz ($1)',
-		'foo-welcome': 'Welcome to $1! (last visit: $2)'
+	QUnit.test( 'Handle data html', 2, function ( assert ) {
+		var html, $lc;
+		mw.messages.set( 'html', 'behold... there is a <a>link</a> here!!' );
+		html = '<div><div data-msg-html="html"></div></div>';
+		$lc = $( html ).localize().find( 'a' );
+		assert.strictEqual( $lc.length, 1, 'link is created' );
+		assert.strictEqual( $lc.text(), 'link', 'the link text got added' );
 	} );
-	var html, $lc, attrs, x, sitename = 'Wikipedia';
-
-	// Message key prefix
-	html = '<div><span title-msg="lorem"><html:msg key="ipsum"></span></div>';
-	$lc = $( html ).localize( {
-		prefix: 'foo-'
-	} ).find( 'span' );
-
-	assert.strictEqual( $lc.attr( 'title' ), 'Lorem', 'Message key prefix - attr' );
-	assert.strictEqual( $lc.text(), 'Ipsum', 'Message key prefix - text' );
-
-	// Variable keys mapping
-	x = 'bar';
-	html = '<div><span title-msg="title"><html:msg key="label"></span></div>';
-	$lc = $( html ).localize( {
-		keys: {
-			'title': 'foo-' + x + '-title',
-			'label': 'foo-' + x + '-label'
-		}
-	} ).find( 'span' );
-
-	assert.strictEqual( $lc.attr( 'title' ), 'Read more about bars', 'Variable keys mapping - attr' );
-	assert.strictEqual( $lc.text(), 'The Bars', 'Variable keys mapping - text' );
-
-	// Passing parameteters to mw.msg
-	html = '<div><span><html:msg key="foo-welcome"></span></div>';
-	$lc = $( html ).localize( {
-		params: {
-			'foo-welcome': [sitename, 'yesterday']
-		}
-	} ).find( 'span' );
-
-	assert.strictEqual( $lc.text(), 'Welcome to Wikipedia! (last visit: yesterday)', 'Passing parameteters to mw.msg' );
-
-	// Combination of options prefix, params and keys
-	x = 'bazz';
-	html = '<div><span title-msg="title"><html:msg key="label"></span></div>';
-	$lc = $( html ).localize( {
-		prefix: 'foo-',
-		keys: {
-			'title': x + '-title',
-			'label': x + '-label'
-		},
-		params: {
-			'title': [sitename, '3 minutes ago'],
-			'label': [sitename, '3 minutes ago']
-
-		}
-	} ).find( 'span' );
-
-	assert.strictEqual( $lc.text(), 'The Bazz (Wikipedia)', 'Combination of options prefix, params and keys - text' );
-	assert.strictEqual( $lc.attr( 'title' ), 'Read more about bazz at Wikipedia (last modified: 3 minutes ago)', 'Combination of options prefix, params and keys - attr' );
-} );
-
-QUnit.test( 'Handle data text', 2, function ( assert ) {
-	var html, $lc;
-	mw.messages.set( 'option-one', 'Item 1' );
-	mw.messages.set( 'option-two', 'Item 2' );
-	html = '<select><option data-msg-text="option-one"></option><option data-msg-text="option-two"></option></select>';
-	$lc = $( html ).localize().find( 'option' );
-	assert.strictEqual( $lc.eq( 0 ).text(), mw.msg( 'option-one' ), 'data-msg-text becomes text of options' );
-	assert.strictEqual( $lc.eq( 1 ).text(), mw.msg( 'option-two' ), 'data-msg-text becomes text of options' );
-} );
-
-QUnit.test( 'Handle data html', 2, function ( assert ) {
-	var html, $lc;
-	mw.messages.set( 'html', 'behold... there is a <a>link</a> here!!' );
-	html = '<div><div data-msg-html="html"></div></div>';
-	$lc = $( html ).localize().find( 'a' );
-	assert.strictEqual( $lc.length, 1, 'link is created' );
-	assert.strictEqual( $lc.text(), 'link', 'the link text got added' );
-} );
+}( jQuery, mediaWiki ) );