Merge pull request #7556 from open-sausages/pulls/4.0/fix-functionaltest-bootstrap

BUG Prevent logOut() from clearing site stage during bootstrapping du…
This commit is contained in:
Chris Joe 2017-11-03 16:53:38 +13:00 committed by GitHub
commit 39eba56821
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -100,6 +100,9 @@ class FunctionalTest extends SapphireTest implements TestOnly
SSViewer::config()->update('theme_enabled', false);
}
// Flush user
$this->logOut();
// Switch to draft site, if necessary
if (static::get_use_draft_site()) {
$this->useDraftSite();
@ -109,8 +112,6 @@ class FunctionalTest extends SapphireTest implements TestOnly
// basis.
BasicAuth::protect_entire_site(false);
$this->logOut();
SecurityToken::disable();
}