tonyair
/
silverstripe-behat-extension
mirror of https://github.com/silverstripe/silverstripe-behat-extension
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #154 from sminnee/dont-double-load-suite 

FIX: Don't load suite twice.
This commit is contained in:
Damian Mooyman 2017-05-05 10:36:49 +12:00 committed by GitHub
parent 7fd508b9af 9b48a30e2b
commit 7383c1bce9
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Controllers/ModuleSuiteLocator.php
View File

@ -101,24 +101,16 @@ class ModuleSuiteLocator implements Controller
// Suite name always omits vendor // Suite name always omits vendor
$suiteName = $module->getShortName(); $suiteName = $module->getShortName();
// If suite is already configured in the root, switch to it and return // Suite doesn't exist, so load dynamically from nested `behat.yml`
if (isset($this->suiteConfigurations[$suiteName])) { if (!isset($this->suiteConfigurations[$suiteName])) {
$config = $this->suiteConfigurations[$suiteName]; $config = $this->loadSuiteConfiguration($suiteName, $module);
$this->registry->registerSuiteConfiguration( $this->registry->registerSuiteConfiguration(
$suiteName, $suiteName,
$config['type'], $config['type'],
$config['settings'] $config['settings']
); );
return null;
} }
// Suite doesn't exist, so load dynamically from nested `behat.yml`
$config = $this->loadSuiteConfiguration($suiteName, $module);
$this->registry->registerSuiteConfiguration(
$suiteName,
$config['type'],
$config['settings']
);
return null; return null;
} }