Permalink
Browse files

Fix profile in site-install.

  • Loading branch information...
1 parent be621fc commit 0b2539d90a14bc905f7ebdf98dd9a7ceade4a6e4 @weitzman weitzman committed Feb 13, 2017
Showing with 3 additions and 4 deletions.
  1. +1 −1 lib/Drush/Commands/core/SiteInstallCommands.php
  2. +2 −3 tests/pmEnDisUnListInfoTest.php
@@ -125,7 +125,7 @@ function determineProfile($profile, $options, $class_loader) {
$this->logger()->info(dt("Using 'minimal' install profile since --config-dir option was provided."));
$profile = 'minimal';
}
- else {
+ elseif(!isset($profile)) {
$profile = drupal_get_profile() ?: 'standard';
}
return $profile;
@@ -70,9 +70,8 @@ public function testEnDisUnList() {
$this->assertEquals($output->{$key}, $value);
}
- // Test the testing install profile theme is installed.
- $themeToCheck = UNISH_DRUPAL_MAJOR_VERSION >= 8 ? 'classy' : (UNISH_DRUPAL_MAJOR_VERSION == 7 ? 'bartik' : 'garland');
- $this->assertTrue(in_array($themeToCheck, $list), 'Themes are in the pm-list');
+ // Test the testing install profile theme is installed.;
+ $this->assertTrue(in_array('classy', $list), 'Themes are in the pm-list');
// Test cache was cleared after enabling a module.
$table = UNISH_DRUPAL_MAJOR_VERSION >= 8 ? 'router' : 'menu_router';

0 comments on commit 0b2539d

Please sign in to comment.