Update to MediaWiki 1.22.5

2 files changed, 86 insertions, 0 deletions

diff --git a/extensions/Gadgets/.gitreview b/extensions/Gadgets/.gitreview
new file mode 100644
index 00000000..a1a8ead4
--- /dev/null
+++ b/extensions/Gadgets/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=mediawiki/extensions/Gadgets.git
+defaultbranch=master
diff --git a/extensions/Gadgets/tests/GadgetTest.php b/extensions/Gadgets/tests/GadgetTest.php
new file mode 100644
index 00000000..c9332a6c
--- /dev/null
+++ b/extensions/Gadgets/tests/GadgetTest.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * @group Gadgets
+ */
+
+class GadgetsTest extends MediaWikiTestCase {
+	private function create( $line ) {
+		$g = Gadget::newFromDefinition( $line );
+		// assertInstanceOf() is available since PHPUnit 3.5
+		$this->assertEquals( 'Gadget', get_class( $g ) );
+
+		return $g;
+	}
+
+	function testInvalidLines() {
+		$this->assertFalse( Gadget::newFromDefinition( '' ) );
+		$this->assertFalse( Gadget::newFromDefinition( '<foo|bar>' ) );
+	}
+
+	function testSimpleCases() {
+		$g = $this->create( '* foo bar| foo.css|foo.js|foo.bar' );
+		$this->assertEquals( 'foo_bar', $g->getName() );
+		$this->assertEquals( 'ext.gadget.foo_bar', $g->getModuleName() );
+		$this->assertEquals( array( 'Gadget-foo.js' ), $g->getScripts() );
+		$this->assertEquals( array( 'Gadget-foo.css' ), $g->getStyles() );
+		$this->assertEquals( array( 'Gadget-foo.js', 'Gadget-foo.css' ),
+			$g->getScriptsAndStyles() );
+		$this->assertEquals( array( 'Gadget-foo.js' ), $g->getLegacyScripts() );
+		$this->assertFalse( $g->supportsResourceLoader() );
+		$this->assertTrue( $g->hasModule() );
+	}
+
+	function testRLtag() {
+		$g = $this->create( '*foo [ResourceLoader]|foo.js|foo.css' );
+		$this->assertEquals( 'foo', $g->getName() );
+		$this->assertTrue( $g->supportsResourceLoader() );
+		$this->assertEquals( 0, count( $g->getLegacyScripts() ) );
+	}
+
+	function testDependencies() {
+		$g = $this->create( '* foo[ResourceLoader|dependencies=jquery.ui]|bar.js' );
+		$this->assertEquals( array( 'Gadget-bar.js' ), $g->getScripts() );
+		$this->assertTrue( $g->supportsResourceLoader() );
+		$this->assertEquals( array( 'jquery.ui' ), $g->getDependencies() );
+	}
+
+	function testPreferences() {
+		global $wgUser, $wgOut, $wgTitle;
+
+		// This test makes call to the parser which requires valids Outputpage
+		// and Title objects. Set them up there, they will be released at the
+		// end of the test.
+		$old_wgOut = $wgOut;
+		$old_wgTitle = $wgTitle;
+		$wgTitle = Title::newFromText( 'Parser test for Gadgets extension' );
+
+		// Proceed with test setup:
+		$prefs = array();
+		$context = new RequestContext();
+		$wgOut = $context->getOutput();
+		$wgOut->setTitle( Title::newFromText( 'test' ) );
+
+		Gadget::loadStructuredList( '* foo | foo.js
+==keep-section1==
+* bar| bar.js
+==remove-section==
+* baz [rights=embezzle] |baz.js
+==keep-section2==
+* quux [rights=read] | quux.js' );
+		$this->assertTrue( GadgetHooks::getPreferences( $wgUser, $prefs ), 'GetPrefences hook should return true' );
+
+		$options = $prefs['gadgets']['options'];
+		$this->assertFalse( isset( $options['&lt;gadget-section-remove-section&gt;'] ), 'Must not show empty sections' );
+		$this->assertTrue( isset( $options['&lt;gadget-section-keep-section1&gt;'] ) );
+		$this->assertTrue( isset( $options['&lt;gadget-section-keep-section2&gt;'] ) );
+
+		// Restore globals
+		$wgOut = $old_wgOut;
+		$wgTitle = $old_wgTitle;
+	}
+}