tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Restore old functionaltest behaviour

Browse Source
This commit is contained in:
Damian Mooyman 2018-03-21 16:56:40 +13:00
parent 5a069e2e75
commit 6fef72062b
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Dev/FunctionalTest.php
View File

@ -2,20 +2,15 @@
namespace SilverStripe\Dev;
use SilverStripe\Control\Controller;
use PHPUnit_Framework_AssertionFailedError;
use SilverStripe\Control\Director;
use SilverStripe\Control\HTTP;
use SilverStripe\Control\Session;
use SilverStripe\Control\HTTPResponse;
use SilverStripe\Control\Session;
use SilverStripe\Core\Config\Config;
use SilverStripe\ORM\DataObject;
use SilverStripe\Security\BasicAuth;
use SilverStripe\Security\Member;
use SilverStripe\Security\Security;
use SilverStripe\Security\SecurityToken;
use SilverStripe\Versioned\Versioned;
use SilverStripe\View\SSViewer;
use PHPUnit_Framework_AssertionFailedError;
use SimpleXMLElement;
/**
@ -105,6 +100,11 @@ class FunctionalTest extends SapphireTest implements TestOnly
// Flush user
$this->logOut();
// Switch to draft site, if necessary
if (static::get_use_draft_site()) {
$this->useDraftSite();
}
// Unprotect the site, tests are running with the assumption it's off. They will enable it on a case-by-case
// basis.
BasicAuth::protect_entire_site(false);
@ -158,9 +158,6 @@ class FunctionalTest extends SapphireTest implements TestOnly
public function get($url, $session = null, $headers = null, $cookies = null)
{
$this->cssParser = null;
if (self::get_use_draft_site()) {
$url = HTTP::setGetVar('stage', Versioned::DRAFT, $url);
}
$response = $this->mainSession->get($url, $session, $headers, $cookies);
if ($this->autoFollowRedirection && is_object($response) && $response->getHeader('Location')) {
$response = $this->mainSession->followRedirection();
@ -410,6 +407,9 @@ class FunctionalTest extends SapphireTest implements TestOnly
*/
public function useDraftSite($draft = true)
{
if (!class_exists(Versioned::class)) {
return;
}
$stage = $draft ? Versioned::DRAFT : Versioned::LIVE;
Versioned::set_stage($stage);
Versioned::set_default_reading_mode(Versioned::get_reading_mode());