Merge "AMC features should default to true in desktop"

includes/SkinOptions.php

@@ -55,10 +55,14 @@ final class SkinOptions {
 		self::SHARE_BUTTON => false,
 		/** Whether sections can be collapsed (requires MobileFrontend and MobileFormatter) */
 		self::TOGGLING => false,
+		/** requires a wiki using Template:Ambox */
 		self::PAGE_ISSUES => false,
-		self::TALK_AT_TOP => false,
-		self::HISTORY_IN_PAGE_ACTIONS => false,
-		self::TOOLBAR_SUBMENU => false,
+		/** no extension requirements */
+		self::TALK_AT_TOP => true,
+		/** no extension requirements */
+		self::HISTORY_IN_PAGE_ACTIONS => true,
+		/** no extension requirements */
+		self::TOOLBAR_SUBMENU => true,
 		/** Whether to show tabs on special pages */
 		self::TABS_ON_SPECIALS => false,
 	];

tests/phpunit/skins/SkinMinervaTest.php

@@ -144,6 +144,9 @@ class SkinMinervaTest extends MediaWikiTestCase {
 	public function testGetContextSpecificModules( $backToTopValue, $moduleName, $expected ) {
 		$this->overrideSkinOptions( [
 			SkinOptions::AMC_MODE => false,
+			SkinOptions::TALK_AT_TOP => false,
+			SkinOptions::HISTORY_IN_PAGE_ACTIONS => false,
+			SkinOptions::TOOLBAR_SUBMENU => false,
 			'backToTop' => $backToTopValue,
 		] );
 

tests/phpunit/unit/SkinOptionsTest.php

@@ -41,6 +41,9 @@ class SkinOptionsTest extends \MediaWikiUnitTestCase {
 		$options->setMultiple( [ SkinOptions::BACK_TO_TOP => true ] );
 		$this->assertTrue( $options->hasSkinOptions() );
 		$options->setMultiple( [
+			SkinOptions::TALK_AT_TOP => false,
+			SkinOptions::HISTORY_IN_PAGE_ACTIONS => false,
+			SkinOptions::TOOLBAR_SUBMENU => false,
 			SkinOptions::AMC_MODE => false,
 			SkinOptions::BACK_TO_TOP => false
 		] );