Skip to content

Commit

Permalink
Fix subsites to use correct permissions
Browse files Browse the repository at this point in the history
  • Loading branch information
Damian Mooyman committed Mar 23, 2015
1 parent 73e0202 commit 2595d65
Showing 1 changed file with 16 additions and 10 deletions.
26 changes: 16 additions & 10 deletions tests/SiteTreeSubsitesTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ class SiteTreeSubsitesTest extends BaseSubsiteTest {
'SiteTreeSubsitesTest_ClassA',
'SiteTreeSubsitesTest_ClassB'
);

protected $illegalExtensions = array(
'SiteTree' => array('Translatable')
);

function testPagesInDifferentSubsitesCanShareURLSegment() {
$subsiteMain = $this->objFromFixture('Subsite', 'main');
Expand Down Expand Up @@ -129,7 +133,7 @@ function testTwoPagesWithSameURLOnDifferentSubsites() {
}

function testPageTypesBlacklistInClassDropdown() {
Session::set("loggedInAs", null);
$this->logInWithPermission('CMS_ACCESS_CMSMain');

$s1 = $this->objFromFixture('Subsite','domaintest1');
$s2 = $this->objFromFixture('Subsite','domaintest2');
Expand Down Expand Up @@ -164,7 +168,7 @@ function testPageTypesBlacklistInClassDropdown() {
}

function testPageTypesBlacklistInCMSMain() {
Session::set("loggedInAs", null);
$this->logInWithPermission('CMS_ACCESS_CMSMain');

$cmsmain = new CMSMain();

Expand All @@ -175,16 +179,18 @@ function testPageTypesBlacklistInCMSMain() {
$s1->write();

Subsite::changeSubsite($s1);
$classes = $cmsmain->PageTypes()->column('ClassName');
$this->assertNotContains('ErrorPage', $classes);
$this->assertNotContains('SiteTreeSubsitesTest_ClassA', $classes);
$this->assertContains('SiteTreeSubsitesTest_ClassB', $classes);

Subsite::changeSubsite($s2);
$classes = $cmsmain->PageTypes()->column("ClassName");
$hints = Convert::json2array($cmsmain->SiteTreeHints());
$classes = $hints['Root']['disallowedChildren'];
$this->assertContains('ErrorPage', $classes);
$this->assertContains('SiteTreeSubsitesTest_ClassA', $classes);
$this->assertContains('SiteTreeSubsitesTest_ClassB', $classes);
$this->assertNotContains('SiteTreeSubsitesTest_ClassB', $classes);

Subsite::changeSubsite($s2);
$hints = Convert::json2array($cmsmain->SiteTreeHints());
$classes = $hints['Root']['disallowedChildren'];
$this->assertNotContains('ErrorPage', $classes);
$this->assertNotContains('SiteTreeSubsitesTest_ClassA', $classes);
$this->assertNotContains('SiteTreeSubsitesTest_ClassB', $classes);
}

}
Expand Down

0 comments on commit 2595d65

Please sign in to comment.