Append subtitle but hide MW's subpages, refs 46 (#49)

SemanticMediaWiki · Sep 15, 2018 · 9366d22 · 9366d22
1 parent 9ea3f5f
commit 9366d22
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 37 deletions.
diff --git a/res/sbl.styles.css b/res/sbl.styles.css
@@ -85,6 +85,10 @@
 	margin: 0.9em 0 1.4em -1em;
 }
 
+#contentSub span.subpages {
+	display: none;
+}
+
 /* SBL chameleon */
 .skin-chameleon .sbl-breadcrumb-children-list {
     margin: .1em 0 0 -1.5em;

diff --git a/src/SkinTemplateOutputModifier.php b/src/SkinTemplateOutputModifier.php
@@ -62,7 +62,7 @@ public function modify( OutputPage $output, &$template ) {
 
 		// We always assume `subtitle` is available!
 		// https://github.com/wikimedia/mediawiki/blob/23ea2e4c2966f381eb7fd69b66a8d738bb24cc60/includes/skins/SkinTemplate.php#L292-L296
-		$template->data['subtitle'] = $this->htmlBreadcrumbLinksBuilder->getHtml();
+		$template->data['subtitle'] .= $this->htmlBreadcrumbLinksBuilder->getHtml();
 	}
 
 	private function canModifyOutput( OutputPage $output ) {

diff --git a/tests/phpunit/Unit/SkinTemplateOutputModifierTest.php b/tests/phpunit/Unit/SkinTemplateOutputModifierTest.php
@@ -100,9 +100,6 @@ public function testTryPrependHtmlOnSpecialPage() {
 			->disableOriginalConstructor()
 			->getMock();
 
-		$output->expects( $this->never() )
-			->method( 'prependHTML' );
-
 		$output->expects( $this->atLeastOnce() )
 			->method( 'getTitle' )
 			->will( $this->returnValue( $title ) );
@@ -120,10 +117,6 @@ public function testTryPrependHtmlOnSpecialPage() {
 
 	public function PrependHtmlOnNonViewAction() {
 
-		$context = new \RequestContext();
-		$context->setRequest( new \FauxRequest( [ 'action' => 'edit' ], true ) );
-		$context->setTitle( Title::newFromText( __METHOD__ ) );
-
 		$htmlBreadcrumbLinksBuilder = $this->getMockBuilder( '\SBL\HtmlBreadcrumbLinksBuilder' )
 			->disableOriginalConstructor()
 			->getMock();
@@ -148,13 +141,6 @@ public function PrependHtmlOnNonViewAction() {
 			->disableOriginalConstructor()
 			->getMock();
 
-		$output->expects( $this->never() )
-			->method( 'prependHTML' );
-
-		$output->expects( $this->once() )
-			->method( 'getContext' )
-			->will( $this->returnValue( $context ) );
-
 		$output->expects( $this->atLeastOnce() )
 			->method( 'getTitle' )
 			->will( $this->returnValue( $title ) );
@@ -172,9 +158,6 @@ public function PrependHtmlOnNonViewAction() {
 
 	public function testTryPrependHtmlOnNOBREADCRUMBLINKS() {
 
-		$context = new \RequestContext();
-		$context->setRequest( new \FauxRequest( [ 'action' => 'view'  ], true ) );
-
 		$htmlBreadcrumbLinksBuilder = $this->getMockBuilder( '\SBL\HtmlBreadcrumbLinksBuilder' )
 			->disableOriginalConstructor()
 			->getMock();
@@ -199,13 +182,6 @@ public function testTryPrependHtmlOnNOBREADCRUMBLINKS() {
 			->disableOriginalConstructor()
 			->getMock();
 
-		$output->expects( $this->never() )
-			->method( 'prependHTML' );
-
-		$output->expects( $this->any() )
-			->method( 'getContext' )
-			->will( $this->returnValue( $context ) );
-
 		$output->expects( $this->atLeastOnce() )
 			->method( 'getTitle' )
 			->will( $this->returnValue( $title ) );
@@ -223,10 +199,11 @@ public function testTryPrependHtmlOnNOBREADCRUMBLINKS() {
 		$instance->modify( $output, $template );
 	}
 
-	public function tesPrependHtmlForViewActionOnly() {
+	public function testAppendHtml() {
 
-		$context = new \RequestContext();
-		$context->setRequest( new \FauxRequest( [ 'action' => 'view'  ], true ) );
+		$this->namespaceExaminer->expects( $this->once() )
+			->method( 'isSemanticEnabled' )
+			->will( $this->returnValue( true ) );
 
 		$htmlBreadcrumbLinksBuilder = $this->getMockBuilder( '\SBL\HtmlBreadcrumbLinksBuilder' )
 			->disableOriginalConstructor()
@@ -236,6 +213,10 @@ public function tesPrependHtmlForViewActionOnly() {
 			->method( 'buildBreadcrumbs' )
 			->will( $this->returnSelf() );
 
+		$htmlBreadcrumbLinksBuilder->expects( $this->once() )
+			->method( 'getHtml' )
+			->will( $this->returnValue( 'bar' ) );
+
 		$language = $this->getMockBuilder( '\Language' )
 			->disableOriginalConstructor()
 			->getMock();
@@ -264,13 +245,6 @@ public function tesPrependHtmlForViewActionOnly() {
 			->disableOriginalConstructor()
 			->getMock();
 
-		$output->expects( $this->once() )
-			->method( 'prependHTML' );
-
-		$output->expects( $this->once() )
-			->method( 'getContext' )
-			->will( $this->returnValue( $context ) );
-
 		$output->expects( $this->atLeastOnce() )
 			->method( 'getTitle' )
 			->will( $this->returnValue( $title ) );
@@ -281,11 +255,15 @@ public function tesPrependHtmlForViewActionOnly() {
 		);
 
 		$template = new \stdClass;
-		$template->data = [];
+
+		$template->data = [
+			'subtitle' => 'Foo'
+		];
 
 		$instance->modify( $output, $template );
 
-		$this->assertEmpty(
+		$this->assertEquals(
+			'Foobar',
 			$template->data['subtitle']
 		);
 	}