From 9b48a30e2bf86403025c25336f73012bb06cd0a6 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Fri, 5 May 2017 10:12:23 +1200
Subject: [PATCH] FIX: Don't load suite twice.

If the suite is already loaded, you can't call registerSuiteConfiguration
a second time.
---
 src/Controllers/ModuleSuiteLocator.php | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/Controllers/ModuleSuiteLocator.php b/src/Controllers/ModuleSuiteLocator.php
index 41a3006..022bec7 100644
--- a/src/Controllers/ModuleSuiteLocator.php
+++ b/src/Controllers/ModuleSuiteLocator.php
@@ -101,24 +101,16 @@ class ModuleSuiteLocator implements Controller
         // Suite name always omits vendor
         $suiteName = $module->getShortName();
 
-        // If suite is already configured in the root, switch to it and return
-        if (isset($this->suiteConfigurations[$suiteName])) {
-            $config = $this->suiteConfigurations[$suiteName];
+        // Suite doesn't exist, so load dynamically from nested `behat.yml`
+        if (!isset($this->suiteConfigurations[$suiteName])) {
+            $config = $this->loadSuiteConfiguration($suiteName, $module);
             $this->registry->registerSuiteConfiguration(
                 $suiteName,
                 $config['type'],
                 $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;
     }