From 12f91b86beac22b14e036a148492297457358050 Mon Sep 17 00:00:00 2001 From: thelovekesh Date: Fri, 19 Jan 2024 00:46:31 +0530 Subject: [PATCH] Update setup and teardown fixtures in test cases --- ...est-class-wp-service-worker-caching-routes.php | 4 ++-- ...-class-wp-service-worker-precaching-routes.php | 4 ++-- tests/test-class-wp-customize-manager.php | 15 +++++++++++---- tests/test-class-wp-service-worker-scripts.php | 8 ++++---- tests/test-class-wp-service-workers.php | 8 ++++---- tests/test-class-wp-web-app-manifest.php | 8 ++++---- tests/test-service-workers.php | 4 ++-- 7 files changed, 29 insertions(+), 22 deletions(-) diff --git a/tests/components/test-class-wp-service-worker-caching-routes.php b/tests/components/test-class-wp-service-worker-caching-routes.php index ebaad84e3..fecf993d6 100644 --- a/tests/components/test-class-wp-service-worker-caching-routes.php +++ b/tests/components/test-class-wp-service-worker-caching-routes.php @@ -26,8 +26,8 @@ class Test_WP_Service_Worker_Caching_Routes extends TestCase { * * @inheritdoc */ - public function setUp() { - parent::setUp(); + public function set_up() { + parent::set_up(); $this->instance = new WP_Service_Worker_Caching_Routes(); } diff --git a/tests/components/test-class-wp-service-worker-precaching-routes.php b/tests/components/test-class-wp-service-worker-precaching-routes.php index 377547073..3c167802d 100644 --- a/tests/components/test-class-wp-service-worker-precaching-routes.php +++ b/tests/components/test-class-wp-service-worker-precaching-routes.php @@ -26,8 +26,8 @@ class Test_WP_Service_Worker_Precaching_Routes extends TestCase { * * @inheritdoc */ - public function setUp() { - parent::setUp(); + public function set_up() { + parent::set_up(); $this->instance = new WP_Service_Worker_Precaching_Routes(); } diff --git a/tests/test-class-wp-customize-manager.php b/tests/test-class-wp-customize-manager.php index f89a65674..ba1d5b6be 100644 --- a/tests/test-class-wp-customize-manager.php +++ b/tests/test-class-wp-customize-manager.php @@ -19,13 +19,20 @@ class Test_WP_Customize_Manager extends TestCase { */ public $wp_customize; + /** + * User ID. + * + * @var int + */ + public $user_id; + /** * Setup. * * @inheritdoc */ - public function setUp() { - parent::setUp(); + public function set_up() { + parent::set_up(); $this->user_id = self::factory()->user->create( array( 'role' => 'administrator' ) ); wp_set_current_user( $this->user_id ); @@ -39,10 +46,10 @@ public function setUp() { /** * Tear down. */ - public function tearDown() { + public function tear_down() { $this->wp_customize = null; unset( $GLOBALS['wp_customize'] ); - parent::tearDown(); + parent::tear_down(); } /** diff --git a/tests/test-class-wp-service-worker-scripts.php b/tests/test-class-wp-service-worker-scripts.php index b22a66ecf..226f7712a 100644 --- a/tests/test-class-wp-service-worker-scripts.php +++ b/tests/test-class-wp-service-worker-scripts.php @@ -24,9 +24,9 @@ class Test_WP_Service_Worker_Scripts extends TestCase { * * @inheritdoc */ - public function setUp() { + public function set_up() { global $wp_actions, $wp_service_workers; - parent::setUp(); + parent::set_up(); unset( $wp_actions['wp_default_service_workers'] ); $wp_service_workers = null; @@ -36,8 +36,8 @@ public function setUp() { /** * Tear down. */ - public function tearDown() { - parent::tearDown(); + public function tear_down() { + parent::tear_down(); unset( $GLOBALS['wp_service_workers'] ); } diff --git a/tests/test-class-wp-service-workers.php b/tests/test-class-wp-service-workers.php index 465eb5a69..a50e9c43d 100644 --- a/tests/test-class-wp-service-workers.php +++ b/tests/test-class-wp-service-workers.php @@ -24,9 +24,9 @@ class Test_WP_Service_Workers extends TestCase { * * @inheritdoc */ - public function setUp() { + public function set_up() { global $wp_actions, $wp_service_workers; - parent::setUp(); + parent::set_up(); unset( $wp_actions['wp_default_service_workers'] ); $wp_service_workers = null; @@ -36,8 +36,8 @@ public function setUp() { /** * Tear down. */ - public function tearDown() { - parent::tearDown(); + public function tear_down() { + parent::tear_down(); unset( $GLOBALS['wp_service_workers'] ); } diff --git a/tests/test-class-wp-web-app-manifest.php b/tests/test-class-wp-web-app-manifest.php index 473e0fd16..bbc9d9ce5 100644 --- a/tests/test-class-wp-web-app-manifest.php +++ b/tests/test-class-wp-web-app-manifest.php @@ -61,8 +61,8 @@ class Test_WP_Web_App_Manifest extends TestCase { * * @inheritdoc */ - public function setUp() { - parent::setUp(); + public function set_up() { + parent::set_up(); $this->instance = new WP_Web_App_Manifest(); } @@ -71,7 +71,7 @@ public function setUp() { * * @inheritdoc */ - public function tearDown() { + public function tear_down() { global $_wp_theme_features; // Calling remove_theme_mod( 'custom-background' ) causes an undefined index error unless 'wp-head-callback' is set. @@ -80,7 +80,7 @@ public function tearDown() { delete_option( 'site_icon' ); remove_filter( 'pwa_background_color', array( $this, 'mock_background_color' ) ); remove_filter( 'rest_api_init', array( $this->instance, 'register_manifest_rest_route' ) ); - parent::tearDown(); + parent::tear_down(); } /** diff --git a/tests/test-service-workers.php b/tests/test-service-workers.php index 4e9eb8090..ad4eaa58e 100644 --- a/tests/test-service-workers.php +++ b/tests/test-service-workers.php @@ -15,8 +15,8 @@ class Test_Service_Workers_Includes extends TestCase { /** * Tear down. */ - public function tearDown() { - parent::tearDown(); + public function tear_down() { + parent::tear_down(); $this->disable_permalinks(); }