Update setup and teardown fixtures in test cases

GoogleChromeLabs · Jan 18, 2024 · 12f91b8 · 12f91b8
1 parent 4f4173a
commit 12f91b8
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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();
 	}