tonyair/silverstripe-subsites
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-subsites synced 2024-06-26 14:39:19 +02:00
Code Issues Projects Releases Wiki Activity

MINOR get the files & error page tests on subsites passing

Browse Source
This commit is contained in:
Tom Rix 2010-03-30 20:43:34 +00:00
parent d36a6a3bde
commit 92976e8eff
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/ErrorPageSubsite.php
View File

@ -22,7 +22,7 @@ class ErrorPageSubsite extends DataObjectDecorator {
}
if($subsite) {
$subdomain = $subsite->Subdomain;
$subdomain = $subsite->Domains()->First()->Domain;
$subdomainPart = "-{$subdomain}";
}

1
tests/FileSubsitesTest.php
View File

@ -6,6 +6,7 @@ class FileSubsitesTest extends SapphireTest {
function testTrivialFeatures() {
$this->assertTrue(is_array(singleton('FileSubsites')->extraStatics()));
$file = new File();
$file->Name = 'FileTitle';
$file->Title = 'FileTitle';
$this->assertEquals(' * FileTitle', $file->alternateTreeTitle());
$file->SubsiteID = $this->objFromFixture('Subsite', 'domaintest1')->ID;

2
tests/SiteTreeSubsitesTest.php
View File

@ -51,7 +51,7 @@ class SiteTreeSubsitesTest extends SapphireTest {
$path = ErrorPage::get_filepath_for_errorcode(500);
$static_path = Object::get_static('ErrorPage', 'static_filepath');
$expected_path = $static_path . '/error-500-'.$subsite1->Subdomain.'.html';
$expected_path = $static_path . '/error-500-'.$subsite1->Domains()->First()->Domain.'.html';
$this->assertEquals($expected_path, $path);
}