From 4677fccd9b4effbf95e6b16f5de350b126d8fa84 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Thu, 29 Nov 2018 17:21:38 +0100
Subject: [PATCH] Grab the projectname vrom Docker4Drupal Use container
internal baseurl by default
---
composer.json | 2 +-
src/Handler.php | 12 ++++++++++--
templates/behat.yml.twig | 2 +-
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/composer.json b/composer.json
index 97d20a5..9220ef1 100644
--- a/composer.json
+++ b/composer.json
@@ -39,7 +39,7 @@
"jcalderonzumba/gastonjs": "^1.2",
"jcalderonzumba/mink-phantomjs-driver": "^0.3",
"lakedrops/composer-scripts": "^1.1.0",
- "lakedrops/docker4drupal": "^1.0.0",
+ "lakedrops/docker4drupal": "^1.8.6",
"lakedrops/dotenv": "^1.0.0",
"php": ">=5.6",
"twig/twig": "^1.23.1"
diff --git a/src/Handler.php b/src/Handler.php
index 0a8d9da..3e92a90 100644
--- a/src/Handler.php
+++ b/src/Handler.php
@@ -5,6 +5,7 @@ namespace LakeDrops\Behat4Drupal;
use Composer\Script\Event;
use LakeDrops\Component\Composer\BaseHandler;
use LakeDrops\Component\Dotenv\Dotenv;
+use LakeDrops\Docker4Drupal\Handler as D4DHandler;
use Symfony\Component\Filesystem\Filesystem;
use Symfony\Component\Yaml\Yaml;
@@ -112,13 +113,20 @@ class Handler extends BaseHandler {
* The settings from the extra configuration.
*/
protected function getOptions() {
- $projectname = str_replace([' ', '-', '_', '.'], '', basename(getcwd()));
+ $handler = new D4DHandler($this->composer, $this->io);
+ $projectname = $handler->getOptions('projectname');
+ $webserver = $handler->getOptions('webserver');
+
$env = new Dotenv('behat4drupal', $this->io);
- $env->put('COMPOSE_PROJECT_NAME', $projectname);
$extra = $this->composer->getPackage()->getExtra() + ['behat4drupal' => []];
$options = $extra['behat4drupal'] + [
'projectname' => $projectname,
];
+
+ $options['baseurl'] = empty($options['global']) ?
+ $webserver['type'] :
+ $projectname . '.docker.localhost:8000';
+
return $env->replaceEnvironmentVariables($options);
}
diff --git a/templates/behat.yml.twig b/templates/behat.yml.twig
index f607d08..a61be25 100644
--- a/templates/behat.yml.twig
+++ b/templates/behat.yml.twig
@@ -18,7 +18,7 @@ default:
drush:
alias: default.dev
Behat\MinkExtension:
- base_url: http://{{ projectname }}.docker.localhost:8000
+ base_url: http://{{ baseurl }}
goutte: ~
default_session: goutte
javascript_session: MyLocalChrome
--
GitLab