Item14237: Merge commit '1c1672f91ac4a4b2db744144ef4522eb9b65a1c7' in…

…to Item14237 * commit '1c1672f91ac4a4b2db744144ef4522eb9b65a1c7': Item13897: createNewFoswikiApp() is now initializing cfg using cfgParams
foswiki · Nov 29, 2016 · 9817646 · 9817646
2 parents 616ad79 + 1c1672f
commit 9817646
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/UnitTestContrib/lib/Unit/FoswikiTestRole.pm b/UnitTestContrib/lib/Unit/FoswikiTestRole.pm
@@ -618,7 +618,12 @@ sub createNewFoswikiApp {
     $app->cfg->data->{Store}{Implementation} ||= 'Foswiki::Store::PlainFile';
 
     $params{env} //= $app->cloneEnv;
-    $params{cfg} //= $app->cfg->clone;
+    unless ( exists $params{cfgParams} ) {
+        my %cfgData = %{ $app->cfg->clone };
+        delete $cfgData{app};
+        $params{cfgParams} = \%cfgData;
+    }
+
     my $newApp = Unit::TestApp->new(%params);
 
     $this->app($newApp);