fix tests

wp-media · Dec 9, 2024 · 02a6057 · 02a6057
1 parent 3585537
commit 02a6057
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/...Media/Fonts/Context/Context/isAllowed.php → ...Context/OptimizationContext/isAllowed.php b/...Media/Fonts/Context/Context/isAllowed.php → ...Context/OptimizationContext/isAllowed.php
diff --git a/...onts/Frontend/Controller/rewriteFonts.php → ...ntroller/rewriteFontsForOptimizations.php b/...onts/Frontend/Controller/rewriteFonts.php → ...ntroller/rewriteFontsForOptimizations.php
diff --git a/...onts/Frontend/Subscriber/rewriteFonts.php → ...bscriber/rewriteFontsForOptimizations.php b/...onts/Frontend/Subscriber/rewriteFonts.php → ...bscriber/rewriteFontsForOptimizations.php
diff --git a/tests/Unit/inc/Engine/Media/Fonts/Context/Context/isAllowed.php b/tests/Unit/inc/Engine/Media/Fonts/Context/Context/isAllowed.php
@@ -6,7 +6,7 @@
 use Brain\Monkey\Functions;
 use Mockery;
 use WP_Rocket\Admin\Options_Data;
-use WP_Rocket\Engine\Media\Fonts\Context\Context;
+use WP_Rocket\Engine\Media\Fonts\Context\OptimizationContext;
 use WP_Rocket\Tests\Unit\TestCase;
 
 /**
@@ -20,7 +20,7 @@ public function testShouldDoExpected( $config, $expected ) {
 		$this->donotrocketoptimize = $config['do_not_optimize'];
 
 		$options = Mockery::mock( Options_Data::class );
-		$context = new Context( $options );
+		$context = new OptimizationContext( $options );
 
 		Functions\when( 'rocket_bypass' )->justReturn( $config['bypass'] );
 

diff --git a/...onts/Frontend/Controller/rewriteFonts.php → ...ntroller/rewriteFontsForOptimizations.php b/...onts/Frontend/Controller/rewriteFonts.php → ...ntroller/rewriteFontsForOptimizations.php
@@ -5,18 +5,20 @@
 
 use Brain\Monkey\Functions;
 use Mockery;
+use WP_Rocket\Engine\Media\Fonts\Context\OptimizationContext;
+use WP_Rocket\Engine\Media\Fonts\Context\SaasContext;
 use WP_Rocket\Engine\Media\Fonts\Filesystem as FontsFilesystem;
 use WP_Rocket\Engine\Media\Fonts\Frontend\Controller;
-use WP_Rocket\Engine\Media\Fonts\Context\Context;
 use WP_Rocket\Tests\Unit\FilesystemTestCase;
 
 /**
  * @group HostFontsLocally
  */
-class Test_RewriteFonts extends FilesystemTestCase {
-	protected $path_to_test_data = '/inc/Engine/Media/Fonts/Frontend/Controller/rewriteFonts.php';
+class Test_RewriteFontsForOptimizations extends FilesystemTestCase {
+	protected $path_to_test_data = '/inc/Engine/Media/Fonts/Frontend/Controller/rewriteFontsForOptimizations.php';
 
-	private $context;
+	private $optimization_context;
+	private $saas_context;
 	private $controller;
 	private $fonts_filesystem;
 
@@ -25,9 +27,10 @@ public function set_up() {
 
 		Functions\when( 'get_current_blog_id' )->justReturn( 1 );
 
-		$this->context          = Mockery::mock( Context::class );
-		$this->fonts_filesystem = Mockery::mock( FontsFilesystem::class );
-		$this->controller       = new Controller( $this->context, $this->fonts_filesystem );
+		$this->optimization_context = Mockery::mock( OptimizationContext::class );
+		$this->saas_context         = Mockery::mock( SaasContext::class );
+		$this->fonts_filesystem     = Mockery::mock( FontsFilesystem::class );
+		$this->controller           = new Controller( $this->optimization_context, $this->saas_context, $this->fonts_filesystem );
 
 		$this->stubWpParseUrl();
 	}
@@ -36,7 +39,7 @@ public function set_up() {
 	 * @dataProvider providerTestData
 	 */
 	public function testShouldDoExpected( $config, $original, $expected ) {
-		$this->context->shouldReceive('is_allowed')
+		$this->optimization_context->shouldReceive('is_allowed')
 			->once()
 			->andReturn( $config['is_allowed'] );
 
@@ -60,7 +63,7 @@ public function testShouldDoExpected( $config, $original, $expected ) {
 
 		$this->assertSame(
 			$this->format_the_html( $expected ),
-			$this->format_the_html( $this->controller->rewrite_fonts( $original ) )
+			$this->format_the_html( $this->controller->rewrite_fonts_for_optimizations( $original ) )
 		);
 	}
 }