Add to when_i_run_from_a_subfolder

Author: swissspidy

src/Context/FeatureContext.php

@@ -683,6 +683,23 @@ public function __construct() {
 		$this->set_cache_dir();
 	}
 
+	/**
+	 * Enhances a `wp <command>` string with an additional `--require` for code coverage collection.
+	 *
+	 * Only applies if `WP_CLI_TEST_COVERAGE` is set.
+	 *
+	 * @param string $cmd Command string.
+	 * @return string Possibly enhanced command string.
+	 */
+	public function get_command_with_coverage( $cmd ) {
+		$with_code_coverage = (string) getenv( 'WP_CLI_TEST_COVERAGE' );
+		if ( \in_array( $with_code_coverage, [ 'true', '1' ], true ) ) {
+			return preg_replace( '/(^wp )|( wp )|(\/wp )/', '$1$2$3--require={SRC_DIR}/utils/generate-coverage.php ', $cmd );
+		}
+
+		return $cmd;
+	}
+
 	/**
 	 * Replace standard {VARIABLE_NAME} variables and the special {INVOKE_WP_CLI_WITH_PHP_ARGS-args} and {WP_VERSION-version-latest} variables.
 	 * Note that standard variable names can only contain uppercase letters, digits and underscores and cannot begin with a digit.

src/Context/WhenStepDefinitions.php

@@ -35,11 +35,7 @@ public function when_i_launch_in_the_background( $cmd ) {
 	 * @When /^I (run|try) `([^`]+)`$/
 	 */
 	public function when_i_run( $mode, $cmd ) {
-		$with_code_coverage = (string) getenv( 'WP_CLI_TEST_COVERAGE' );
-		if ( \in_array( $with_code_coverage, [ 'true', '1' ], true ) ) {
-			$cmd = preg_replace( '/(^wp )|( wp )|(\/wp )/', '$1$2$3--require={SRC_DIR}/utils/generate-coverage.php ', $cmd );
-		}
-
+		$cmd          = $this->get_command_with_coverage( $cmd );
 		$cmd          = $this->replace_variables( $cmd );
 		$this->result = $this->wpcli_tests_invoke_proc( $this->proc( $cmd ), $mode );
 		list( $this->result->stdout, $this->email_sends ) = $this->wpcli_tests_capture_email_sends( $this->result->stdout );
@@ -49,6 +45,7 @@ public function when_i_run( $mode, $cmd ) {
 	 * @When /^I (run|try) `([^`]+)` from '([^\s]+)'$/
 	 */
 	public function when_i_run_from_a_subfolder( $mode, $cmd, $subdir ) {
+		$cmd          = $this->get_command_with_coverage( $cmd );
 		$cmd          = $this->replace_variables( $cmd );
 		$this->result = $this->wpcli_tests_invoke_proc( $this->proc( $cmd, array(), $subdir ), $mode );
 		list( $this->result->stdout, $this->email_sends ) = $this->wpcli_tests_capture_email_sends( $this->result->stdout );