Improve old comments tests

WordPress · Sep 20, 2024 · b63b09f · b63b09f
1 parent 57bc368
commit b63b09f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/tests/phpunit/tests/link/getNextCommentsLink.php b/tests/phpunit/tests/link/getNextCommentsLink.php
@@ -11,14 +11,14 @@ public function test_page_should_respect_value_of_cpage_query_var() {
 		$p = self::factory()->post->create();
 		$this->go_to( get_permalink( $p ) );
 
-		$cpage = get_query_var( 'cpage' );
+		$old_cpage = get_query_var( 'cpage' );
 		set_query_var( 'cpage', 3 );
 
 		$link = get_next_comments_link( 'Next', 5 );
 
-		$this->assertStringContainsString( 'cpage=4', $link );
+		set_query_var( 'cpage', $old_cpage );
 
-		set_query_var( 'cpage', $cpage );
+		$this->assertStringContainsString( 'cpage=4', $link );
 	}
 
 	/**
@@ -28,14 +28,14 @@ public function test_page_should_default_to_1_when_no_cpage_query_var_is_found()
 		$p = self::factory()->post->create();
 		$this->go_to( get_permalink( $p ) );
 
-		$cpage = get_query_var( 'cpage' );
+		$old_cpage = get_query_var( 'cpage' );
 		set_query_var( 'cpage', '' );
 
 		$link = get_next_comments_link( 'Next', 5 );
 
-		$this->assertStringContainsString( 'cpage=2', $link );
+		set_query_var( 'cpage', $old_cpage );
 
-		set_query_var( 'cpage', $cpage );
+		$this->assertStringContainsString( 'cpage=2', $link );
 	}
 
 	/**

diff --git a/tests/phpunit/tests/link/getPreviousCommentsLink.php b/tests/phpunit/tests/link/getPreviousCommentsLink.php
@@ -11,29 +11,29 @@ public function test_page_should_respect_value_of_cpage_query_var() {
 		$p = self::factory()->post->create();
 		$this->go_to( get_permalink( $p ) );
 
-		$cpage = get_query_var( 'cpage' );
+		$old_cpage = get_query_var( 'cpage' );
 		set_query_var( 'cpage', 3 );
 
 		$link = get_previous_comments_link( 'Previous' );
 
-		$this->assertStringContainsString( 'cpage=2', $link );
+		set_query_var( 'cpage', $old_cpage );
 
-		set_query_var( 'cpage', $cpage );
+		$this->assertStringContainsString( 'cpage=2', $link );
 	}
 
 	public function test_page_should_default_to_1_when_no_cpage_query_var_is_found() {
 		$p = self::factory()->post->create();
 		$this->go_to( get_permalink( $p ) );
 
-		$cpage = get_query_var( 'cpage' );
+		$old_cpage = get_query_var( 'cpage' );
 		set_query_var( 'cpage', '' );
 
 		$link = get_previous_comments_link( 'Previous' );
 
+		set_query_var( 'cpage', $old_cpage );
+
 		// Technically, it returns null here.
 		$this->assertNull( $link );
-
-		set_query_var( 'cpage', $cpage );
 	}
 
 	/**