mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
Merge branch '3.0.2' into 3.0
This commit is contained in:
commit
8772eb3e18
@ -936,6 +936,8 @@ after')
|
|||||||
}
|
}
|
||||||
|
|
||||||
function testRenderWithSourceFileComments() {
|
function testRenderWithSourceFileComments() {
|
||||||
|
$origType = Director::get_environment_type();
|
||||||
|
Director::set_environment_type('dev');
|
||||||
SSViewer::set_source_file_comments(true);
|
SSViewer::set_source_file_comments(true);
|
||||||
|
|
||||||
$view = new SSViewer(array('SSViewerTestCommentsFullSource'));
|
$view = new SSViewer(array('SSViewerTestCommentsFullSource'));
|
||||||
@ -965,6 +967,7 @@ after')
|
|||||||
$this->assertEquals($result, $expected);
|
$this->assertEquals($result, $expected);
|
||||||
|
|
||||||
SSViewer::set_source_file_comments(false);
|
SSViewer::set_source_file_comments(false);
|
||||||
|
Director::set_environment_type($origType);
|
||||||
}
|
}
|
||||||
|
|
||||||
function testLoopIteratorIterator() {
|
function testLoopIteratorIterator() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user