tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-30 05:09:06 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4867 from tractorcow/pulls/3/merge-bugs

Browse Source 
BUG Workaround for issues in testing versioned
This commit is contained in:
Sam Minnée 2015-12-22 18:40:16 +13:00
commit ea5f72c176
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
control/VersionedRequestFilter.php
View File

@ -32,7 +32,7 @@ class VersionedRequestFilter implements RequestFilter {
$dummyController->popCurrent();
// Prevent output in testing
if(class_exists('SapphireTest', false) && SapphireTest::is_running_test()) {
return false;
throw new SS_HTTPResponse_Exception($response);
}
$response->output();
die;

2
tests/model/VersionedTest.php
View File

@ -654,7 +654,7 @@ class VersionedTest extends SapphireTest {
* Test that stage parameter is blocked by non-administrative users
*/
public function testReadingModeSecurity() {
$this->setExpectedException('SS_HTTPResponse_Exception', 'Invalid request');
$this->setExpectedException('SS_HTTPResponse_Exception');
$session = Injector::inst()->create('Session', array());
$result = Director::test('/?stage=Stage', null, $session);
}