diff --git a/composer.json b/composer.json index 807e71a..8766d58 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,10 @@ "role": "Maintainer" } ], - "require": {}, + "require": { + "acquia/blt": "^12", + "acquia/blt-behat": "^1.1" + }, "autoload": { "psr-4": { "Lcatlett\\BltDdev\\": "./src/" diff --git a/config/.ddev/docker-compose.chrome.yml b/config/.ddev/docker-compose.chrome.yml index 3eefee0..91873b2 100644 --- a/config/.ddev/docker-compose.chrome.yml +++ b/config/.ddev/docker-compose.chrome.yml @@ -3,7 +3,7 @@ services: chrome: hostname: chrome container_name: ddev-${DDEV_SITENAME}-chrome - image: yukinying/chrome-headless-browser:64.0.3282.24 + image: mikejoconnor/headless-chromium labels: # These labels ensure this service is discoverable by ddev com.ddev.site-name: ${DDEV_SITENAME} diff --git a/src/Blt/Plugin/Commands/BehatDdevCommand.php b/src/Blt/Plugin/Commands/BehatDdevCommand.php index 3ead89f..e8293c2 100644 --- a/src/Blt/Plugin/Commands/BehatDdevCommand.php +++ b/src/Blt/Plugin/Commands/BehatDdevCommand.php @@ -2,9 +2,9 @@ namespace Lcatlett\BltDdev\Blt\Plugin\Commands; -use Acquia\Blt\Robo\Commands\Tests\BehatCommand; +use Acquia\BltBehat\Blt\Plugin\Commands\BehatTestCommand; -class BehatDdevCommand extends BehatCommand { +class BehatDdevCommand extends BehatTestCommand { /** * Executes all behat tests. diff --git a/src/Blt/Plugin/Commands/DdevCommand.php b/src/Blt/Plugin/Commands/DdevCommand.php index e558b54..3a73883 100644 --- a/src/Blt/Plugin/Commands/DdevCommand.php +++ b/src/Blt/Plugin/Commands/DdevCommand.php @@ -68,7 +68,7 @@ public function ddevProjectInit() { public function ddevInit() { $this->say('Generating ddev project config'); $result = $this->taskExecStack() - ->exec("ddev config --docroot docroot --project-type drupal8 --project-name \"{$this->getConfigValue('project.machine_name')}\"") + ->exec("ddev config --docroot docroot --project-type drupal9 --project-name \"{$this->getConfigValue('project.machine_name')}\"") ->run(); if (!$result->wasSuccessful()) { @@ -127,7 +127,7 @@ public function ddevConfig() { } // Re-init settings after old settings are removed.. - $this->invokeCommand('tests:behat:init:config'); + $this->invokeCommand('recipes:behat:init'); } } }