From dc07f3e2730918a3ae3a1a2a036b4f362da11a99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Robin?= <robin.gael@gmail.com>
Date: Thu, 14 Nov 2024 08:57:12 +0100
Subject: [PATCH] Closes #7104: Duplicated tag added to page (#7105)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Rémy Perona <remperona@gmail.com>
---
 inc/Engine/Media/Fonts/Context/Context.php    |  27 ++++
 .../Media/Fonts/Frontend/Controller.php       | 128 ++++++++++++++++
 .../Media/Fonts/Frontend/Subscriber.php       |  57 ++++++++
 inc/Engine/Media/Fonts/ServiceProvider.php    |  19 +++
 .../GoogleFonts/AbstractGFOptimization.php    |  14 ++
 .../Optimization/GoogleFonts/Subscriber.php   |   2 +-
 inc/Plugin.php                                |   1 +
 .../Media/Fonts/Context/Context/isAllowed.php |  36 +++++
 .../Frontend/Controller/HTML/expected_v1.php  |  33 +++++
 .../Controller/HTML/expected_v1_v2.php        |  41 ++++++
 .../Frontend/Controller/HTML/expected_v2.php  |  33 +++++
 .../Frontend/Controller/HTML/input_v1.php     |  33 +++++
 .../Frontend/Controller/HTML/input_v1_v2.php  |  41 ++++++
 .../Frontend/Controller/HTML/input_v2.php     |  33 +++++
 .../Frontend/Controller/rewriteFonts.php      |  41 ++++++
 .../GoogleFonts/Combine/optimize.php          | 137 ++++++++++++++----
 .../GoogleFonts/CombineV1V2/optimize.php      |  37 ++++-
 .../GoogleFonts/CombineV2/optimize.php        | 104 +++++++++----
 .../GoogleFonts/Combine/optimize.php          |  41 ++++--
 tests/Unit/bootstrap.php                      |   2 +-
 .../Media/Fonts/Context/Context/isAllowed.php |  36 +++++
 .../Frontend/Controller/rewriteFonts.php      |  44 ++++++
 .../GoogleFonts/Combine/optimize.php          |  26 ++--
 .../GoogleFonts/CombineV2/optimize.php        |  26 ++--
 24 files changed, 883 insertions(+), 109 deletions(-)
 create mode 100644 inc/Engine/Media/Fonts/Context/Context.php
 create mode 100644 inc/Engine/Media/Fonts/Frontend/Controller.php
 create mode 100644 inc/Engine/Media/Fonts/Frontend/Subscriber.php
 create mode 100644 tests/Fixtures/inc/Engine/Media/Fonts/Context/Context/isAllowed.php
 create mode 100644 tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/HTML/expected_v1.php
 create mode 100644 tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/HTML/expected_v1_v2.php
 create mode 100644 tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/HTML/expected_v2.php
 create mode 100644 tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/HTML/input_v1.php
 create mode 100644 tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/HTML/input_v1_v2.php
 create mode 100644 tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/HTML/input_v2.php
 create mode 100644 tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/rewriteFonts.php
 create mode 100644 tests/Unit/inc/Engine/Media/Fonts/Context/Context/isAllowed.php
 create mode 100644 tests/Unit/inc/Engine/Media/Fonts/Frontend/Controller/rewriteFonts.php

diff --git a/inc/Engine/Media/Fonts/Context/Context.php b/inc/Engine/Media/Fonts/Context/Context.php
new file mode 100644
index 0000000000..82673b4611
--- /dev/null
+++ b/inc/Engine/Media/Fonts/Context/Context.php
@@ -0,0 +1,27 @@
+<?php
+declare(strict_types=1);
+
+namespace WP_Rocket\Engine\Media\Fonts\Context;
+
+use WP_Rocket\Engine\Common\Context\AbstractContext;
+
+class Context extends AbstractContext {
+	/**
+	 * Checks if the feature is allowed.
+	 *
+	 * @param array $data Optional. Data to check against.
+	 *
+	 * @return bool
+	 */
+	public function is_allowed( array $data = [] ): bool {
+		$is_allowed = $this->run_common_checks(
+			[
+				'do_not_optimize' => false,
+				'bypass'          => false,
+				'option'          => 'host_fonts_locally',
+			]
+		);
+
+		return $is_allowed;
+	}
+}
diff --git a/inc/Engine/Media/Fonts/Frontend/Controller.php b/inc/Engine/Media/Fonts/Frontend/Controller.php
new file mode 100644
index 0000000000..82bdc47644
--- /dev/null
+++ b/inc/Engine/Media/Fonts/Frontend/Controller.php
@@ -0,0 +1,128 @@
+<?php
+declare(strict_types=1);
+
+namespace WP_Rocket\Engine\Media\Fonts\Frontend;
+
+use WP_Rocket\Engine\Media\Fonts\Context\Context;
+use WP_Rocket\Engine\Optimization\RegexTrait;
+use WP_Rocket\Logger\Logger;
+
+class Controller {
+	use RegexTrait;
+
+	/**
+	 * Context instance.
+	 *
+	 * @var Context
+	 */
+	private $context;
+
+	/**
+	 * Base url.
+	 *
+	 * @var string
+	 */
+	private $base_url;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param Context $context Context instance.
+	 */
+	public function __construct( Context $context ) {
+		$this->context  = $context;
+		$this->base_url = rocket_get_constant( 'WP_ROCKET_CACHE_ROOT_URL', '' ) . 'fonts/' . get_current_blog_id() . '/';
+	}
+
+	/**
+	 * Rewrites the Google Fonts paths to local ones.
+	 *
+	 * @param string $html HTML content.
+	 * @return string
+	 */
+	public function rewrite_fonts( string $html ): string {
+		if ( ! $this->context->is_allowed() ) {
+			return $html;
+		}
+
+		$html_nocomments = $this->hide_comments( $html );
+
+		$v1_fonts = $this->find( '<link(?:\s+(?:(?!href\s*=\s*)[^>])+)?(?:\s+href\s*=\s*([\'"])(?<url>(?:https?:)?\/\/fonts\.googleapis\.com\/css[^\d](?:(?!\1).)+)\1)(?:\s+[^>]*)?>', $html_nocomments );
+		$v2_fonts = $this->find( '<link(?:\s+(?:(?!href\s*=\s*)[^>])+)?(?:\s+href\s*=\s*([\'"])(?<url>(?:https?:)?\/\/fonts\.googleapis\.com\/css2(?:(?!\1).)+)\1)(?:\s+[^>]*)?>', $html_nocomments );
+
+		if ( ! $v1_fonts && ! $v2_fonts ) {
+			Logger::debug( 'No Google Fonts found.', [ 'Host Fonts Locally' ] );
+			return $html;
+		}
+
+		foreach ( $v1_fonts as $font ) {
+			$html = $this->replace_font( $font, $html );
+		}
+
+		foreach ( $v2_fonts as $font ) {
+			$html = $this->replace_font( $font, $html );
+		}
+
+		return $html;
+	}
+
+	/**
+	 * Replaces the Google Fonts URL with the local one.
+	 *
+	 * @param array  $font Font data.
+	 * @param string $html HTML content.
+	 *
+	 * @return string
+	 */
+	private function replace_font( $font, $html ): string {
+		$hash  = md5( $font['url'] );
+		$local = $this->get_optimized_markup( $hash, $font['url'] );
+
+		return str_replace( $font[0], $local, $html );
+	}
+
+	/**
+	 * Returns the optimized markup for Google Fonts
+	 *
+	 * @since 3.18
+	 *
+	 * @param string $hash Font Url has.
+	 * @param string $original_url Fonts Url.
+	 *
+	 * @return string
+	 */
+	protected function get_optimized_markup( string $hash, string $original_url ): string {
+		$levels = 3;
+		$base   = substr( $hash, 0, $levels );
+		$remain = substr( $hash, $levels );
+
+		$path_array   = str_split( $base );
+		$path_array[] = $remain;
+
+		$path = implode( '/', $path_array );
+		$url  = $this->base_url . $path . '.css';
+
+		$gf_parameters = wp_parse_url( $original_url, PHP_URL_QUERY );
+
+		return sprintf(
+			'<link rel="stylesheet" href="%1$s" data-wpr-hosted-gf-parameters="%2$s"/>', // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
+			$url,
+			$gf_parameters
+		);
+	}
+
+	/**
+	 * Disables the preload of Google Fonts.
+	 *
+	 * @param bool $disable Whether to disable the preload of Google Fonts.
+	 *
+	 * @return bool
+	 */
+	public function disable_google_fonts_preload( $disable ): bool {
+		if ( ! $this->context->is_allowed() ) {
+			return $disable;
+		}
+
+		return true;
+	}
+}
diff --git a/inc/Engine/Media/Fonts/Frontend/Subscriber.php b/inc/Engine/Media/Fonts/Frontend/Subscriber.php
new file mode 100644
index 0000000000..61c437b25e
--- /dev/null
+++ b/inc/Engine/Media/Fonts/Frontend/Subscriber.php
@@ -0,0 +1,57 @@
+<?php
+declare(strict_types=1);
+
+namespace WP_Rocket\Engine\Media\Fonts\Frontend;
+
+use WP_Rocket\Event_Management\Subscriber_Interface;
+
+class Subscriber implements Subscriber_Interface {
+	/**
+	 * Frontend Controller instance.
+	 *
+	 * @var Controller
+	 */
+	private $frontend_controller;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param Controller $frontend_controller Frontend Controller instance.
+	 */
+	public function __construct( Controller $frontend_controller ) {
+		$this->frontend_controller = $frontend_controller;
+	}
+
+	/**
+	 * Returns an array of events that this subscriber wants to listen to.
+	 *
+	 * @return array
+	 */
+	public static function get_subscribed_events(): array {
+		return [
+			'rocket_buffer'                       => [ 'rewrite_fonts', 18 ],
+			'rocket_disable_google_fonts_preload' => 'disable_google_fonts_preload',
+		];
+	}
+
+	/**
+	 * Rewrites the Google Fonts paths to local ones.
+	 *
+	 * @param string $html HTML content.
+	 * @return string
+	 */
+	public function rewrite_fonts( string $html ): string {
+		return $this->frontend_controller->rewrite_fonts( $html );
+	}
+
+	/**
+	 * Disables the preload of Google Fonts.
+	 *
+	 * @param bool $disable Whether to disable the preload of Google Fonts.
+	 *
+	 * @return bool
+	 */
+	public function disable_google_fonts_preload( $disable ): bool {
+		return $this->frontend_controller->disable_google_fonts_preload( $disable );
+	}
+}
diff --git a/inc/Engine/Media/Fonts/ServiceProvider.php b/inc/Engine/Media/Fonts/ServiceProvider.php
index 8c68d550f0..746ddf61f9 100644
--- a/inc/Engine/Media/Fonts/ServiceProvider.php
+++ b/inc/Engine/Media/Fonts/ServiceProvider.php
@@ -6,6 +6,9 @@
 use WP_Rocket\Dependencies\League\Container\ServiceProvider\AbstractServiceProvider;
 use WP_Rocket\Engine\Media\Fonts\Admin\Settings;
 use WP_Rocket\Engine\Media\Fonts\Admin\Subscriber as AdminSubscriber;
+use WP_Rocket\Engine\Media\Fonts\Context\Context;
+use WP_Rocket\Engine\Media\Fonts\Frontend\Controller as FrontendController;
+use WP_Rocket\Engine\Media\Fonts\Frontend\Subscriber as FrontendSubscriber;
 
 class ServiceProvider extends AbstractServiceProvider {
 	/**
@@ -20,6 +23,9 @@ class ServiceProvider extends AbstractServiceProvider {
 	protected $provides = [
 		'media_fonts_settings',
 		'media_fonts_admin_subscriber',
+		'media_fonts_context',
+		'media_fonts_frontend_controller',
+		'media_fonts_frontend_subscriber',
 	];
 
 	/**
@@ -42,5 +48,18 @@ public function register(): void {
 		$this->getContainer()->add( 'media_fonts_settings', Settings::class );
 		$this->getContainer()->addShared( 'media_fonts_admin_subscriber', AdminSubscriber::class )
 			->addArgument( 'media_fonts_settings' );
+
+		$this->getContainer()->add( 'media_fonts_context', Context::class )
+			->addArgument( $this->getContainer()->get( 'options' ) );
+		$this->getContainer()->add( 'media_fonts_frontend_controller', FrontendController::class )
+			->addArguments(
+				[
+					$this->getContainer()->get( 'media_fonts_context' ),
+				]
+			);
+		$this->getContainer()->add( 'media_fonts_frontend_subscriber', FrontendSubscriber::class )
+			->addArgument(
+				$this->getContainer()->get( 'media_fonts_frontend_controller' )
+			);
 	}
 }
diff --git a/inc/Engine/Optimization/GoogleFonts/AbstractGFOptimization.php b/inc/Engine/Optimization/GoogleFonts/AbstractGFOptimization.php
index e3b112402b..5d5ec3633e 100644
--- a/inc/Engine/Optimization/GoogleFonts/AbstractGFOptimization.php
+++ b/inc/Engine/Optimization/GoogleFonts/AbstractGFOptimization.php
@@ -111,6 +111,20 @@ protected function get_font_display_value(): string {
 	 * @return string
 	 */
 	protected function get_optimized_markup( string $url ): string {
+		/**
+		 * Filters whether to disable Google Fonts preloading.
+		 *
+		 * @since 3.18
+		 *
+		 * @param bool $disable_google_fonts_preload Whether to disable Google Fonts preloading. Default false.
+		 */
+		if ( wpm_apply_filters_typed( 'boolean', 'rocket_disable_google_fonts_preload', false ) ) {
+			return sprintf(
+				'<link rel="stylesheet" href="%1$s" />', // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
+				$url
+			);
+		}
+
 		return sprintf(
 			'<link rel="preload" data-rocket-preload as="style" href="%1$s" /><link rel="stylesheet" href="%1$s" media="print" onload="this.media=\'all\'" /><noscript><link rel="stylesheet" href="%1$s" /></noscript>', // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedStylesheet
 			$url
diff --git a/inc/Engine/Optimization/GoogleFonts/Subscriber.php b/inc/Engine/Optimization/GoogleFonts/Subscriber.php
index 78b79864b6..19232d36e8 100644
--- a/inc/Engine/Optimization/GoogleFonts/Subscriber.php
+++ b/inc/Engine/Optimization/GoogleFonts/Subscriber.php
@@ -54,7 +54,7 @@ public function __construct( AbstractGFOptimization $combine, AbstractGFOptimiza
 	public static function get_subscribed_events() {
 		return [
 			'wp_resource_hints' => [ 'preconnect', 10, 2 ],
-			'rocket_buffer'     => [ 'process', 1001 ],
+			'rocket_buffer'     => [ 'process', 17 ],
 		];
 	}
 
diff --git a/inc/Plugin.php b/inc/Plugin.php
index 529ac3ed85..01908d8ec0 100644
--- a/inc/Plugin.php
+++ b/inc/Plugin.php
@@ -403,6 +403,7 @@ private function init_common_subscribers() {
 			'performance_hints_admin_subscriber',
 			'lrc_frontend_subscriber',
 			'taxonomy_subscriber',
+			'media_fonts_frontend_subscriber',
 			'media_fonts_admin_subscriber',
 		];
 
diff --git a/tests/Fixtures/inc/Engine/Media/Fonts/Context/Context/isAllowed.php b/tests/Fixtures/inc/Engine/Media/Fonts/Context/Context/isAllowed.php
new file mode 100644
index 0000000000..d70a9f3055
--- /dev/null
+++ b/tests/Fixtures/inc/Engine/Media/Fonts/Context/Context/isAllowed.php
@@ -0,0 +1,36 @@
+<?php
+
+return [
+	'testShouldReturnFalseWhenBypass' => [
+		'config' => [
+			'bypass' => true,
+			'do_not_optimize' => false,
+			'option' => true,
+		],
+		'expected' => false,
+	],
+	'testShouldReturnFalseWhenDoNotOptimize' => [
+		'config' => [
+			'bypass' => false,
+			'do_not_optimize' => true,
+			'option' => true,
+		],
+		'expected' => false,
+	],
+	'testShouldReturnFalseWhenOptionDisabled' => [
+		'config' => [
+			'bypass' => false,
+			'do_not_optimize' => true,
+			'option' => false,
+		],
+		'expected' => false,
+	],
+	'testShouldReturnTrueWhenOptionEnabled' => [
+		'config' => [
+			'bypass' => false,
+			'do_not_optimize' => false,
+			'option' => true,
+		],
+		'expected' => true,
+	],
+];
diff --git a/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/HTML/expected_v1.php b/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/HTML/expected_v1.php
new file mode 100644
index 0000000000..2662753c5a
--- /dev/null
+++ b/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/HTML/expected_v1.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Template Name: Google Font V1 Template
+ */ ?>
+
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<title>Google Font V1 Template</title>
+	<link rel="stylesheet" href="http://example.org/wp-content/cache/fonts/1/e/b/c/173c0fc97eef86a6e51ada56c5a9a.css" data-wpr-hosted-gf-parameters="family=Roboto"/>
+	<link rel="stylesheet" href="http://example.org/wp-content/cache/fonts/1/5/9/5/cb6ccb56826a802ed411cef875f0e.css" data-wpr-hosted-gf-parameters="family=Open+Sans"/>
+	<style>
+		.roboto-font {
+			font-family: 'Roboto', sans-serif;
+		}
+		.open-sans-font {
+			font-family: 'Open Sans', sans-serif;
+		}
+	</style>
+</head>
+<body>
+<div class="wrap">
+	<div id="primary" class="content-area">
+		<main id="main" class="site-main">
+			<h1 class="roboto-font">Hello World</h1>
+			<p class="open-sans-font">Welcome to the world</p>
+		</main><!-- #main -->
+	</div><!-- #primary -->
+</div><!-- .wrap -->
+</body>
+</html>
diff --git a/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/HTML/expected_v1_v2.php b/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/HTML/expected_v1_v2.php
new file mode 100644
index 0000000000..d88d7dfe75
--- /dev/null
+++ b/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/HTML/expected_v1_v2.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Template Name: Google Font V1 and V2 Template
+ */ ?>
+
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<title>Google Font V1 and V2 Template</title>
+	<link rel="stylesheet" href="http://example.org/wp-content/cache/fonts/1/6/2/4/f2c2b9858423d0688793189f6e6cb.css" data-wpr-hosted-gf-parameters="family=Roboto|Open+Sans"/> <!-- V1 Fonts -->
+	<link rel="stylesheet" href="http://example.org/wp-content/cache/fonts/1/8/d/4/e42f26da0305c49cd3264956d8329.css" data-wpr-hosted-gf-parameters="family=Lato:wght@400;700&family=Montserrat:wght@400;700&display=swap"/> <!-- V2 Fonts -->
+	<style>
+		.v1-font-roboto {
+			font-family: 'Roboto', sans-serif;
+		}
+		.v1-font-open-sans {
+			font-family: 'Open Sans', sans-serif;
+		}
+		.v2-font-lato {
+			font-family: 'Lato', sans-serif;
+		}
+		.v2-font-montserrat {
+			font-family: 'Montserrat', sans-serif;
+		}
+	</style>
+</head>
+<body>
+<div class="wrap">
+	<div id="primary" class="content-area">
+		<main id="main" class="site-main">
+			<h1 class="v1-font-roboto">Hello World</h1>
+			<p class="v1-font-open-sans">Welcome to the world</p>
+			<h2 class="v2-font-lato">This is a subtitle</h2>
+			<p class="v2-font-montserrat">Enjoy your stay</p>
+		</main><!-- #main -->
+	</div><!-- #primary -->
+</div><!-- .wrap -->
+</body>
+</html>
diff --git a/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/HTML/expected_v2.php b/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/HTML/expected_v2.php
new file mode 100644
index 0000000000..8dcf11ad68
--- /dev/null
+++ b/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/HTML/expected_v2.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Template Name: Google Font V2 Template
+ */ ?>
+
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<title>Google Font V2 Template</title>
+	<link rel="stylesheet" href="http://example.org/wp-content/cache/fonts/1/a/b/2/8ffb4f83584e9add1be594dd90dfd.css" data-wpr-hosted-gf-parameters="family=Roboto:wght@400;700&display=swap"/>
+	<link rel="stylesheet" href="http://example.org/wp-content/cache/fonts/1/b/4/d/9ffca0114d3acb6ab0b068feaf933.css" data-wpr-hosted-gf-parameters="family=Lato:wght@400;700&display=swap"/>
+	<style>
+		.roboto-font {
+			font-family: 'Roboto', sans-serif;
+		}
+		.lato-font {
+			font-family: 'Lato', sans-serif;
+		}
+	</style>
+</head>
+<body>
+<div class="wrap">
+	<div id="primary" class="content-area">
+		<main id="main" class="site-main">
+			<h1 class="roboto-font">Hello World</h1>
+			<p class="lato-font">Welcome to the world</p>
+		</main><!-- #main -->
+	</div><!-- #primary -->
+</div><!-- .wrap -->
+</body>
+</html>
diff --git a/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/HTML/input_v1.php b/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/HTML/input_v1.php
new file mode 100644
index 0000000000..e49961654e
--- /dev/null
+++ b/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/HTML/input_v1.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Template Name: Google Font V1 Template
+ */ ?>
+
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<title>Google Font V1 Template</title>
+	<link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
+	<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">
+	<style>
+		.roboto-font {
+			font-family: 'Roboto', sans-serif;
+		}
+		.open-sans-font {
+			font-family: 'Open Sans', sans-serif;
+		}
+	</style>
+</head>
+<body>
+<div class="wrap">
+	<div id="primary" class="content-area">
+		<main id="main" class="site-main">
+			<h1 class="roboto-font">Hello World</h1>
+			<p class="open-sans-font">Welcome to the world</p>
+		</main><!-- #main -->
+	</div><!-- #primary -->
+</div><!-- .wrap -->
+</body>
+</html>
diff --git a/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/HTML/input_v1_v2.php b/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/HTML/input_v1_v2.php
new file mode 100644
index 0000000000..34be74bed6
--- /dev/null
+++ b/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/HTML/input_v1_v2.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Template Name: Google Font V1 and V2 Template
+ */ ?>
+
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<title>Google Font V1 and V2 Template</title>
+	<link href="https://fonts.googleapis.com/css?family=Roboto|Open+Sans" rel="stylesheet"> <!-- V1 Fonts -->
+	<link href="https://fonts.googleapis.com/css2?family=Lato:wght@400;700&family=Montserrat:wght@400;700&display=swap" rel="stylesheet"> <!-- V2 Fonts -->
+	<style>
+		.v1-font-roboto {
+			font-family: 'Roboto', sans-serif;
+		}
+		.v1-font-open-sans {
+			font-family: 'Open Sans', sans-serif;
+		}
+		.v2-font-lato {
+			font-family: 'Lato', sans-serif;
+		}
+		.v2-font-montserrat {
+			font-family: 'Montserrat', sans-serif;
+		}
+	</style>
+</head>
+<body>
+<div class="wrap">
+	<div id="primary" class="content-area">
+		<main id="main" class="site-main">
+			<h1 class="v1-font-roboto">Hello World</h1>
+			<p class="v1-font-open-sans">Welcome to the world</p>
+			<h2 class="v2-font-lato">This is a subtitle</h2>
+			<p class="v2-font-montserrat">Enjoy your stay</p>
+		</main><!-- #main -->
+	</div><!-- #primary -->
+</div><!-- .wrap -->
+</body>
+</html>
diff --git a/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/HTML/input_v2.php b/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/HTML/input_v2.php
new file mode 100644
index 0000000000..2abf18db1b
--- /dev/null
+++ b/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/HTML/input_v2.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Template Name: Google Font V2 Template
+ */ ?>
+
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<title>Google Font V2 Template</title>
+	<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap" rel="stylesheet">
+	<link href="https://fonts.googleapis.com/css2?family=Lato:wght@400;700&display=swap" rel="stylesheet">
+	<style>
+		.roboto-font {
+			font-family: 'Roboto', sans-serif;
+		}
+		.lato-font {
+			font-family: 'Lato', sans-serif;
+		}
+	</style>
+</head>
+<body>
+<div class="wrap">
+	<div id="primary" class="content-area">
+		<main id="main" class="site-main">
+			<h1 class="roboto-font">Hello World</h1>
+			<p class="lato-font">Welcome to the world</p>
+		</main><!-- #main -->
+	</div><!-- #primary -->
+</div><!-- .wrap -->
+</body>
+</html>
diff --git a/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/rewriteFonts.php b/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/rewriteFonts.php
new file mode 100644
index 0000000000..1b9307af2c
--- /dev/null
+++ b/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Controller/rewriteFonts.php
@@ -0,0 +1,41 @@
+<?php
+
+return [
+	'test_data' => [
+		'testShouldReturnOriginalWhenNotAllowed' => [
+			'config' => [
+				'is_allowed' => false,
+			],
+			'original' => '<html><body></body></html>',
+			'expected' => '<html><body></body></html>',
+		],
+		'testShouldReturnOriginalWhenNoGoogleFonts' => [
+		'config' => [
+			'is_allowed' => true,
+		],
+		'original' => '<html><body></body></html>',
+		'expected' => '<html><body></body></html>',
+	],
+		'testShouldRewriteV1Font' => [
+			'config' => [
+				'is_allowed' => true,
+			],
+			'original' => file_get_contents( __DIR__ . '/HTML/input_v1.php' ),
+			'expected' => file_get_contents( __DIR__ . '/HTML/expected_v1.php' ),
+		],
+		'testShouldRewriteV2' => [
+			'config' => [
+				'is_allowed' => true,
+			],
+			'original' => file_get_contents( __DIR__ . '/HTML/input_v2.php' ),
+			'expected' =>  file_get_contents( __DIR__ . '/HTML/expected_v2.php' ),
+		],
+		'testShouldRewriteV1AndV2' => [
+			'config' => [
+				'is_allowed' => true,
+			],
+			'original' => file_get_contents( __DIR__ . '/HTML/input_v1_v2.php' ),
+			'expected' => file_get_contents( __DIR__ . '/HTML/expected_v1_v2.php' ),
+		],
+	],
+];
diff --git a/tests/Fixtures/inc/Engine/Optimization/GoogleFonts/Combine/optimize.php b/tests/Fixtures/inc/Engine/Optimization/GoogleFonts/Combine/optimize.php
index 7e5f9b8993..6e5fe2b8b8 100644
--- a/tests/Fixtures/inc/Engine/Optimization/GoogleFonts/Combine/optimize.php
+++ b/tests/Fixtures/inc/Engine/Optimization/GoogleFonts/Combine/optimize.php
@@ -2,6 +2,10 @@
 
 return [
 	'testShouldCombineGoogleFontsWithoutSubsets' => [
+		'config' => [
+			'swap' => false,
+			'disable_preload' => false,
+		],
 		'html' => '<html>
 			<head>
 				<title>Sample Page</title>
@@ -21,6 +25,10 @@
 		</html>',
 	],
 	'testShouldUseFilteredDisplayValue' => [
+		'config' => [
+			'swap' => 'optional',
+			'disable_preload' => false,
+		],
 		'html' => '<html>
 			<head>
 				<title>Sample Page</title>
@@ -38,9 +46,12 @@
 			<body>
 			</body>
 		</html>',
-		'filtered' => 'optional',
 	],
 	'testShouldCombineGoogleFontsWithSubsets' => [
+		'config' => [
+			'swap' => false,
+			'disable_preload' => false,
+		],
 		'html' => '<html>
 			<head>
 				<title>Sample Page</title>
@@ -60,6 +71,10 @@
 		</html>',
 	],
 	'testShouldCombineGoogleFontsWithoutSubsetsAndNoEnding|' => [
+		'config' => [
+			'swap' => false,
+			'disable_preload' => false,
+		],
 		'html' => '<html>
 			<head>
 				<title>Sample Page</title>
@@ -79,6 +94,10 @@
 		</html>',
 	],
 	'testShouldCombineGoogleFontsWithoutSubsetsWhenMalformedURL' => [
+		'config' => [
+			'swap' => false,
+			'disable_preload' => false,
+		],
 		'html' => '<html>
 			<head>
 				<title>Sample Page</title>
@@ -98,6 +117,10 @@
 		</html>',
 	],
 	'testShouldCombineGoogleFontsWithSubsetsWhenMalformedURL' => [
+		'config' => [
+			'swap' => false,
+			'disable_preload' => false,
+		],
 		'html' => '<html>
 			<head>
 				<title>Sample Page</title>
@@ -119,6 +142,10 @@
 		</html>',
 	],
 	'testShouldOptimizeSingleGoogleFontsWhenNoParam' => [
+		'config' => [
+			'swap' => false,
+			'disable_preload' => false,
+		],
 		'html' => '<html>
 			<head>
 				<title>Sample Page</title>
@@ -138,14 +165,18 @@
 		</html>',
 	],
 	'testShouldOptimizeSingleGoogleFontsWhenParam' => [
+		'config' => [
+			'swap' => false,
+			'disable_preload' => false,
+		],
 		'html' => '<html>
-			<head>
-				<title>Sample Page</title>
-				<link href="https://fonts.googleapis.com/css?family=Josefin+Sans:300&#038;display=auto" rel="stylesheet" property="stylesheet" type"text/css" media="all">
-			</head>
-			<body>
-			</body>
-		</html>',
+				<head>
+					<title>Sample Page</title>
+					<link href="https://fonts.googleapis.com/css?family=Josefin+Sans:300&#038;display=auto" rel="stylesheet" property="stylesheet" type"text/css" media="all">
+				</head>
+				<body>
+				</body>
+			</html>',
 		'expected' => '<html>
 			<head>
 				<title>Sample Page</title><link rel="preload" data-rocket-preload as="style" href="https://fonts.googleapis.com/css?family=Josefin%20Sans%3A300&#038;display=swap" />
@@ -156,6 +187,10 @@
 		</html>',
 	],
 	'testShouldOptimizeSingleGoogleFontsWhenInvalidParam' => [
+		'config' => [
+			'swap' => false,
+			'disable_preload' => false,
+		],
 		'html' => '<html>
 			<head>
 				<title>Sample Page</title>
@@ -174,14 +209,18 @@
 		</html>',
 	],
 	'testShouldOptimizeSingleGoogleFontsWhenEncodedParam' => [
+		'config' => [
+			'swap' => false,
+			'disable_preload' => false,
+		],
 		'html' => '<html>
-			<head>
-				<title>Sample Page</title>
-				<link rel="stylesheet" id="dt-web-fonts-css"  href="//fonts.googleapis.com/css?family=Josefin+Sans%3A100%2C300%2C300italic%2C400%2C600%2C700%7CRoboto%3A100italic%2C300italic%2C400%2C500%2C600%2C700%7CUnica+One%3A400%2C600%2C700&#038;ver=7.3.2" type="text/css" media="all" />
-			</head>
-			<body>
-			</body>
-		</html>',
+				<head>
+					<title>Sample Page</title>
+					<link rel="stylesheet" id="dt-web-fonts-css"  href="//fonts.googleapis.com/css?family=Josefin+Sans%3A100%2C300%2C300italic%2C400%2C600%2C700%7CRoboto%3A100italic%2C300italic%2C400%2C500%2C600%2C700%7CUnica+One%3A400%2C600%2C700&#038;ver=7.3.2" type="text/css" media="all" />
+				</head>
+				<body>
+				</body>
+			</html>',
 		'expected' => '<html>
 			<head>
 				<title>Sample Page</title><link rel="preload" data-rocket-preload as="style" href="https://fonts.googleapis.com/css?family=Josefin%20Sans%3A100%2C300%2C300italic%2C400%2C600%2C700%7CRoboto%3A100italic%2C300italic%2C400%2C500%2C600%2C700%7CUnica%20One%3A400%2C600%2C700&#038;display=swap" />
@@ -192,17 +231,21 @@
 		</html>',
 	],
 	'testShouldCombineGoogleFontsWhenMultipleTitleTags' => [
+		'config' => [
+			'swap' => false,
+			'disable_preload' => false,
+		],
 		'html' => '<html>
-			<head>
-				<title>Sample Page</title>
-				<link rel="stylesheet" id="dt-web-fonts-css"  href="//fonts.googleapis.com/css?family=Josefin+Sans%3A100%2C300%2C300italic%2C400%2C600%2C700%7CRoboto%3A100italic%2C300italic%2C400%2C500%2C600%2C700%7CUnica+One%3A400%2C600%2C700&#038;ver=7.3.2" type="text/css" media="all" />
-				<link rel="stylesheet" id="ultimate-google-fonts-css"  href="https://fonts.googleapis.com/css?family=Josefin+Sans:regular,300|" type="text/css" media="all" />
-				<link href="https://fonts.googleapis.com/css?family=Josefin+Sans:300" rel="stylesheet" property="stylesheet" type"text/css" media="all">
-				<title>Sample Title 2</title>
-			</head>
-			<body>
-			</body>
-		</html>',
+				<head>
+					<title>Sample Page</title>
+					<link rel="stylesheet" id="dt-web-fonts-css"  href="//fonts.googleapis.com/css?family=Josefin+Sans%3A100%2C300%2C300italic%2C400%2C600%2C700%7CRoboto%3A100italic%2C300italic%2C400%2C500%2C600%2C700%7CUnica+One%3A400%2C600%2C700&#038;ver=7.3.2" type="text/css" media="all" />
+					<link rel="stylesheet" id="ultimate-google-fonts-css"  href="https://fonts.googleapis.com/css?family=Josefin+Sans:regular,300|" type="text/css" media="all" />
+					<link href="https://fonts.googleapis.com/css?family=Josefin+Sans:300" rel="stylesheet" property="stylesheet" type"text/css" media="all">
+					<title>Sample Title 2</title>
+				</head>
+				<body>
+				</body>
+			</html>',
 		'expected' => '<html>
 			<head>
 				<title>Sample Page</title><link rel="preload" data-rocket-preload as="style" href="https://fonts.googleapis.com/css?family=Josefin%20Sans%3A100%2C300%2C300italic%2C400%2C600%2C700%7CRoboto%3A100italic%2C300italic%2C400%2C500%2C600%2C700%7CUnica%20One%3A400%2C600%2C700%7CJosefin%20Sans%3Aregular%2C300%7CJosefin%20Sans%3A300&#038;display=swap" /><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Josefin%20Sans%3A100%2C300%2C300italic%2C400%2C600%2C700%7CRoboto%3A100italic%2C300italic%2C400%2C500%2C600%2C700%7CUnica%20One%3A400%2C600%2C700%7CJosefin%20Sans%3Aregular%2C300%7CJosefin%20Sans%3A300&#038;display=swap" media="print" onload="this.media=\'all\'" /><noscript><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Josefin%20Sans%3A100%2C300%2C300italic%2C400%2C600%2C700%7CRoboto%3A100italic%2C300italic%2C400%2C500%2C600%2C700%7CUnica%20One%3A400%2C600%2C700%7CJosefin%20Sans%3Aregular%2C300%7CJosefin%20Sans%3A300&#038;display=swap" /></noscript>
@@ -213,6 +256,10 @@
 		</html>',
 	],
 	'testShouldCombineGoogleFontsWhenTitleTagInsideBody' =>  [
+		'config' => [
+			'swap' => false,
+			'disable_preload' => false,
+		],
 		'html' => '<html>
 			<head>
 				<title>Sample Page</title>
@@ -234,25 +281,51 @@
 		</html>',
 	],
 	'testShouldCombineGoogleFontsWhenTitleTagInsideSvgTag' => [
+		'config' => [
+			'swap' => false,
+			'disable_preload' => false,
+		],
 		'html' => '<html>
+				<head>
+					<title>Sample Page</title>
+					<link rel="stylesheet" id="dt-web-fonts-css"  href="//fonts.googleapis.com/css?family=Josefin+Sans%3A100%2C300%2C300italic%2C400%2C600%2C700%7CRoboto%3A100italic%2C300italic%2C400%2C500%2C600%2C700%7CUnica+One%3A400%2C600%2C700&#038;ver=7.3.2" type="text/css" media="all" />
+					<link rel="stylesheet" id="ultimate-google-fonts-css"  href="https://fonts.googleapis.com/css?family=Josefin+Sans:regular,300|" type="text/css" media="all" />
+					<link href="https://fonts.googleapis.com/css?family=Josefin+Sans:300" rel="stylesheet" property="stylesheet" type"text/css" media="all">
+				</head>
+				<body>
+					<!-- JetMenu Menu markup -->
+					<div id="jet-mobile-menu-5e9eda6a03ac6" class="jet-mobile-menu jet-mobile-menu-widget" data-menu-id="3" data-menu-options=\'{"menuUniqId":"5e9eda6a03ac6","menuId":"3","mobileMenuId":false,"menuLocation":false,"menuLayout":"slide-out","togglePosition":"fixed-right","menuPosition":"right","headerTemplate":"3001","beforeTemplate":"0","afterTemplate":"3050","toggleClosedIcon":"<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" viewBox=\"0 0 173.61 108.44\"><defs><linearGradient id=\"a\" x1=\"63.95\" y1=\"60.58\" x2=\"-114.86\" y2=\"62.47\" gradientUnits=\"userSpaceOnUse\"><stop offset=\"0.13\" stop-color=\"#fdc700\"></stop><stop offset=\"0.34\" stop-color=\"#f08f34\"></stop><stop offset=\"0.63\" stop-color=\"#e86031\"></stop><stop offset=\"0.69\" stop-color=\"#e64729\"></stop><stop offset=\"0.77\" stop-color=\"#e42b1f\"></stop><stop offset=\"0.84\" stop-color=\"#e31618\"></stop><stop offset=\"0.92\" stop-color=\"#e20a14\"></stop><stop offset=\"0.99\" stop-color=\"#e20613\"></stop></linearGradient><linearGradient id=\"b\" x1=\"63.94\" y1=\"59.65\" x2=\"-114.87\" y2=\"61.54\" xlink:href=\"#a\"></linearGradient></defs><title>logo-cacahuete</title><path d=\"M57,71.39c-6.63-12.14,1-22.57,1-22.57h0A28.47,28.47,0,1,0,4.51,35.16,28.35,28.35,0,0,0,8,48.82H8l0,0c.26.49.56,1,.85,1.42A21.75,21.75,0,0,1,9,71.39a1.4,1.4,0,0,0-.09.17,28.47,28.47,0,1,0,48.4.3C57.18,71.7,57.13,71.56,57,71.39Z\" transform=\"translate(112.17 -6.69)\" fill=\"url(#a)\"></path><path d=\"M-21,61A28.5,28.5,0,0,0-5.11,35.4,28.52,28.52,0,0,0-33.63,6.88a28.48,28.48,0,0,0-25,14.81,28.51,28.51,0,0,0-25-14.81A28.52,28.52,0,0,0-112.17,35.4,28.51,28.51,0,0,0-96.26,61,28.47,28.47,0,0,0-112.17,86.5,28.53,28.53,0,0,0-83.65,115a28.52,28.52,0,0,0,25-14.82,28.49,28.49,0,0,0,25,14.82A28.53,28.53,0,0,0-5.11,86.5,28.47,28.47,0,0,0-21,61Z\" transform=\"translate(112.17 -6.69)\" fill=\"url(#b)\"></path></svg>","toggleOpenedIcon":"","closeIcon":"<i class=\"mdi mdi-toggle-switch\"></i>","backIcon":"<i class=\"mdi mdi-toggle-switch-off\"></i>","dropdownIcon":"<i class=\"far fa-circle\"></i>","useBreadcrumb":true,"breadcrumbIcon":"","toggleText":"MENU","toggleLoader":true,"backText":"RETOUR","itemIconVisible":"true","itemBadgeVisible":"true","itemDescVisible":"false","loaderColor":"#FCC800","subTrigger":"item"}\'><MobileMenu :menu-options="menuOptions"></MobileMenu></div>
+				</body>
+			</html>',
+		'expected' => '<html>
 			<head>
-				<title>Sample Page</title>
-				<link rel="stylesheet" id="dt-web-fonts-css"  href="//fonts.googleapis.com/css?family=Josefin+Sans%3A100%2C300%2C300italic%2C400%2C600%2C700%7CRoboto%3A100italic%2C300italic%2C400%2C500%2C600%2C700%7CUnica+One%3A400%2C600%2C700&#038;ver=7.3.2" type="text/css" media="all" />
-				<link rel="stylesheet" id="ultimate-google-fonts-css"  href="https://fonts.googleapis.com/css?family=Josefin+Sans:regular,300|" type="text/css" media="all" />
-				<link href="https://fonts.googleapis.com/css?family=Josefin+Sans:300" rel="stylesheet" property="stylesheet" type"text/css" media="all">
+				<title>Sample Page</title><link rel="preload" data-rocket-preload as="style" href="https://fonts.googleapis.com/css?family=Josefin%20Sans%3A100%2C300%2C300italic%2C400%2C600%2C700%7CRoboto%3A100italic%2C300italic%2C400%2C500%2C600%2C700%7CUnica%20One%3A400%2C600%2C700%7CJosefin%20Sans%3Aregular%2C300%7CJosefin%20Sans%3A300&#038;display=swap" /><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Josefin%20Sans%3A100%2C300%2C300italic%2C400%2C600%2C700%7CRoboto%3A100italic%2C300italic%2C400%2C500%2C600%2C700%7CUnica%20One%3A400%2C600%2C700%7CJosefin%20Sans%3Aregular%2C300%7CJosefin%20Sans%3A300&#038;display=swap" media="print" onload="this.media=\'all\'" /><noscript><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Josefin%20Sans%3A100%2C300%2C300italic%2C400%2C600%2C700%7CRoboto%3A100italic%2C300italic%2C400%2C500%2C600%2C700%7CUnica%20One%3A400%2C600%2C700%7CJosefin%20Sans%3Aregular%2C300%7CJosefin%20Sans%3A300&#038;display=swap" /></noscript>
 			</head>
 			<body>
 				<!-- JetMenu Menu markup -->
 				<div id="jet-mobile-menu-5e9eda6a03ac6" class="jet-mobile-menu jet-mobile-menu-widget" data-menu-id="3" data-menu-options=\'{"menuUniqId":"5e9eda6a03ac6","menuId":"3","mobileMenuId":false,"menuLocation":false,"menuLayout":"slide-out","togglePosition":"fixed-right","menuPosition":"right","headerTemplate":"3001","beforeTemplate":"0","afterTemplate":"3050","toggleClosedIcon":"<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" viewBox=\"0 0 173.61 108.44\"><defs><linearGradient id=\"a\" x1=\"63.95\" y1=\"60.58\" x2=\"-114.86\" y2=\"62.47\" gradientUnits=\"userSpaceOnUse\"><stop offset=\"0.13\" stop-color=\"#fdc700\"></stop><stop offset=\"0.34\" stop-color=\"#f08f34\"></stop><stop offset=\"0.63\" stop-color=\"#e86031\"></stop><stop offset=\"0.69\" stop-color=\"#e64729\"></stop><stop offset=\"0.77\" stop-color=\"#e42b1f\"></stop><stop offset=\"0.84\" stop-color=\"#e31618\"></stop><stop offset=\"0.92\" stop-color=\"#e20a14\"></stop><stop offset=\"0.99\" stop-color=\"#e20613\"></stop></linearGradient><linearGradient id=\"b\" x1=\"63.94\" y1=\"59.65\" x2=\"-114.87\" y2=\"61.54\" xlink:href=\"#a\"></linearGradient></defs><title>logo-cacahuete</title><path d=\"M57,71.39c-6.63-12.14,1-22.57,1-22.57h0A28.47,28.47,0,1,0,4.51,35.16,28.35,28.35,0,0,0,8,48.82H8l0,0c.26.49.56,1,.85,1.42A21.75,21.75,0,0,1,9,71.39a1.4,1.4,0,0,0-.09.17,28.47,28.47,0,1,0,48.4.3C57.18,71.7,57.13,71.56,57,71.39Z\" transform=\"translate(112.17 -6.69)\" fill=\"url(#a)\"></path><path d=\"M-21,61A28.5,28.5,0,0,0-5.11,35.4,28.52,28.52,0,0,0-33.63,6.88a28.48,28.48,0,0,0-25,14.81,28.51,28.51,0,0,0-25-14.81A28.52,28.52,0,0,0-112.17,35.4,28.51,28.51,0,0,0-96.26,61,28.47,28.47,0,0,0-112.17,86.5,28.53,28.53,0,0,0-83.65,115a28.52,28.52,0,0,0,25-14.82,28.49,28.49,0,0,0,25,14.82A28.53,28.53,0,0,0-5.11,86.5,28.47,28.47,0,0,0-21,61Z\" transform=\"translate(112.17 -6.69)\" fill=\"url(#b)\"></path></svg>","toggleOpenedIcon":"","closeIcon":"<i class=\"mdi mdi-toggle-switch\"></i>","backIcon":"<i class=\"mdi mdi-toggle-switch-off\"></i>","dropdownIcon":"<i class=\"far fa-circle\"></i>","useBreadcrumb":true,"breadcrumbIcon":"","toggleText":"MENU","toggleLoader":true,"backText":"RETOUR","itemIconVisible":"true","itemBadgeVisible":"true","itemDescVisible":"false","loaderColor":"#FCC800","subTrigger":"item"}\'><MobileMenu :menu-options="menuOptions"></MobileMenu></div>
 			</body>
 		</html>',
+	],
+	'testShouldOptimizeSingleGoogleFontsNoPreload' => [
+		'config' => [
+			'swap' => false,
+			'disable_preload' => true,
+		],
+		'html' => '<html>
+			<head>
+				<title>Sample Page</title>
+				<link href="https://fonts.googleapis.com/css?family=Josefin+Sans:300" rel="stylesheet" property="stylesheet" type"text/css" media="all">
+			</head>
+			<body>
+			</body>
+		</html>',
+		// Expected: Combined HTML.
 		'expected' => '<html>
 			<head>
-				<title>Sample Page</title><link rel="preload" data-rocket-preload as="style" href="https://fonts.googleapis.com/css?family=Josefin%20Sans%3A100%2C300%2C300italic%2C400%2C600%2C700%7CRoboto%3A100italic%2C300italic%2C400%2C500%2C600%2C700%7CUnica%20One%3A400%2C600%2C700%7CJosefin%20Sans%3Aregular%2C300%7CJosefin%20Sans%3A300&#038;display=swap" /><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Josefin%20Sans%3A100%2C300%2C300italic%2C400%2C600%2C700%7CRoboto%3A100italic%2C300italic%2C400%2C500%2C600%2C700%7CUnica%20One%3A400%2C600%2C700%7CJosefin%20Sans%3Aregular%2C300%7CJosefin%20Sans%3A300&#038;display=swap" media="print" onload="this.media=\'all\'" /><noscript><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Josefin%20Sans%3A100%2C300%2C300italic%2C400%2C600%2C700%7CRoboto%3A100italic%2C300italic%2C400%2C500%2C600%2C700%7CUnica%20One%3A400%2C600%2C700%7CJosefin%20Sans%3Aregular%2C300%7CJosefin%20Sans%3A300&#038;display=swap" /></noscript>
+				<title>Sample Page</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Josefin%20Sans%3A300&#038;display=swap" />
 			</head>
 			<body>
-				<!-- JetMenu Menu markup -->
-				<div id="jet-mobile-menu-5e9eda6a03ac6" class="jet-mobile-menu jet-mobile-menu-widget" data-menu-id="3" data-menu-options=\'{"menuUniqId":"5e9eda6a03ac6","menuId":"3","mobileMenuId":false,"menuLocation":false,"menuLayout":"slide-out","togglePosition":"fixed-right","menuPosition":"right","headerTemplate":"3001","beforeTemplate":"0","afterTemplate":"3050","toggleClosedIcon":"<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" viewBox=\"0 0 173.61 108.44\"><defs><linearGradient id=\"a\" x1=\"63.95\" y1=\"60.58\" x2=\"-114.86\" y2=\"62.47\" gradientUnits=\"userSpaceOnUse\"><stop offset=\"0.13\" stop-color=\"#fdc700\"></stop><stop offset=\"0.34\" stop-color=\"#f08f34\"></stop><stop offset=\"0.63\" stop-color=\"#e86031\"></stop><stop offset=\"0.69\" stop-color=\"#e64729\"></stop><stop offset=\"0.77\" stop-color=\"#e42b1f\"></stop><stop offset=\"0.84\" stop-color=\"#e31618\"></stop><stop offset=\"0.92\" stop-color=\"#e20a14\"></stop><stop offset=\"0.99\" stop-color=\"#e20613\"></stop></linearGradient><linearGradient id=\"b\" x1=\"63.94\" y1=\"59.65\" x2=\"-114.87\" y2=\"61.54\" xlink:href=\"#a\"></linearGradient></defs><title>logo-cacahuete</title><path d=\"M57,71.39c-6.63-12.14,1-22.57,1-22.57h0A28.47,28.47,0,1,0,4.51,35.16,28.35,28.35,0,0,0,8,48.82H8l0,0c.26.49.56,1,.85,1.42A21.75,21.75,0,0,1,9,71.39a1.4,1.4,0,0,0-.09.17,28.47,28.47,0,1,0,48.4.3C57.18,71.7,57.13,71.56,57,71.39Z\" transform=\"translate(112.17 -6.69)\" fill=\"url(#a)\"></path><path d=\"M-21,61A28.5,28.5,0,0,0-5.11,35.4,28.52,28.52,0,0,0-33.63,6.88a28.48,28.48,0,0,0-25,14.81,28.51,28.51,0,0,0-25-14.81A28.52,28.52,0,0,0-112.17,35.4,28.51,28.51,0,0,0-96.26,61,28.47,28.47,0,0,0-112.17,86.5,28.53,28.53,0,0,0-83.65,115a28.52,28.52,0,0,0,25-14.82,28.49,28.49,0,0,0,25,14.82A28.53,28.53,0,0,0-5.11,86.5,28.47,28.47,0,0,0-21,61Z\" transform=\"translate(112.17 -6.69)\" fill=\"url(#b)\"></path></svg>","toggleOpenedIcon":"","closeIcon":"<i class=\"mdi mdi-toggle-switch\"></i>","backIcon":"<i class=\"mdi mdi-toggle-switch-off\"></i>","dropdownIcon":"<i class=\"far fa-circle\"></i>","useBreadcrumb":true,"breadcrumbIcon":"","toggleText":"MENU","toggleLoader":true,"backText":"RETOUR","itemIconVisible":"true","itemBadgeVisible":"true","itemDescVisible":"false","loaderColor":"#FCC800","subTrigger":"item"}\'><MobileMenu :menu-options="menuOptions"></MobileMenu></div>
 			</body>
 		</html>',
 	],
diff --git a/tests/Fixtures/inc/Engine/Optimization/GoogleFonts/CombineV1V2/optimize.php b/tests/Fixtures/inc/Engine/Optimization/GoogleFonts/CombineV1V2/optimize.php
index 620e6f798c..88120d742f 100644
--- a/tests/Fixtures/inc/Engine/Optimization/GoogleFonts/CombineV1V2/optimize.php
+++ b/tests/Fixtures/inc/Engine/Optimization/GoogleFonts/CombineV1V2/optimize.php
@@ -2,7 +2,11 @@
 
 return [
 	'shouldReturnOptimizedTagWhenSingleTagGiven' => [
-		'given' =>
+		'config' => [
+			'swap' => false,
+			'disable_preload' => false,
+		],
+		'html' =>
 			'<!doctype html>
 			<html>
 				<head>
@@ -29,7 +33,11 @@
 			</html>'
 	],
 	'shouldUseFilteredDisplayValue' => [
-		'given' =>
+		'config' => [
+			'swap' => 'optional',
+			'disable_preload' => false,
+		],
+		'html' =>
 			'<!doctype html>
 			<html>
 				<head>
@@ -55,10 +63,13 @@
 				</body>
 			</html>'
 		,
-		'filtered' => 'optional',
 	],
 	'shouldNotCombineMultipleTagsWithTextParam' => [
-		'given' =>
+		'config' => [
+			'swap' => false,
+			'disable_preload' => false,
+		],
+		'html' =>
 			'<!doctype html>
 			<html>
 				<head>
@@ -87,7 +98,11 @@
 			</html>'
 	],
 	'shouldCombineMultipleTags' => [
-		'given' =>
+		'config' => [
+			'swap' => false,
+			'disable_preload' => false,
+		],
+		'html' =>
 			'<!doctype html>
 			<html>
 				<head>
@@ -115,7 +130,11 @@
 			</html>'
 	],
 	'shouldCombineMultipleTagsWithMultipleFamiliesInTag' => [
-		'given' =>
+		'config' => [
+			'swap' => false,
+			'disable_preload' => false,
+		],
+		'html' =>
 			'<!doctype html>
 			<html>
 				<head>
@@ -145,7 +164,11 @@
 			</html>'
 	],
 	'shouldRemovePreconnectWhenNoGoogleFontsPresentOnPage' => [
-		'given' =>
+		'config' => [
+			'swap' => false,
+			'disable_preload' => false,
+		],
+		'html' =>
 			'<!doctype html>
 			<html>
 				<head>
diff --git a/tests/Fixtures/inc/Engine/Optimization/GoogleFonts/CombineV2/optimize.php b/tests/Fixtures/inc/Engine/Optimization/GoogleFonts/CombineV2/optimize.php
index 1436ce069d..da2689ed93 100644
--- a/tests/Fixtures/inc/Engine/Optimization/GoogleFonts/CombineV2/optimize.php
+++ b/tests/Fixtures/inc/Engine/Optimization/GoogleFonts/CombineV2/optimize.php
@@ -2,8 +2,12 @@
 
 return [
 	'shouldReturnGivenHTMLWhenNoRelevantTags' => [
-		'given' =>
-			'<!doctype html>
+		'config' => [
+			'swap' => false,
+			'disable_preload' => false,
+		],
+		'html' =>
+				'<!doctype html>
 			<html>
 				<head>
 					<title>Sample Page</title>
@@ -11,8 +15,7 @@
 				</head>
 				<body>
 				</body>
-			</html>'
-		,
+			</html>',
 		'expected' =>
 			'<!doctype html>
 			<html>
@@ -25,8 +28,12 @@
 			</html>'
 	],
 	'shouldReturnTagWithFontDisplayWhenSingleTagGiven' => [
-		'given' =>
-			'<!doctype html>
+		'config' => [
+			'swap' => false,
+			'disable_preload' => false,
+		],
+		'html' =>
+				'<!doctype html>
 			<html>
 				<head>
 					<title>Sample Page</title>
@@ -34,8 +41,7 @@
 				</head>
 				<body>
 				</body>
-			</html>'
-		,
+			</html>',
 		'expected' =>
 			'<!doctype html>
 			<html>
@@ -49,8 +55,11 @@
 			</html>'
 	],
 	'shouldNotCombineMultipleTagsWithTextParam' => [
-		'given' =>
-			'<!doctype html>
+		'config' => [
+			'swap' => false,
+			'disable_preload' => false,
+		],
+		'html' => '<!doctype html>
 			<html>
 				<head>
 					<title>Sample Page</title>
@@ -59,8 +68,7 @@
 				</head>
 				<body>
 				</body>
-			</html>'
-		,
+			</html>',
 		'expected' =>
 			'<!doctype html>
 			<html>
@@ -74,8 +82,12 @@
 			</html>'
 	],
 	'shouldCombineMultipleTags' => [
-		'given' =>
-			'<!doctype html>
+		'config' => [
+			'swap' => false,
+			'disable_preload' => false,
+		],
+		'html' =>
+				'<!doctype html>
 			<html>
 				<head>
 					<title>Sample Page</title>
@@ -84,8 +96,7 @@
 				</head>
 				<body>
 				</body>
-			</html>'
-		,
+			</html>',
 		'expected' =>
 			'<!doctype html>
 			<html>
@@ -98,8 +109,12 @@
 			</html>'
 	],
 	'shouldCombineMultipleTagsWithMultipleFamiliesInTag' => [
-		'given' =>
-			'<!doctype html>
+		'config' => [
+			'swap' => false,
+			'disable_preload' => false,
+		],
+		'html' =>
+				'<!doctype html>
 			<html>
 				<head>
 					<title>Sample Page</title>
@@ -109,8 +124,7 @@
 				</head>
 				<body>
 				</body>
-			</html>'
-		,
+			</html>',
 		'expected' =>
 			'<!doctype html>
 			<html>
@@ -124,8 +138,12 @@
 			</html>'
 	],
 	'shouldReplaceAnotherFontDisplayValueWithSwap' => [
-		'given' =>
-			'<!doctype html>
+		'config' => [
+			'swap' => false,
+			'disable_preload' => false,
+		],
+		'html' =>
+				'<!doctype html>
 			<html>
 			<head>
 			<title>Sample Page</title>
@@ -135,8 +153,7 @@
 			</head>
 			<body>
 			</body>
-			</html>'
-		,
+			</html>',
 		'expected' =>
 			'<!doctype html>
 			<html>
@@ -150,8 +167,12 @@
 			</html>'
 	],
 	'shouldReplaceDisplayValueWithFilteredValue' => [
-		'given' =>
-			'<!doctype html>
+		'config' => [
+			'swap' => 'optional',
+			'disable_preload' => false,
+		],
+		'html' =>
+				'<!doctype html>
 			<html>
 			<head>
 			<title>Sample Page</title>
@@ -161,8 +182,7 @@
 			</head>
 			<body>
 			</body>
-			</html>'
-		,
+			</html>',
 		'expected' =>
 			'<!doctype html>
 			<html>
@@ -175,6 +195,32 @@
 			</body>
 			</html>'
 		,
-		'filtered' => 'optional'
+	],
+	'shouldCombineMultipleTagsNoPreload' => [
+		'config' => [
+			'swap' => false,
+			'disable_preload' => true,
+		],
+		'html' =>
+				'<!doctype html>
+			<html>
+				<head>
+					<title>Sample Page</title>
+					<link rel="stylesheet" id="dt-web-fonts-css" href="https://fonts.googleapis.com/css2?family=Crimson+Pro:wght@450" type="text/css" media="all" />
+					<link rel="stylesheet" id="dt-more-fonts-css" href="https://fonts.googleapis.com/css2?family=Comfortaa" type="text/css" media="all" />
+				</head>
+				<body>
+				</body>
+			</html>',
+		'expected' =>
+			'<!doctype html>
+			<html>
+				<head>
+					<title>Sample Page</title>
+					<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Crimson+Pro:wght@450&#038;family=Comfortaa&#038;display=swap" />
+				</head>
+				<body>
+				</body>
+			</html>'
 	],
 ];
diff --git a/tests/Integration/inc/Engine/Optimization/GoogleFonts/Combine/optimize.php b/tests/Integration/inc/Engine/Optimization/GoogleFonts/Combine/optimize.php
index 1a97e8b243..e4af953874 100644
--- a/tests/Integration/inc/Engine/Optimization/GoogleFonts/Combine/optimize.php
+++ b/tests/Integration/inc/Engine/Optimization/GoogleFonts/Combine/optimize.php
@@ -13,11 +13,12 @@
  * @group  GoogleFonts
  */
 class Test_Optimize extends TestCase {
-
-	private $filter_value;
+	private $display;
+	private $disable_preload;
 
 	public function set_up() {
 		parent::set_up();
+
 		$GLOBALS['wp'] = (object) [
 			'query_vars' => [],
 			'request'    => 'http://example.org',
@@ -25,47 +26,53 @@ public function set_up() {
 				'embed',
 			],
         ];
-		$this->unregisterAllCallbacksExcept('rocket_buffer', 'process', 1001 );
+
+		$this->unregisterAllCallbacksExcept('rocket_buffer', 'process', 17 );
 	}
 
 	public function tear_down() {
 		remove_filter( 'pre_get_rocket_option_minify_google_fonts', [ $this, 'return_true' ] );
 		remove_filter( 'rocket_combined_google_fonts_display', [ $this, 'set_display_value' ] );
+		remove_filter( 'rocket_disable_google_fonts_preload', [ $this, 'set_disable_preload' ] );
 
-		unset( $this->filter_value );
 		$this->restoreWpHook('rocket_buffer');
+
 		parent::tear_down();
 	}
 
 	/**
      * @dataProvider addDataProviderV1
      */
-	public function testShouldCombineGoogleFontsV1( $original, $combined, $filtered = false ) {
-		$this->doTest( $original, $combined, $filtered );
+	public function testShouldCombineGoogleFontsV1( $config, $original, $combined ) {
+		$this->doTest( $config, $original, $combined );
 	}
 
 	/**
      * @dataProvider addDataProviderV2
      */
-	public function testShouldCombineGoogleFontsV2( $original, $combined, $filtered = false ) {
-		$this->doTest( $original, $combined, $filtered );
+	public function testShouldCombineGoogleFontsV2( $config, $original, $combined ) {
+		$this->doTest( $config, $original, $combined );
 	}
 
 	/**
      * @dataProvider addDataProviderV1V2
      */
-	public function testShouldCombineGoogleFontsV1V2( $original, $combined, $filtered = false ) {
-		$this->doTest( $original, $combined, $filtered );
+	public function testShouldCombineGoogleFontsV1V2( $config, $original, $combined ) {
+		$this->doTest( $config, $original, $combined );
 	}
 
-	private function doTest( $original, $expected, $filtered ) {
+	private function doTest( $config, $original, $expected ) {
+		$this->display = $config['swap'];
+		$this->disable_preload = $config['disable_preload'];
+
 		add_filter( 'pre_get_rocket_option_minify_google_fonts', [ $this, 'return_true' ] );
 
-		if ( $filtered ) {
-			$this->filter_value = $filtered;
+		if ( false !== $config['swap'] ) {
 			add_filter( 'rocket_combined_google_fonts_display', [ $this, 'set_display_value' ] );
 		}
 
+		add_filter( 'rocket_disable_google_fonts_preload', [ $this, 'set_disable_preload' ] );
+
 		$actual = apply_filters( 'rocket_buffer', $original );
 
 		$this->assertSame(
@@ -86,7 +93,11 @@ public function addDataProviderV1V2() {
 		return $this->getTestData( __DIR__ . 'V1V2', 'optimize' );
 	}
 
-	public function set_display_value( $filtered ) {
-		return $this->filter_value;
+	public function set_display_value() {
+		return $this->display;
+	}
+
+	public function set_disable_preload() {
+		return $this->disable_preload;
 	}
 }
diff --git a/tests/Unit/bootstrap.php b/tests/Unit/bootstrap.php
index d2651ce533..6a3a4ad4d7 100644
--- a/tests/Unit/bootstrap.php
+++ b/tests/Unit/bootstrap.php
@@ -9,7 +9,7 @@
 
 // Set the path and URL to our virtual filesystem.
 define( 'WP_ROCKET_CACHE_ROOT_PATH', 'vfs://public/wp-content/cache/' );
-define( 'WP_ROCKET_CACHE_ROOT_URL', 'vfs://public/wp-content/cache/' );
+define( 'WP_ROCKET_CACHE_ROOT_URL', 'http://example.org/wp-content/cache/' );
 define( 'OBJECT', 'OBJECT' );
 /**
  * The original files need to loaded into memory before we mock them with Patchwork. Add files here before the unit
diff --git a/tests/Unit/inc/Engine/Media/Fonts/Context/Context/isAllowed.php b/tests/Unit/inc/Engine/Media/Fonts/Context/Context/isAllowed.php
new file mode 100644
index 0000000000..abbbb5bd40
--- /dev/null
+++ b/tests/Unit/inc/Engine/Media/Fonts/Context/Context/isAllowed.php
@@ -0,0 +1,36 @@
+<?php
+declare(strict_types=1);
+
+namespace WP_Rocket\Tests\Unit\inc\Engine\Media\Fonts\Context\Context;
+
+use Brain\Monkey\Functions;
+use Mockery;
+use WP_Rocket\Admin\Options_Data;
+use WP_Rocket\Engine\Media\Fonts\Context\Context;
+use WP_Rocket\Tests\Unit\TestCase;
+
+/**
+ * @group HostFontsLocally
+ */
+class TestIsAllowed extends TestCase {
+	/**
+	 * @dataProvider configTestData
+	 */
+	public function testShouldDoExpected( $config, $expected ) {
+		$this->donotrocketoptimize = $config['do_not_optimize'];
+
+		$options = Mockery::mock( Options_Data::class );
+		$context = new Context( $options );
+
+		Functions\when( 'rocket_bypass' )->justReturn( $config['bypass'] );
+
+		$options->shouldReceive( 'get' )
+			->with( 'host_fonts_locally', 0 )
+			->andReturn( $config['option'] );
+
+		$this->assertSame(
+			$expected,
+			$context->is_allowed( $config )
+		);
+	}
+}
diff --git a/tests/Unit/inc/Engine/Media/Fonts/Frontend/Controller/rewriteFonts.php b/tests/Unit/inc/Engine/Media/Fonts/Frontend/Controller/rewriteFonts.php
new file mode 100644
index 0000000000..d2bf5940c9
--- /dev/null
+++ b/tests/Unit/inc/Engine/Media/Fonts/Frontend/Controller/rewriteFonts.php
@@ -0,0 +1,44 @@
+<?php
+declare(strict_types=1);
+
+namespace WP_Rocket\Tests\Unit\inc\Engine\Media\Fonts\Frontend\Controller;
+
+use Brain\Monkey\Functions;
+use Mockery;
+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 TestRewriteFonts extends FilesystemTestCase {
+	protected $path_to_test_data = '/inc/Engine/Media/Fonts/Frontend/Controller/rewriteFonts.php';
+	private $context;
+	private $controller;
+
+	public function set_up() {
+		parent::set_up();
+
+		Functions\when( 'get_current_blog_id' )->justReturn( 1 );
+
+		$this->context    = Mockery::mock( Context::class );
+		$this->controller = new Controller( $this->context );
+
+		$this->stubWpParseUrl();
+	}
+
+	/**
+	 * @dataProvider providerTestData
+	 */
+	public function testShouldDoExpected( $config, $original, $expected ) {
+		$this->context->shouldReceive('is_allowed')
+			->once()
+			->andReturn( $config['is_allowed'] );
+
+		$this->assertSame(
+			$this->format_the_html( $expected ),
+			$this->format_the_html( $this->controller->rewrite_fonts( $original ) )
+		);
+	}
+}
diff --git a/tests/Unit/inc/Engine/Optimization/GoogleFonts/Combine/optimize.php b/tests/Unit/inc/Engine/Optimization/GoogleFonts/Combine/optimize.php
index b2c8e05ff4..130c11df5c 100644
--- a/tests/Unit/inc/Engine/Optimization/GoogleFonts/Combine/optimize.php
+++ b/tests/Unit/inc/Engine/Optimization/GoogleFonts/Combine/optimize.php
@@ -1,12 +1,11 @@
 <?php
+declare(strict_types=1);
 
 namespace WP_Rocket\Tests\Unit\inc\Engine\Optimization\GoogleFonts\Combine;
 
-use Brain\Monkey\Functions;
-use Brain\Monkey\Filters;
+use Brain\Monkey\{Filters, Functions};
 use Mockery;
-use WP_Rocket\Engine\Optimization\GoogleFonts\Combine;
-use WP_Rocket\Engine\Optimization\GoogleFonts\AbstractGFOptimization;
+use WP_Rocket\Engine\Optimization\GoogleFonts\{AbstractGFOptimization, Combine};
 use WP_Rocket\Tests\Unit\TestCase;
 
 /**
@@ -25,10 +24,8 @@ class Test_Optimize extends TestCase {
 	/**
 	 * @dataProvider configTestData
 	 */
-	public function testShouldCombineGoogleFonts( $html, $expected, $filtered = false ) {
-		Functions\when( 'wp_parse_url' )->alias( function( $url, $component ) {
-			return parse_url( $url, $component );
-		} );
+	public function testShouldCombineGoogleFonts( $config, $html, $expected ) {
+		$this->stubWpParseUrl();
 
 		Functions\when( 'wp_parse_args' )->alias( function( $value ) {
 			parse_str( $value, $r );
@@ -40,12 +37,17 @@ public function testShouldCombineGoogleFonts( $html, $expected, $filtered = fals
 			return str_replace( [ '&amp;', '&' ], '&#038;', $url );
 		} );
 
-		if ( false !== $filtered ) {
-			Filters\expectApplied('rocket_combined_google_fonts_display')
-				->with('swap', Mockery::type(AbstractGFOptimization::class))
-				->andReturn( $filtered );
+		if ( false !== $config['swap'] ) {
+			Filters\expectApplied( 'rocket_combined_google_fonts_display' )
+				->with('swap', Mockery::type( AbstractGFOptimization::class ) )
+				->andReturn( $config['swap'] );
 		}
 
+
+		Filters\expectApplied( 'rocket_disable_google_fonts_preload' )
+			->andReturn( $config['disable_preload'] );
+
+
 		$combine = new Combine();
 
 		$this->assertSame(
diff --git a/tests/Unit/inc/Engine/Optimization/GoogleFonts/CombineV2/optimize.php b/tests/Unit/inc/Engine/Optimization/GoogleFonts/CombineV2/optimize.php
index 5fda6ddfc4..85e5e80ff7 100644
--- a/tests/Unit/inc/Engine/Optimization/GoogleFonts/CombineV2/optimize.php
+++ b/tests/Unit/inc/Engine/Optimization/GoogleFonts/CombineV2/optimize.php
@@ -1,12 +1,11 @@
 <?php
+declare(strict_types=1);
 
 namespace WP_Rocket\Tests\Unit\inc\Engine\Optimization\GoogleFonts\CombineV2;
 
-use Brain\Monkey\Functions;
-use Brain\Monkey\Filters;
+use Brain\Monkey\{Filters, Functions};
 use Mockery;
-use WP_Rocket\Engine\Optimization\GoogleFonts\AbstractGFOptimization;
-use WP_Rocket\Engine\Optimization\GoogleFonts\CombineV2;
+use WP_Rocket\Engine\Optimization\GoogleFonts\{AbstractGFOptimization, CombineV2};
 use WP_Rocket\Tests\Unit\TestCase;
 
 /**
@@ -25,10 +24,8 @@ class Test_OptimizeV2 extends TestCase {
 	/**
 	 * @dataProvider configTestData
 	 */
-	public function testShouldCombineV2GoogleFonts( $html, $expected, $filtered = false ) {
-		Functions\when( 'wp_parse_url' )->alias( function ( $url, $component ) {
-			return parse_url( $url, $component );
-		} );
+	public function testShouldCombineV2GoogleFonts( $config, $html, $expected ) {
+		$this->stubWpParseUrl();
 
 		Functions\when( 'wp_parse_args' )->alias( function ( $value ) {
 			parse_str( $value, $r );
@@ -39,10 +36,15 @@ public function testShouldCombineV2GoogleFonts( $html, $expected, $filtered = fa
 			return str_replace( [ '&amp;', '&' ], '&#038;', $url );
 		} );
 
-		if ( false !== $filtered ) {
-			Filters\expectApplied('rocket_combined_google_fonts_display')
-				->with('swap', Mockery::type(AbstractGFOptimization::class))
-				->andReturn( $filtered );
+		if ( false !== $config['swap'] ) {
+			Filters\expectApplied( 'rocket_combined_google_fonts_display' )
+				->with('swap', Mockery::type( AbstractGFOptimization::class ) )
+				->andReturn( $config['swap'] );
+		}
+
+		if ( false !== $config['disable_preload'] ) {
+			Filters\expectApplied( 'rocket_disable_google_fonts_preload' )
+				->andReturn( $config['disable_preload'] );
 		}
 
 		$combiner = new CombineV2();