Merge 6512dac into fc188ed

Yoast · Nov 20, 2023 · 9a428ec · 9a428ec
2 parents fc188ed + 6512dac
commit 9a428ec
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 38 deletions.
diff --git a/.phpcs.xml.dist b/.phpcs.xml.dist
@@ -101,16 +101,6 @@
 		</properties>
 	</rule>
 
-	<!-- Whitelist a few non-snakecase PHPUnit properties. -->
-	<rule ref="WordPress.NamingConventions.ValidVariableName">
-		<properties>
-			<property name="customPropertiesWhitelist" type="array">
-				<element value="preserveGlobalState"/>
-				<element value="runTestInSeparateProcess"/>
-			</property>
-		</properties>
-	</rule>
-
 
 	<!--
 	#############################################################################

diff --git a/tests/Unit/Assets_Test.php b/tests/Unit/Assets_Test.php
@@ -10,23 +10,12 @@
  * Class Assets_Test.
  *
  * @covers Yoast_ACF_Analysis_Assets
+ *
+ * @preserveGlobalState disabled
+ * @runTestsInSeparateProcesses
  */
 class Assets_Test extends TestCase {
 
-	/**
-	 * Whether or not to preserve the global state.
-	 *
-	 * @var bool
-	 */
-	protected $preserveGlobalState = false;
-
-	/**
-	 * Whether or not to run each test in a separate process.
-	 *
-	 * @var bool
-	 */
-	protected $runTestInSeparateProcess = true;
-
 	/**
 	 * Test the init hook and determines whether the proper assets are loaded.
 	 *

diff --git a/tests/Unit/Dependencies/Dependency_Yoast_SEO_Test.php b/tests/Unit/Dependencies/Dependency_Yoast_SEO_Test.php
@@ -9,23 +9,11 @@
  * Class Dependency_Yoast_SEO_Test.
  *
  * @covers Yoast_ACF_Analysis_Dependency_Yoast_SEO
+ *
+ * @runTestsInSeparateProcesses
  */
 class Dependency_Yoast_SEO_Test extends TestCase {
 
-	/**
-	 * Whether or not to preserve the global state.
-	 *
-	 * @var bool
-	 */
-	protected $preserveGlobalState = false;
-
-	/**
-	 * Whether or not to run each test in a separate process.
-	 *
-	 * @var bool
-	 */
-	protected $runTestInSeparateProcess = true;
-
 	/**
 	 * Tests that requirements are not met when Yoast SEO can't be found.
 	 *