fix unit tests

Author: oetterer

.github/workflows/ci.yml

@@ -16,26 +16,34 @@ jobs:
           - mw: 'REL1_35'
             php: 7.4
             type: normal
+            experimental: false
           - mw: 'REL1_37'
             php: 7.4
             type: normal
+            experimental: false
           - mw: 'REL1_38'
             php: 7.4
             type: normal
+            experimental: false
           - mw: 'REL1_39'
             php: 7.4
             type: coverage
+            experimental: false
           - mw: 'REL1_39'
             php: 8.1
             type: normal
+            experimental: false
           - mw: 'master'
             php: 7.4
             type: normal
+            experimental: true
           - mw: 'master'
             php: 8.1
             type: normal
+            experimental: true
 
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
 
     defaults:
       run:

tests/autoloader.php

@@ -19,10 +19,10 @@
 		? getenv( 'MW_INSTALL_PATH' )
 		: __DIR__ . '/../../..';
 
-if ( is_readable( $path = __DIR__ . '/../vendor/autoload.php' ) ) {
-	$autoloadType = "Extension vendor autoloader";
-} elseif ( is_readable( $path = $basePath . '/vendor/autoload.php' ) ) {
+if ( is_readable( $path = $basePath . '/vendor/autoload.php' ) ) {
 	$autoloadType = "MediaWiki vendor autoloader";
+} elseif ( is_readable( $path = __DIR__ . '/../vendor/autoload.php' ) ) {
+	$autoloadType = "Extension vendor autoloader";
 } else {
 	die( 'To run the test suite it is required that packages are installed using Composer.' );
 }
@@ -36,11 +36,12 @@
 /**
  * getting the autoloader and registering test classes
  */
+/** @var \Composer\Autoload\ClassLoader $autoloader */
 $autoloader = require $path;
 
-$autoloader->addPsr4( 'BootstrapComponents\\Tests\\Unit\\', __DIR__ . '/phpunit/Unit' );
-$autoloader->addPsr4( 'BootstrapComponents\\Tests\\Integration\\',
-	__DIR__ . '/phpunit/Integration' );
-
+#$autoloader->addPsr4( 'BootstrapComponents\\Tests\\Unit\\', __DIR__ . '/phpunit/Unit' );
+#$autoloader->addPsr4( 'BootstrapComponents\\Tests\\Integration\\', __DIR__ . '/phpunit/Integration' );
+$autoloader->addPsr4( 'BootstrapComponents\\Tests\\', __DIR__ . '/phpunit' );
+@include_once __DIR__ . '/phpunit/Unit/ComponentsTestBase.php';
 
 return $autoloader;

tests/phpunit/Unit/HookRegistryTest.php

@@ -321,19 +321,20 @@ public function testHookOutputPageParserOutput() {
 				$this->stringContains( 'bsc_deferredContent' )
 			)
 			->willReturnOnConsecutiveCalls( [], [ 'call2' ] );
-		$parserOutput->expects( $this->exactly( 2 ) )
-			->method( 'getText' )
-			->will( $this->returnCallback( function() use ( &$content ) {
-				return $content;
-			} ) );
-		$parserOutput->expects( $this->exactly( 2 ) )
-			->method( 'setText' )
-			->will( $this->returnCallback( function( $injection ) use ( &$content ) {
-				$content = $injection;
-			} ) );
 		$outputPage = $this->getMockBuilder( 'OutputPage' )
 			->disableOriginalConstructor()
 			->getMock();
+		$outputPage->expects( $this->once() )
+			->method( 'addHTML' )
+			->will( $this->returnCallback( function( $injection ) use ( &$content ) {
+				$content .= $injection;
+			} ) );
+		$outputPage->expects( $this->exactly( 2 ) )
+			->method( 'addModules' )
+			->with(
+				$this->equalTo( [ 'ext.bootstrapComponents.vector-fix' ] )
+			);
+
 
 		/** @noinspection PhpParamsInspection */
 		$parserOutputHelper = new ParserOutputHelper( $parser );

tests/phpunit/Unit/Hooks/OutputPageParserOutputTest.php

@@ -51,21 +51,20 @@ public function testHookOutputPageParserOutput() {
 		$outputPage = $this->getMockBuilder( 'OutputPage' )
 			->disableOriginalConstructor()
 			->getMock();
+		$outputPage->expects( $this->once() )
+			->method( 'addHTML' )
+			->will( $this->returnCallback( function( $injection ) use ( &$content ) {
+				$content .= $injection;
+			} ) );
+		$outputPage->expects( $this->once() )
+			->method( 'addModules' )
+			->with(
+				$this->equalTo( [ 'ext.bootstrapComponents.vector-fix' ] )
+			);
 
 		$observerParserOutput = $this->getMockBuilder(ParserOutput::class )
 			->disableOriginalConstructor()
-#			->setMethods( [ 'getText', 'setText', 'getExtensionData' ] )
 			->getMock();
-		$observerParserOutput->expects( $this->exactly( 1 ) )
-			->method( 'getText' )
-			->will( $this->returnCallback( function() use ( &$content ) {
-				return $content;
-			} ) );
-		$observerParserOutput->expects( $this->exactly( 1 ) )
-			->method( 'setText' )
-			->will( $this->returnCallback( function( $injection ) use ( &$content ) {
-				$content = $injection;
-			} ) );
 		$observerParserOutput->expects( $this->exactly( 1 ) )
 			->method( 'getExtensionData' )
 			->with(

tests/phpunit/Unit/ParserOutputHelperTest.php

@@ -150,8 +150,6 @@ public function testCanLoadBootstrapModules() {
 		$parserOutput->expects( $this->once() )
 			->method( 'setExtensionData' )
 			->with( $this->equalTo( 'bsc_load_modules' ), $this->equalTo( true ) );
-		$parserOutput->expects( $this->once() )
-			->method( 'addModules' );
 		$parser = $this->getMockBuilder( 'Parser' )
 			->disableOriginalConstructor()
 			->getMock();