From c18a0a266f40aa083b685638996d637453bf7af8 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 30 Apr 2015 21:45:22 +1200 Subject: [PATCH] Adjusted tests to new SiteTree->canCreate() logic in 3.1.11+ Checks SiteConfig permissions by default now --- tests/SiteTreeSubsitesTest.php | 7 +++++-- tests/SubsiteTest.yml | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/SiteTreeSubsitesTest.php b/tests/SiteTreeSubsitesTest.php index cdd120d..5598558 100644 --- a/tests/SiteTreeSubsitesTest.php +++ b/tests/SiteTreeSubsitesTest.php @@ -129,7 +129,8 @@ class SiteTreeSubsitesTest extends BaseSubsiteTest { } function testPageTypesBlacklistInClassDropdown() { - Session::set("loggedInAs", null); + $editor = $this->objFromFixture('Member', 'editor'); + Session::set("loggedInAs", $editor->ID); $s1 = $this->objFromFixture('Subsite','domaintest1'); $s2 = $this->objFromFixture('Subsite','domaintest2'); @@ -140,6 +141,7 @@ class SiteTreeSubsitesTest extends BaseSubsiteTest { Subsite::changeSubsite($s1); $settingsFields = $page->getSettingsFields()->dataFieldByName('ClassName')->getSource(); + $this->assertArrayNotHasKey('ErrorPage', $settingsFields ); @@ -164,7 +166,8 @@ class SiteTreeSubsitesTest extends BaseSubsiteTest { } function testPageTypesBlacklistInCMSMain() { - Session::set("loggedInAs", null); + $editor = $this->objFromFixture('Member', 'editor'); + Session::set("loggedInAs", $editor->ID); $cmsmain = new CMSMain(); diff --git a/tests/SubsiteTest.yml b/tests/SubsiteTest.yml index 7053cad..e4b0ef6 100644 --- a/tests/SubsiteTest.yml +++ b/tests/SubsiteTest.yml @@ -178,3 +178,7 @@ Member: subsite1member2: Email: subsite1member2@test.com Groups: =>Group.subsite1_group_via_role + +SiteConfig: + config: + CanCreateTopLevelType: LoggedInUsers \ No newline at end of file