From 02a6057f259a1d81a1a38b9947fa9d0e450e3fe7 Mon Sep 17 00:00:00 2001 From: WordPressFan Date: Tue, 10 Dec 2024 01:19:52 +0200 Subject: [PATCH] fix tests --- .../isAllowed.php | 0 ...s.php => rewriteFontsForOptimizations.php} | 0 ...s.php => rewriteFontsForOptimizations.php} | 0 .../Media/Fonts/Context/Context/isAllowed.php | 4 ++-- ...s.php => rewriteFontsForOptimizations.php} | 21 +++++++++++-------- 5 files changed, 14 insertions(+), 11 deletions(-) rename tests/Fixtures/inc/Engine/Media/Fonts/Context/{Context => OptimizationContext}/isAllowed.php (100%) rename tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/{rewriteFonts.php => rewriteFontsForOptimizations.php} (100%) rename tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Subscriber/{rewriteFonts.php => rewriteFontsForOptimizations.php} (100%) rename tests/Unit/inc/Engine/Media/Fonts/Frontend/Controller/{rewriteFonts.php => rewriteFontsForOptimizations.php} (63%) diff --git a/tests/Fixtures/inc/Engine/Media/Fonts/Context/Context/isAllowed.php b/tests/Fixtures/inc/Engine/Media/Fonts/Context/OptimizationContext/isAllowed.php similarity index 100% rename from tests/Fixtures/inc/Engine/Media/Fonts/Context/Context/isAllowed.php rename to tests/Fixtures/inc/Engine/Media/Fonts/Context/OptimizationContext/isAllowed.php diff --git a/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/rewriteFonts.php b/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/rewriteFontsForOptimizations.php similarity index 100% rename from tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/rewriteFonts.php rename to tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/rewriteFontsForOptimizations.php diff --git a/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Subscriber/rewriteFonts.php b/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Subscriber/rewriteFontsForOptimizations.php similarity index 100% rename from tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Subscriber/rewriteFonts.php rename to tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Subscriber/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 index abbbb5bd40..201412162a 100644 --- 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/tests/Unit/inc/Engine/Media/Fonts/Frontend/Controller/rewriteFonts.php b/tests/Unit/inc/Engine/Media/Fonts/Frontend/Controller/rewriteFontsForOptimizations.php similarity index 63% rename from tests/Unit/inc/Engine/Media/Fonts/Frontend/Controller/rewriteFonts.php rename to tests/Unit/inc/Engine/Media/Fonts/Frontend/Controller/rewriteFontsForOptimizations.php index 126d53660f..5c5945e624 100644 --- a/tests/Unit/inc/Engine/Media/Fonts/Frontend/Controller/rewriteFonts.php +++ b/tests/Unit/inc/Engine/Media/Fonts/Frontend/Controller/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 ) ) ); } }