From bd5cce16a8af64cfceaa46a54ed069c610f52714 Mon Sep 17 00:00:00 2001 From: lcatlett Date: Thu, 1 Nov 2018 09:00:45 -0400 Subject: [PATCH 1/2] Fix default drush local multisite alias bug causing test failures. --- src/Robo/Commands/Generate/MultisiteCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Robo/Commands/Generate/MultisiteCommand.php b/src/Robo/Commands/Generate/MultisiteCommand.php index e74656585..c4ff08a80 100644 --- a/src/Robo/Commands/Generate/MultisiteCommand.php +++ b/src/Robo/Commands/Generate/MultisiteCommand.php @@ -187,7 +187,7 @@ protected function createNewBltSiteYml( $site_yml['project']['human_name'] = $site_name; $site_yml['project']['local']['protocol'] = $url['scheme']; $site_yml['project']['local']['hostname'] = $url['host']; - $site_yml['drush']['aliases']['local'] = $site_name . ".local"; + $site_yml['drush']['aliases']['local'] = "self"; $site_yml['drush']['aliases']['remote'] = $remote_alias; YamlMunge::mergeArrayIntoFile($site_yml, $site_yml_filename); } From 2dffec8329dd4ed0bf65b7e891c2b23e726b65ef Mon Sep 17 00:00:00 2001 From: lcatlett Date: Thu, 1 Nov 2018 09:10:05 -0400 Subject: [PATCH 2/2] Fix multisite test alias bug. --- tests/phpunit/BltProject/MultiSiteTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/phpunit/BltProject/MultiSiteTest.php b/tests/phpunit/BltProject/MultiSiteTest.php index 799b7c560..3aba676bd 100644 --- a/tests/phpunit/BltProject/MultiSiteTest.php +++ b/tests/phpunit/BltProject/MultiSiteTest.php @@ -42,7 +42,7 @@ public function testMultisiteGenerate() { $this->assertEquals("$this->site1Dir.clone", $site1_blt_yml['drush']['aliases']['remote']); $site2_blt_yml = YamlMunge::parseFile("$this->sandboxInstance/docroot/sites/$this->site2Dir/blt.yml"); - $this->assertEquals("$this->site2Dir.local", $site2_blt_yml['drush']['aliases']['local']); + $this->assertEquals("self", $site2_blt_yml['drush']['aliases']['local']); $this->assertEquals("$this->site2Dir.clone", $site2_blt_yml['drush']['aliases']['remote']); // Clone.