Merge branch 'main' into try/os

Author: swissspidy

features/behat-steps.feature

@@ -278,6 +278,15 @@ Feature: Test that WP-CLI Behat steps work as expected
     Then STDOUT should not be empty
     And the return code should be 0
 
+  @require-wp
+  Scenario: Test WP installation steps
+    Given a WP 6.8 installation
+    When I run `wp core version`
+    Then STDOUT should contain:
+      """
+      6.8
+      """
+
   @require-wp
   Scenario: Test WP files and wp-config.php steps
     Given an empty directory
@@ -298,8 +307,6 @@ Feature: Test that WP-CLI Behat steps work as expected
     Then STDOUT should not be empty
     And the return code should be 0
 
-
-
   @require-wp
   Scenario: Test version string comparison
     Given a WP installation
@@ -376,6 +383,12 @@ Feature: Test that WP-CLI Behat steps work as expected
       WP_CONTENT_DIR
       """
 
+  @require-wp
+  Scenario: Test WP multisite installation
+    Given a WP multisite installation
+    When I run `wp core is-installed`
+    Then the return code should be 0
+
   @require-wp
   Scenario: Test WP multisite subdirectory installation
     Given a WP multisite subdirectory installation

src/Context/GivenStepDefinitions.php

@@ -399,7 +399,7 @@ public function given_a_database(): void {
 	 *
 	 * @access public
 	 *
-	 * @Given /^a WP( [^\s]+)? install(?:ation)?$/
+	 * @Given /^a WP( \d[^\s]+)? install(?:ation)?$/
 	 *
 	 * @param string $version Optional version number (may include leading space)
 	 */