diff --git a/config/runner.yml b/config/runner.yml index 3fd350c1..db6fbc43 100644 --- a/config/runner.yml +++ b/config/runner.yml @@ -3,7 +3,7 @@ runner: drupal: core: "8" - root: "./build" + root: "build" base-url: "http://127.0.0.1:8888" site: name: "Site name" diff --git a/src/Commands/DrupalCommands.php b/src/Commands/DrupalCommands.php index aee45fbd..da893954 100644 --- a/src/Commands/DrupalCommands.php +++ b/src/Commands/DrupalCommands.php @@ -87,8 +87,8 @@ public function siteInstall(array $options = [ { return $this->taskExec($this->getBin('drush')) ->option('-y') + ->rawArg("--root=$(pwd)/".$options['root']) ->options([ - 'root' => $options['root'], 'site-name' => $options['site-name'], 'site-mail' => $options['site-mail'], 'locale' => $options['site-locale'], diff --git a/tests/fixtures/setup.yml b/tests/fixtures/setup.yml index ecc7219f..0609d946 100644 --- a/tests/fixtures/setup.yml +++ b/tests/fixtures/setup.yml @@ -3,7 +3,7 @@ test1: ${drupal.root} test2: ${drupal.core} expected: > - test1: ./build + test1: build test2: 8 - command: setup:behat diff --git a/tests/fixtures/simulation.yml b/tests/fixtures/simulation.yml index 00e0a67e..22bb038c 100644 --- a/tests/fixtures/simulation.yml +++ b/tests/fixtures/simulation.yml @@ -2,13 +2,13 @@ configuration: [] composer: '' contains: - - "[Simulator] Running ./vendor/bin/drush -y --root=./build --site-name='Site name' --site-mail=info@example.org --locale=en --account-mail=admin@example.org --account-name=admin --account-pass=admin --exclude=./build --db-url='mysql://root:root@127.0.0.1:3306/drupal' site-install standard" + - "[Simulator] Running ./vendor/bin/drush -y --root=$(pwd)/build --site-name='Site name' --site-mail=info@example.org --locale=en --account-mail=admin@example.org --account-name=admin --account-pass=admin --exclude=build --db-url='mysql://root:root@127.0.0.1:3306/drupal' site-install standard" - command: 'drupal:site-install --site-name="Test site"' configuration: [] composer: '' contains: - - "[Simulator] Running ./vendor/bin/drush -y --root=./build --site-name='Test site' --site-mail=info@example.org --locale=en --account-mail=admin@example.org --account-name=admin --account-pass=admin --exclude=./build --db-url='mysql://root:root@127.0.0.1:3306/drupal' site-install standard" + - "[Simulator] Running ./vendor/bin/drush -y --root=$(pwd)/build --site-name='Test site' --site-mail=info@example.org --locale=en --account-mail=admin@example.org --account-name=admin --account-pass=admin --exclude=build --db-url='mysql://root:root@127.0.0.1:3306/drupal' site-install standard" - command: 'drupal:site-install --site-mail="test@example.com" --site-profile=minimal' configuration: [] @@ -20,29 +20,29 @@ - command: 'drupal:site-install' configuration: drupal: - root: './test' + root: 'test' site: profile: 'minimal' composer: '' contains: - - "./vendor/bin/drush -y --root=./test" + - "./vendor/bin/drush -y --root=$(pwd)/test" - "site-install minimal" -- command: 'drupal:site-install --root="./overridden"' +- command: 'drupal:site-install --root="overridden"' configuration: drupal: root: './test' composer: '' contains: - - "./vendor/bin/drush -y --root=./overridden" + - "./vendor/bin/drush -y --root=$(pwd)/overridden" -- command: 'drupal:site-install --root="./overridden"' +- command: 'drupal:site-install --root="overridden"' configuration: runner: bin-dir: "./bin" composer: '' contains: - - "./bin/drush -y --root=./overridden" + - "./bin/drush -y --root=$(pwd)/overridden" - command: 'changelog:generate' configuration: @@ -84,11 +84,11 @@ "type": "drupal-module" } contains: - - "symlink('.', './build/modules/custom/bar')" + - "symlink('.', 'build/modules/custom/bar')" - "[Simulator] Running ./vendor/bin/run 'setup:behat'" - "[Simulator] Running ./vendor/bin/run 'setup:phpunit'" - - "WriteConfiguration('./build/sites/default/drushrc.php'" - - "AppendConfiguration('./build/sites/default/default.settings.php'" + - "WriteConfiguration('build/sites/default/drushrc.php'" + - "AppendConfiguration('build/sites/default/default.settings.php'" - command: 'drupal:component-scaffold' configuration: @@ -112,7 +112,7 @@ "type": "drupal-module" } contains: - - "symlink('.', './build/sites/all/modules/custom/bar')" + - "symlink('.', 'build/sites/all/modules/custom/bar')" - command: 'drupal:component-scaffold' configuration: @@ -124,4 +124,4 @@ "type": "drupal-theme" } contains: - - "symlink('.', './build/sites/all/themes/custom/bar')" + - "symlink('.', 'build/sites/all/themes/custom/bar')" diff --git a/tests/fixtures/tasks/replace-config-tokens/task.yml b/tests/fixtures/tasks/replace-config-tokens/task.yml index d2aea03e..163053ef 100644 --- a/tests/fixtures/tasks/replace-config-tokens/task.yml +++ b/tests/fixtures/tasks/replace-config-tokens/task.yml @@ -3,7 +3,7 @@ two: three: ${drupal.core} expected: - one: "./build" + one: "build" two: three: "8" @@ -19,4 +19,4 @@ - source: concat: "${drupal.core}/${drupal.root}" expected: - concat: "8/./build" + concat: "8/build"