Make additional adjustments to template

Author: westonruter

plugins/optimization-detective/tests/test-optimization.php

@@ -31,15 +31,13 @@ public function set_up(): void {
 		$this->original_request_uri    = $_SERVER['REQUEST_URI'];
 		$this->original_request_method = $_SERVER['REQUEST_METHOD'];
 		$this->default_mimetype        = (string) ini_get( 'default_mimetype' );
-		$GLOBALS['template']           = '/path/to/theme/index.php';
 	}
 
 	public function tear_down(): void {
 		$_SERVER['REQUEST_URI']    = $this->original_request_uri;
 		$_SERVER['REQUEST_METHOD'] = $this->original_request_method;
 		ini_set( 'default_mimetype', $this->default_mimetype ); // phpcs:ignore WordPress.PHP.IniSet.Risky
 		unset( $GLOBALS['wp_customize'] );
-		unset( $GLOBALS['template'] );
 		parent::tear_down();
 	}
 

tests/class-optimization-detective-test-helpers.php

@@ -27,7 +27,7 @@ trait Optimization_Detective_Test_Helpers {
 	 */
 	public function populate_url_metrics( array $elements, bool $complete = true ): void {
 		$slug        = od_get_url_metrics_slug( od_get_normalized_query_vars() );
-		$etag        = od_get_current_url_metrics_etag( new OD_Tag_Visitor_Registry(), new WP_Query(), 'index.php' ); // Note: Tests rely on the od_current_url_metrics_etag_data filter to set the desired value.
+		$etag        = od_get_current_url_metrics_etag( new OD_Tag_Visitor_Registry(), new WP_Query(), trailingslashit( get_template_directory() ) . 'index.php' ); // Note: Tests rely on the od_current_url_metrics_etag_data filter to set the desired value.
 		$sample_size = $complete ? od_get_url_metrics_breakpoint_sample_size() : 1;
 		foreach ( array_merge( od_get_breakpoint_max_widths(), array( 1000 ) ) as $viewport_width ) {
 			for ( $i = 0; $i < $sample_size; $i++ ) {
@@ -81,7 +81,7 @@ public function get_sample_dom_rect(): array {
 	public function get_sample_url_metric( array $params ): OD_URL_Metric {
 		$params = array_merge(
 			array(
-				'etag'           => od_get_current_url_metrics_etag( new OD_Tag_Visitor_Registry(), new WP_Query(), 'index.php' ), // Note: Tests rely on the od_current_url_metrics_etag_data filter to set the desired value.
+				'etag'           => od_get_current_url_metrics_etag( new OD_Tag_Visitor_Registry(), new WP_Query(), trailingslashit( get_template_directory() ) . 'index.php' ), // Note: Tests rely on the od_current_url_metrics_etag_data filter to set the desired value.
 				'url'            => home_url( '/' ),
 				'viewport_width' => 480,
 				'elements'       => array(),