fix behat the right way

Raphaël Droz · Raphaël Droz · commit 31b2dc3c6372 · 2025-03-03T15:37:06.000-03:00
diff --git a/features/flags.feature b/features/flags.feature
@@ -355,7 +355,7 @@ Feature: Global flags
       """
 
   Scenario: SSH flag should support Docker
-    When I try `wp --debug --ssh=docker:user@wordpress --version`
+    When I try `WP_CLI_DOCKER_NO_INTERACTIVE=1 wp --debug --ssh=docker:user@wordpress --version`
     Then STDERR should contain:
       """
       Running SSH command: docker exec --user 'user' 'wordpress' sh -c
diff --git a/php/WP_CLI/Runner.php b/php/WP_CLI/Runner.php
@@ -593,7 +593,7 @@ private function generate_ssh_command( $bits, $wp_command ) {
 				$bits['user'] ? '--user ' . escapeshellarg( $bits['user'] ) . ' ' : '',
 				$bits['path'] ? '--workdir ' . escapeshellarg( $bits['path'] ) . ' ' : '',
 				$is_stdout_tty && ! getenv( 'WP_CLI_DOCKER_NO_TTY' ) ? '-t  ' : '',
-				$is_stdin_tty || getenv( 'WP_CLI_DOCKER_NO_INTERACTIVE' ) || getenv( 'BEHAT_RUN' ) ? '' : '-i ',
+				$is_stdin_tty || getenv( 'WP_CLI_DOCKER_NO_INTERACTIVE' ) ? '' : '-i ',
 				escapeshellarg( $bits['host'] ),
 				escapeshellarg( $wp_command )
 			);
@@ -622,7 +622,7 @@ private function generate_ssh_command( $bits, $wp_command ) {
 				$bits['user'] ? '--user ' . escapeshellarg( $bits['user'] ) . ' ' : '',
 				$bits['path'] ? '--workdir ' . escapeshellarg( $bits['path'] ) . ' ' : '',
 				$is_stdout_tty || getenv( 'WP_CLI_DOCKER_NO_TTY' ) ? '' : '-T ',
-				$is_stdin_tty || getenv( 'WP_CLI_DOCKER_NO_INTERACTIVE' ) || getenv( 'BEHAT_RUN' ) ? '' : '-i ',
+				$is_stdin_tty || getenv( 'WP_CLI_DOCKER_NO_INTERACTIVE' ) ? '' : '-i ',
 				escapeshellarg( $bits['host'] ),
 				$wp_command
 			);
