Merge branch 'archwiki'

Conflicts:
	extensions/FluxBBAuthPlugin.php
	extensions/SyntaxHighlight_GeSHi/README
	extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php
	extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.i18n.php
	extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php
	extensions/SyntaxHighlight_GeSHi/geshi/docs/CHANGES
	extensions/SyntaxHighlight_GeSHi/geshi/docs/THANKS
	extensions/SyntaxHighlight_GeSHi/geshi/docs/TODO
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractClass.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractClass_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractPrivateClass.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractPrivateClass_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractPrivateMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Class.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Class_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Constant.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Constructor.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Destructor.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Function.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Global.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/I.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Index.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Interface.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Interface_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/L.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Lminus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Lplus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Method.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Page.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Page_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateClass.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateClass_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateVariable.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/StaticMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/StaticVariable.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/T.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Tminus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Tplus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Variable.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/blank.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/class_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/file.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/function_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/next_button.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/next_button_disabled.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/package.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/package_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/previous_button.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/previous_button_disabled.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/private_class_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/tutorial.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/tutorial_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/up_button.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/geshi-doc.html
	extensions/SyntaxHighlight_GeSHi/geshi/docs/geshi-doc.txt
	extensions/SyntaxHighlight_GeSHi/geshi/geshi.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/4cs.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/6502acme.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/6502kickass.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/6502tasm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/68000devpac.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/abap.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/actionscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/actionscript3.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ada.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/algol68.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/apache.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/applescript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/apt_sources.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/asm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/asp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/autoconf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/autohotkey.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/autoit.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/avisynth.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/awk.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bascomavr.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bash.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/basic4gl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bibtex.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/blitzbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bnf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/boo.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/c.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/c_loadrunner.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/c_mac.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/caddcl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cadlisp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cfdg.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cfm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/chaiscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cil.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/clojure.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cmake.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cobol.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/coffeescript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cpp-qt.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cpp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/csharp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/css.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cuesheet.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/d.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/dcs.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/delphi.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/diff.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/div.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/dos.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/dot.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/e.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ecmascript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/eiffel.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/email.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/epc.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/erlang.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/euphoria.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/f1.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/falcon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/fo.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/fortran.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/freebasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/fsharp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gambas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gdb.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/genero.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/genie.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gettext.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/glsl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gnuplot.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/go.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/groovy.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gwbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/haskell.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/hicest.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/hq9plus.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/html4strict.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/html5.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/icon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/idl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ini.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/inno.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/intercal.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/io.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/j.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/java.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/java5.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/javascript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/jquery.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/kixtart.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/klonec.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/klonecpp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/latex.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lb.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lisp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/llvm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/locobasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/logtalk.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lolcode.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lotusformulas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lotusscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lsl2.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lua.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/m68k.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/magiksf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/make.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mapbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/matlab.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mirc.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mmix.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/modula2.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/modula3.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mpasm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mxml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mysql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/newlisp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/nsis.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oberon2.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/objc.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/objeck.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ocaml-brief.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ocaml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oobas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oracle11.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oracle8.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oxygene.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oz.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pascal.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pcre.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/per.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/perl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/perl6.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/php-brief.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/php.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pic16.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pike.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pixelbender.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pli.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/plsql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/postgresql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/povray.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/powerbuilder.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/powershell.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/proftpd.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/progress.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/prolog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/properties.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/providex.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/purebasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pycon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/python.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/q.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/qbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rails.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rebol.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/reg.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/robots.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rpmspec.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rsplus.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ruby.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/sas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/scala.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/scheme.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/scilab.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/sdlbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/smalltalk.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/smarty.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/sql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/systemverilog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/tcl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/teraterm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/text.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/thinbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/tsql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/typoscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/unicon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/uscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vala.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vb.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vbnet.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/verilog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vhdl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vim.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/visualfoxpro.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/visualprolog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/whitespace.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/whois.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/winbatch.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xorg_conf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xpp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/yaml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/z80.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/zxbasic.php

1 files changed, 271 insertions, 271 deletions

diff --git a/tests/qunit/suites/resources/jquery/jquery.textSelection.test.js b/tests/qunit/suites/resources/jquery/jquery.textSelection.test.js
index f0a210f5..5fe23944 100644
--- a/tests/qunit/suites/resources/jquery/jquery.textSelection.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.textSelection.test.js
@@ -1,275 +1,275 @@
-QUnit.module( 'jquery.textSelection', QUnit.newMwEnvironment() );
-
-/**
- * Test factory for $.fn.textSelection( 'encapsulateText' )
- *
- * @param options {object} associative array containing:
- *   description {string}
- *   input {string}
- *   output {string}
- *   start {int} starting char for selection
- *   end {int} ending char for selection
- *   params {object} add'l parameters for $().textSelection( 'encapsulateText' )
- */
-function encapsulateTest( options ) {
-	var opt = $.extend({
-		description: '',
-		before: {},
-		after: {},
-		replace: {}
-	}, options);
-
-	opt.before = $.extend({
-		text: '',
-		start: 0,
-		end: 0
-	}, opt.before);
-	opt.after = $.extend({
-		text: '',
-		selected: null
-	}, opt.after);
-
-	QUnit.test( opt.description, function ( assert ) {
-		var tests = 1;
-		if ( opt.after.selected !== null ) {
-			tests++;
-		}
-		QUnit.expect( tests );
-
-		var $textarea = $( '<textarea>' );
-
-		$( '#qunit-fixture' ).append( $textarea );
-
-		//$textarea.textSelection( 'setContents', opt.before.text); // this method is actually missing atm...
-		$textarea.val( opt.before.text ); // won't work with the WikiEditor iframe?
-
-		var	start = opt.before.start,
-			end = opt.before.end;
-		if ( window.opera ) {
-			// Compensate for Opera's craziness converting "\n" to "\r\n" and counting that as two chars
-			var	newLinesBefore = opt.before.text.substring( 0, start ).split( "\n" ).length - 1,
-				newLinesInside = opt.before.text.substring( start, end ).split( "\n" ).length - 1;
-			start += newLinesBefore;
-			end += newLinesBefore + newLinesInside;
-		}
-
-		var options = $.extend( {}, opt.replace ); // Clone opt.replace
-		options.selectionStart = start;
-		options.selectionEnd = end;
-		$textarea.textSelection( 'encapsulateSelection', options );
-
-		var text = $textarea.textSelection( 'getContents' ).replace( /\r\n/g, "\n" );
-
-		assert.equal( text, opt.after.text, 'Checking full text after encapsulation' );
-
-		if (opt.after.selected !== null) {
-			var selected = $textarea.textSelection( 'getSelection' );
-			assert.equal( selected, opt.after.selected, 'Checking selected text after encapsulation.' );
-		}
+( function ( $ ) {
+
+	QUnit.module( 'jquery.textSelection', QUnit.newMwEnvironment() );
+
+	/**
+	 * Test factory for $.fn.textSelection( 'encapsulateText' )
+	 *
+	 * @param options {object} associative array containing:
+	 *   description {string}
+	 *   input {string}
+	 *   output {string}
+	 *   start {int} starting char for selection
+	 *   end {int} ending char for selection
+	 *   params {object} add'l parameters for $().textSelection( 'encapsulateText' )
+	 */
+	function encapsulateTest( options ) {
+		var opt = $.extend( {
+			description: '',
+			before: {},
+			after: {},
+			replace: {}
+		}, options );
+
+		opt.before = $.extend( {
+			text: '',
+			start: 0,
+			end: 0
+		}, opt.before );
+		opt.after = $.extend( {
+			text: '',
+			selected: null
+		}, opt.after );
+
+		QUnit.test( opt.description, function ( assert ) {
+			/*jshint onevar: false */
+			var tests = 1;
+			if ( opt.after.selected !== null ) {
+				tests++;
+			}
+			QUnit.expect( tests );
+
+			var $textarea = $( '<textarea>' );
+
+			$( '#qunit-fixture' ).append( $textarea );
+
+			//$textarea.textSelection( 'setContents', opt.before.text); // this method is actually missing atm...
+			$textarea.val( opt.before.text ); // won't work with the WikiEditor iframe?
+
+			var start = opt.before.start,
+				end = opt.before.end;
+
+			var options = $.extend( {}, opt.replace ); // Clone opt.replace
+			options.selectionStart = start;
+			options.selectionEnd = end;
+			$textarea.textSelection( 'encapsulateSelection', options );
 
+			var text = $textarea.textSelection( 'getContents' ).replace( /\r\n/g, '\n' );
+
+			assert.equal( text, opt.after.text, 'Checking full text after encapsulation' );
+
+			if ( opt.after.selected !== null ) {
+				var selected = $textarea.textSelection( 'getSelection' );
+				assert.equal( selected, opt.after.selected, 'Checking selected text after encapsulation.' );
+			}
+
+		} );
+	}
+
+	var caretSample,
+		sig = {
+			pre: '--~~~~'
+		},
+		bold = {
+			pre: '\'\'\'',
+			peri: 'Bold text',
+			post: '\'\'\''
+		},
+		h2 = {
+			pre: '== ',
+			peri: 'Heading 2',
+			post: ' ==',
+			regex: /^(\s*)(={1,6})(.*?)\2(\s*)$/,
+			regexReplace: '$1==$3==$4',
+			ownline: true
+		},
+		ulist = {
+			pre: '* ',
+			peri: 'Bulleted list item',
+			post: '',
+			ownline: true,
+			splitlines: true
+		};
+
+	encapsulateTest( {
+		description: 'Adding sig to end of text',
+		before: {
+			text: 'Wikilove dude! ',
+			start: 15,
+			end: 15
+		},
+		after: {
+			text: 'Wikilove dude! --~~~~',
+			selected: ''
+		},
+		replace: sig
 	} );
-}
-
-var sig = {
-	'pre': "--~~~~"
-}, bold = {
-	pre: "'''",
-	peri: 'Bold text',
-	post: "'''"
-}, h2 = {
-	'pre': '== ',
-	'peri': 'Heading 2',
-	'post': ' ==',
-	'regex': /^(\s*)(={1,6})(.*?)\2(\s*)$/,
-	'regexReplace': "$1==$3==$4",
-	'ownline': true
-}, ulist = {
-	'pre': "* ",
-	'peri': 'Bulleted list item',
-	'post': "",
-	'ownline': true,
-	'splitlines': true
-};
-
-encapsulateTest({
-	description: "Adding sig to end of text",
-	before: {
-		text: "Wikilove dude! ",
-		start: 15,
-		end: 15
-	},
-	after: {
-		text: "Wikilove dude! --~~~~",
-		selected: ""
-	},
-	replace: sig
-});
-
-encapsulateTest({
-	description: "Adding bold to empty",
-	before: {
-		text: "",
-		start: 0,
-		end: 0
-	},
-	after: {
-		text: "'''Bold text'''",
-		selected: "Bold text" // selected because it's the default
-	},
-	replace: bold
-});
-
-encapsulateTest({
-	description: "Adding bold to existing text",
-	before: {
-		text: "Now is the time for all good men to come to the aid of their country",
-		start: 20,
-		end: 32
-	},
-	after: {
-		text: "Now is the time for '''all good men''' to come to the aid of their country",
-		selected: "" // empty because it's not the default'
-	},
-	replace: bold
-});
-
-encapsulateTest({
-	description: "ownline option: adding new h2",
-	before: {
-		text:"Before\nAfter",
-		start: 7,
-		end: 7
-	},
-	after: {
-		text: "Before\n== Heading 2 ==\nAfter",
-		selected: "Heading 2"
-	},
-	replace: h2
-});
-
-encapsulateTest({
-	description: "ownline option: turn a whole line into new h2",
-	before: {
-		text:"Before\nMy heading\nAfter",
-		start: 7,
-		end: 17
-	},
-	after: {
-		text: "Before\n== My heading ==\nAfter",
-		selected: ""
-	},
-	replace: h2
-});
-
-
-encapsulateTest({
-	description: "ownline option: turn a partial line into new h2",
-	before: {
-		text:"BeforeMy headingAfter",
-		start: 6,
-		end: 16
-	},
-	after: {
-		text: "Before\n== My heading ==\nAfter",
-		selected: ""
-	},
-	replace: h2
-});
-
-
-encapsulateTest({
-	description: "splitlines option: no selection, insert new list item",
-	before: {
-		text: "Before\nAfter",
-		start: 7,
-		end: 7
-	},
-	after: {
-		text: "Before\n* Bulleted list item\nAfter"
-	},
-	replace: ulist
-});
-
-encapsulateTest({
-	description: "splitlines option: single partial line selection, insert new list item",
-	before: {
-		text: "BeforeMy List ItemAfter",
-		start: 6,
-		end: 18
-	},
-	after: {
-		text: "Before\n* My List Item\nAfter"
-	},
-	replace: ulist
-});
-
-encapsulateTest({
-	description: "splitlines option: multiple lines",
-	before: {
-		text: "Before\nFirst\nSecond\nThird\nAfter",
-		start: 7,
-		end: 25
-	},
-	after: {
-		text: "Before\n* First\n* Second\n* Third\nAfter"
-	},
-	replace: ulist
-});
-
-
-function caretTest( options ) {
-	QUnit.test( options.description, 2, function ( assert ) {
-		var $textarea = $( '<textarea>' ).text( options.text );
-
-		$( '#qunit-fixture' ).append( $textarea );
-
-		if ( options.mode === 'set' ) {
-			$textarea.textSelection('setSelection', {
-				start: options.start,
-				end: options.end
-			});
-		}
-
-		function among( actual, expected, message ) {
-			if ( $.isArray( expected ) ) {
-				assert.ok( $.inArray( actual, expected ) !== -1 , message + ' (got ' + actual + '; expected one of ' + expected.join(', ') + ')' );
-			} else {
-				assert.equal( actual, expected, message );
+
+	encapsulateTest( {
+		description: 'Adding bold to empty',
+		before: {
+			text: '',
+			start: 0,
+			end: 0
+		},
+		after: {
+			text: '\'\'\'Bold text\'\'\'',
+			selected: 'Bold text' // selected because it's the default
+		},
+		replace: bold
+	} );
+
+	encapsulateTest( {
+		description: 'Adding bold to existing text',
+		before: {
+			text: 'Now is the time for all good men to come to the aid of their country',
+			start: 20,
+			end: 32
+		},
+		after: {
+			text: 'Now is the time for \'\'\'all good men\'\'\' to come to the aid of their country',
+			selected: '' // empty because it's not the default'
+		},
+		replace: bold
+	} );
+
+	encapsulateTest( {
+		description: 'ownline option: adding new h2',
+		before: {
+			text: 'Before\nAfter',
+			start: 7,
+			end: 7
+		},
+		after: {
+			text: 'Before\n== Heading 2 ==\nAfter',
+			selected: 'Heading 2'
+		},
+		replace: h2
+	} );
+
+	encapsulateTest( {
+		description: 'ownline option: turn a whole line into new h2',
+		before: {
+			text: 'Before\nMy heading\nAfter',
+			start: 7,
+			end: 17
+		},
+		after: {
+			text: 'Before\n== My heading ==\nAfter',
+			selected: ''
+		},
+		replace: h2
+	} );
+
+
+	encapsulateTest( {
+		description: 'ownline option: turn a partial line into new h2',
+		before: {
+			text: 'BeforeMy headingAfter',
+			start: 6,
+			end: 16
+		},
+		after: {
+			text: 'Before\n== My heading ==\nAfter',
+			selected: ''
+		},
+		replace: h2
+	} );
+
+
+	encapsulateTest( {
+		description: 'splitlines option: no selection, insert new list item',
+		before: {
+			text: 'Before\nAfter',
+			start: 7,
+			end: 7
+		},
+		after: {
+			text: 'Before\n* Bulleted list item\nAfter'
+		},
+		replace: ulist
+	} );
+
+	encapsulateTest( {
+		description: 'splitlines option: single partial line selection, insert new list item',
+		before: {
+			text: 'BeforeMy List ItemAfter',
+			start: 6,
+			end: 18
+		},
+		after: {
+			text: 'Before\n* My List Item\nAfter'
+		},
+		replace: ulist
+	} );
+
+	encapsulateTest( {
+		description: 'splitlines option: multiple lines',
+		before: {
+			text: 'Before\nFirst\nSecond\nThird\nAfter',
+			start: 7,
+			end: 25
+		},
+		after: {
+			text: 'Before\n* First\n* Second\n* Third\nAfter'
+		},
+		replace: ulist
+	} );
+
+
+	function caretTest( options ) {
+		QUnit.test( options.description, 2, function ( assert ) {
+			var pos, $textarea = $( '<textarea>' ).text( options.text );
+
+			$( '#qunit-fixture' ).append( $textarea );
+
+			if ( options.mode === 'set' ) {
+				$textarea.textSelection( 'setSelection', {
+					start: options.start,
+					end: options.end
+				} );
+			}
+
+			function among( actual, expected, message ) {
+				if ( $.isArray( expected ) ) {
+					assert.ok( $.inArray( actual, expected ) !== -1, message + ' (got ' + actual + '; expected one of ' + expected.join( ', ' ) + ')' );
+				} else {
+					assert.equal( actual, expected, message );
+				}
 			}
-		}
-
-		var pos = $textarea.textSelection('getCaretPosition', {startAndEnd: true});
-		among(pos[0], options.start, 'Caret start should be where we set it.');
-		among(pos[1], options.end, 'Caret end should be where we set it.');
-	});
-}
-
-var caretSample = "Some big text that we like to work with. Nothing fancy... you know what I mean?";
-
-/*
- // @broken: Disabled per bug 34820
-caretTest({
-	description: 'getCaretPosition with original/empty selection - bug 31847 with IE 6/7/8',
-	text: caretSample,
-	start: [0, caretSample.length], // Opera and Firefox (prior to FF 6.0) default caret to the end of the box (caretSample.length)
-	end: [0, caretSample.length], // Other browsers default it to the beginning (0), so check both.
-	mode: 'get'
-});
-*/
-
-caretTest({
-	description: 'set/getCaretPosition with forced empty selection',
-	text: caretSample,
-	start: 7,
-	end: 7,
-	mode: 'set'
-});
-
-caretTest({
-	description: 'set/getCaretPosition with small selection',
-	text: caretSample,
-	start: 6,
-	end: 11,
-	mode: 'set'
-});
 
+			pos = $textarea.textSelection( 'getCaretPosition', { startAndEnd: true } );
+			among( pos[0], options.start, 'Caret start should be where we set it.' );
+			among( pos[1], options.end, 'Caret end should be where we set it.' );
+		} );
+	}
+
+	caretSample = 'Some big text that we like to work with. Nothing fancy... you know what I mean?';
+
+	/*
+	 // @broken: Disabled per bug 34820
+	 caretTest({
+	 description: 'getCaretPosition with original/empty selection - bug 31847 with IE 6/7/8',
+	 text: caretSample,
+	 start: [0, caretSample.length], // Opera and Firefox (prior to FF 6.0) default caret to the end of the box (caretSample.length)
+	 end: [0, caretSample.length], // Other browsers default it to the beginning (0), so check both.
+	 mode: 'get'
+	 });
+	 */
+
+	caretTest( {
+		description: 'set/getCaretPosition with forced empty selection',
+		text: caretSample,
+		start: 7,
+		end: 7,
+		mode: 'set'
+	} );
+
+	caretTest( {
+		description: 'set/getCaretPosition with small selection',
+		text: caretSample,
+		start: 6,
+		end: 11,
+		mode: 'set'
+	} );
+}( jQuery ) );