Skip to content

Commit

Permalink
Fix circle ci
Browse files Browse the repository at this point in the history
  • Loading branch information
stmh committed Sep 1, 2019
1 parent 42f8bfa commit 728dc1b
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ jobs:
key: v2-dependencies-{{ checksum "composer.json" }}

# run tests!
- run: ./vendor/bin/phpunit --exclude-group docker .
- run: ./vendor/bin/phpunit --exclude-group docker
4 changes: 3 additions & 1 deletion src/Command/BaseCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,9 @@ private function handleVariants($variants, InputInterface $input, OutputInterfac
foreach ($input->getOptions() as $name => $value) {
if ($value && !in_array($name, ['verbose', 'variants', 'blueprint', 'fabfile'])) {
$cmd[] = '--' . $name;
$cmd[]= $value;
if (!in_array($name, ['no-interaction', 'no-ansi'])) {
$cmd[] = $value;
}
}
}
$cmd[] = '--no-interaction';
Expand Down
12 changes: 8 additions & 4 deletions tests/VariantBaseCommandTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,10 @@ public function testUnavailableVariants()
));
}

/**
* @group docker
*/
private function runScript($script_name)
{
$executable = realpath($this->getcwd() . '/../bin/phab');
$path = $this->getcwd() . '/../bin/phab';
$executable = realpath($path);
putenv('PHABALICIOUS_EXECUTABLE=' . $executable);

$command = $this->application->find('script');
Expand All @@ -99,11 +97,17 @@ private function runScript($script_name)
$this->assertContains('XX-test-c-XX', $output);
}

/**
* @group docker
*/
public function testAllVariants()
{
$this->runScript('test');
}

/**
* @group docker
*/
public function testAllVariantsWithStdErr()
{
$this->runScript('testErr');
Expand Down

0 comments on commit 728dc1b

Please sign in to comment.