From b6d9ed26a4395048b4d75904d286c8cc459670b5 Mon Sep 17 00:00:00 2001
From: Bec White <white@palantir.net>
Date: Fri, 7 Jan 2022 13:48:31 -0600
Subject: [PATCH] Change the behat command to use depending on whether ddev is
 available.

---
 defaults/install/build.xml | 2 +-
 targets/the-build.xml      | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/defaults/install/build.xml b/defaults/install/build.xml
index c5267f3c..b74428c3 100644
--- a/defaults/install/build.xml
+++ b/defaults/install/build.xml
@@ -103,7 +103,7 @@
 
     <!-- Target: behat -->
     <target name="behat" description="Run the Behat tests.">
-        <property name="behat.command" value="vendor/bin/behat ${behat.args}" />
+        <property name="behat.command" value="${behat.bin} ${behat.args}" />
         <echo msg="$> ${behat.command}" />
         <exec command="${behat.command}" logoutput="true" checkreturn="true" />
     </target>
diff --git a/targets/the-build.xml b/targets/the-build.xml
index 24dfea0d..0740cbcd 100644
--- a/targets/the-build.xml
+++ b/targets/the-build.xml
@@ -87,9 +87,11 @@
     <!-- Use the project directory name as the project name, if it's not configured. -->
     <basename property="projectname" file="${build.dir}" suffix="local" />
 
-    <!-- Configure the 'drush' Phing task. By default, we run the installed drush. -->
+    <!-- Configure binaries to run depending on whether we're inside of ddev or out. -->
     <property name="drush.bin" value="${build.dir}/vendor/bin/drush" />
-    <!-- If this is a ddev project, and we're outside of ddev, run ddev's drush command instead.  -->
+    <property name="behat.bin" value="${build.dir}/vendor/bin/behat" />
+
+    <!-- If this is a ddev project, and we're outside of ddev, run these commands within ddev.  -->
     <exec command="which ddev" returnProperty="which_ddev" />
     <if>
         <and>
@@ -99,6 +101,7 @@
         </and>
         <then>
             <property name="drush.bin" value="ddev drush" override="true" />
+            <property name="behat.bin" value="ddev . vendor/bin/behat" override="true" />
         </then>
     </if>