From a02c3897cc75ca662453e0cf312c805b6c4f1927 Mon Sep 17 00:00:00 2001 From: Weston Ruter Date: Tue, 15 Aug 2023 17:52:35 -0700 Subject: [PATCH] Fix tests for output_buffering setting --- tests/admin/server-timing-tests.php | 2 +- tests/server-timing/load-tests.php | 22 +++++++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/tests/admin/server-timing-tests.php b/tests/admin/server-timing-tests.php index 47262e4af7..a31ca69e39 100644 --- a/tests/admin/server-timing-tests.php +++ b/tests/admin/server-timing-tests.php @@ -57,7 +57,7 @@ public function test_perflab_load_server_timing_page() { array_keys( $wp_settings_fields[ PERFLAB_SERVER_TIMING_SCREEN ] ) ); $this->assertEqualSets( - array( 'benchmarking_actions', 'benchmarking_filters' ), + array( 'benchmarking_actions', 'benchmarking_filters', 'output_buffering' ), array_keys( $wp_settings_fields[ PERFLAB_SERVER_TIMING_SCREEN ]['benchmarking'] ) ); } diff --git a/tests/server-timing/load-tests.php b/tests/server-timing/load-tests.php index b695bdc64d..7d6fd3e2c7 100644 --- a/tests/server-timing/load-tests.php +++ b/tests/server-timing/load-tests.php @@ -103,39 +103,43 @@ public function data_perflab_sanitize_server_timing_setting() { ), 'empty list, array' => array( array( 'benchmarking_actions' => array() ), - array( 'benchmarking_actions' => array() ), + array( 'benchmarking_actions' => array(), 'output_buffering' => false ), ), 'empty list, string' => array( array( 'benchmarking_actions' => '' ), - array( 'benchmarking_actions' => array() ), + array( 'benchmarking_actions' => array(), 'output_buffering' => false ), ), 'empty list, string with whitespace' => array( array( 'benchmarking_actions' => ' ' ), - array( 'benchmarking_actions' => array() ), + array( 'benchmarking_actions' => array(), 'output_buffering' => false ), ), 'regular list, array' => array( array( 'benchmarking_actions' => array( 'after_setup_theme', 'init', 'wp_loaded' ) ), - array( 'benchmarking_actions' => array( 'after_setup_theme', 'init', 'wp_loaded' ) ), + array( 'benchmarking_actions' => array( 'after_setup_theme', 'init', 'wp_loaded' ), 'output_buffering' => false ), ), 'regular list, string' => array( array( 'benchmarking_actions' => "after_setup_theme\ninit\nwp_loaded" ), - array( 'benchmarking_actions' => array( 'after_setup_theme', 'init', 'wp_loaded' ) ), + array( 'benchmarking_actions' => array( 'after_setup_theme', 'init', 'wp_loaded' ), 'output_buffering' => false ), ), 'regular list, string with whitespace' => array( array( 'benchmarking_actions' => "after_setup_ theme \ninit \n\nwp_loaded\n" ), - array( 'benchmarking_actions' => array( 'after_setup_theme', 'init', 'wp_loaded' ) ), + array( 'benchmarking_actions' => array( 'after_setup_theme', 'init', 'wp_loaded' ), 'output_buffering' => false ), ), 'regular list, array with duplicates' => array( array( 'benchmarking_actions' => array( 'after_setup_theme', 'init', 'wp_loaded', 'init' ) ), - array( 'benchmarking_actions' => array( 'after_setup_theme', 'init', 'wp_loaded' ) ), + array( 'benchmarking_actions' => array( 'after_setup_theme', 'init', 'wp_loaded' ), 'output_buffering' => false ), ), 'regular list, array with special hook chars' => array( array( 'benchmarking_actions' => array( 'namespace/hookname', 'namespace.hookname' ) ), - array( 'benchmarking_actions' => array( 'namespace/hookname', 'namespace.hookname' ) ), + array( 'benchmarking_actions' => array( 'namespace/hookname', 'namespace.hookname' ), 'output_buffering' => false ), + ), + 'output buffering enabled' => array( + array( 'output_buffering' => 'on' ), + array( 'output_buffering' => true ), ), 'regular list, disallowed key' => array( array( 'not_allowed' => array( 'after_setup_theme', 'init', 'wp_loaded' ) ), - array(), + array( 'output_buffering' => false ), ), ); }