improve behat tests

features/makefile/make_docs_build.feature

@@ -10,7 +10,8 @@ Feature: Use make docs build command
         And it should execute "sphinx-build"
 
     Scenario: Override make docs build command
-        When I override makefile "docs-build" command with "echo 'test'"
+        When I override makefile "docs-build" command with "echo 'test'" and "make docs-build-default"
         Then the command make "docs-build" should exist
-        Then it should execute "echo 'test'"
+        And it should execute "echo 'test'"
+        And it should execute "make docs-build-default"
         But it should not execute "sphinx-build"

features/makefile/make_install.feature

@@ -14,7 +14,8 @@ Feature: Use make install command
         And it should execute "yarn build"
 
     Scenario: Override make install command
-        When I override makefile install command with "echo 'test'"
+        When I override makefile install command with "echo 'test'" and "make install-default"
         Then the command make install should exist
-        Then it should execute "echo 'test'"
+        And it should execute "echo 'test'"
+        And it should execute "make install-default"
         But it should not execute "composer install"

features/makefile/make_start.feature

@@ -10,7 +10,8 @@ Feature: Use make start command
         And it should execute "server:start"
 
     Scenario: Override make start command
-        When I override makefile start command with "echo 'test'"
+        When I override makefile start command with "echo 'test'" and "make start-default"
         Then the command make start should exist
-        Then it should execute "echo 'test'"
+        And it should execute "echo 'test'"
+        And it should execute "make start-default"
         But it should not execute "server:start"

features/makefile/make_stop.feature

@@ -9,8 +9,9 @@ Feature: Use make stop command
         Then the command make stop should exist
         And it should execute "server:stop"
 
-    Scenario: Override make start command
-        When I override makefile stop command with "echo 'test'"
+    Scenario: Override make stop command
+        When I override makefile stop command with "echo 'test'" and "make stop-default"
         Then the command make stop should exist
-        Then it should execute "echo 'test'"
+        And it should execute "echo 'test'"
+        And it should execute "make stop-default"
         But it should not execute "server:stop"

features/makefile/make_test.feature

@@ -39,7 +39,8 @@ Feature: Use make test command
         And it should execute "behat"
 
     Scenario: Override make test command
-        When I override makefile test command with "echo 'test'"
+        When I override makefile test command with "echo 'test'" and "make test-default"
         Then the command make test should exist
-        Then it should execute "echo 'test'"
+        And it should execute "echo 'test'"
+        And it should execute "make test-default"
         But it should not execute "composer validate"

src/Behat/Context/Cli/MakefileContext.php

@@ -40,16 +40,19 @@ public function useDefaultMakeFileCommands()
     }
 
     /**
-     * @When I override makefile :commandName command with :data
+     * @When I override makefile :commandName command with :firstData
+     * @When I override makefile :commandName command with :firstdata and :secondData
      */
-    public function overrideCommandWithData(string $commandName, string $data)
+    public function overrideCommandWithData(string $commandName, ...$data)
     {
+        $commandData = implode("\n\t", $data);
+
         $this->ensureMakeFileDirExist();
         $this->writeMakefileData(<<<EOM
 include Makefile.dist
 
 $commandName:
-\t$data
+\t$commandData
 
 EOM
         );