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

Merge pull request #7240 from open-sausages/pulls/4.0/fix-security-missing-request

Browse Source 
BUG Ensure mocked controller has request assigned
This commit is contained in:
Chris Joe 2017-08-03 19:07:58 +12:00 committed by GitHub
commit 479102bb30
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Security/Security.php
View File

@ -563,6 +563,7 @@ class Security extends Controller implements TemplateGlobalProvider
$controller = ModelAsController::controller_for($holderPage);
$controller->doInit();
$controller->setRequest($this->getRequest());
return $controller;
}

24
tests/php/Security/SecurityTest.php
View File

@ -2,9 +2,13 @@
namespace SilverStripe\Security\Tests;
use Page;
use PageController;
use SilverStripe\Control\Controller;
use SilverStripe\Control\Director;
use SilverStripe\Control\HTTPRequest;
use SilverStripe\Control\HTTPResponse;
use SilverStripe\Control\Session;
use SilverStripe\Core\Config\Config;
use SilverStripe\Core\Convert;
use SilverStripe\Dev\FunctionalTest;
@ -704,6 +708,26 @@ class SecurityTest extends FunctionalTest
$this->assertNull($robotsHeader);
}
public function testGetResponseController()
{
if (!class_exists(Page::class)) {
$this->markTestSkipped("This test requires CMS module");
}
$request = new HTTPRequest('GET', '/');
$request->setSession(new Session([]));
$security = new Security();
$security->setRequest($request);
$reflection = new \ReflectionClass($security);
$method = $reflection->getMethod('getResponseController');
$method->setAccessible(true);
$result = $method->invoke($security, 'Page');
// Ensure page shares the same controller as security
$this->assertInstanceOf(PageController::class, $result);
$this->assertEquals($request, $result->getRequest());
}
/**
* Execute a log-in form using Director::test().
* Helper method for the tests above