Cleanup Behat test exec.

acquia · Apr 10, 2017 · d2da7d2 · d2da7d2
1 parent 514b302
commit d2da7d2
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/bin/blt b/bin/blt
@@ -9,6 +9,7 @@ if (!isset($autoload)) {
 }
 
 $robo_commands = [
+  'tests:configure-phantomjs',
   'tests:all',
   'tests:behat',
   'tests:phpunit',

diff --git a/phing/tasks/ci.xml b/phing/tasks/ci.xml
@@ -10,8 +10,6 @@
 
   <target name="ci:pipelines:init" description="Initializes default Acquia Pipelines configuration for this project.">
     <copy file="${blt.root}/scripts/pipelines/acquia-pipelines.yml" tofile="${repo.root}/acquia-pipelines.yml"/>
-    <echo>Acquia Pipelines requires PhantomJS in order to run Javascript Behat tests.</echo>
-    <exec dir="${repo.root}" command="blt setup:phantomjs" passthru="true"/>
   </target>
 
   <target name="ci:travis:init" description="Initializes default Travis CI configuration for this project.">

diff --git a/scripts/blt/ci/internal/run_tests.sh b/scripts/blt/ci/internal/run_tests.sh
@@ -8,7 +8,7 @@ yaml-cli update:value blt/project.yml project.local.hostname '127.0.0.1:8888'
 yaml-cli update:value blt/project.yml cm.strategy none
 blt validate:all
 blt ci:setup -Dcreate_alias=false
-blt tests:all --define behat.run-server=true
+blt tests:all --define behat.run-server=true --yes
 drush config-export --root=docroot -y
 
 # Test core-only config management.

diff --git a/scripts/pipelines/run_tests b/scripts/pipelines/run_tests
@@ -9,6 +9,6 @@ sudo /etc/init.d/mysql start
 
 blt validate:all
 blt ci:setup -Dcreate_alias=false
-blt tests:all -D behat.run-server=true -D behat.launch-selenium=false -D behat.launch-phantomjs=true -D behat.tags='~experimental'
+blt tests:all -D behat.run-server=true -D behat.launch-selenium=false -D behat.launch-phantomjs=true -D behat.tags='~experimental' --yes
 
 set +v
diff --git a/src/Robo/Commands/Tests/BehatCommand.php b/src/Robo/Commands/Tests/BehatCommand.php
@@ -142,7 +142,7 @@ protected function killPhantomJs() {
    *
    * Sometimes the download fails during `composer install`.
    *
-   * @command setup:phantomjs
+   * @command tests:configure-phantomjs
    *
    * @validatePhantomJsIsConfigured
    */