diff --git a/code/extensions/SiteTreeSubsites.php b/code/extensions/SiteTreeSubsites.php index da6cd0ac..ffcbc749 100644 --- a/code/extensions/SiteTreeSubsites.php +++ b/code/extensions/SiteTreeSubsites.php @@ -274,7 +274,7 @@ static function contentcontrollerInit($controller) { $subsite = Subsite::currentSubsite(); if($subsite && $subsite->Theme){ - Config::inst()->update('SilverStripe\\View\\SSViewer', 'theme', Subsite::currentSubsite()->Theme); + Config::modify()->set('SilverStripe\\View\\SSViewer', 'theme', Subsite::currentSubsite()->Theme); } } diff --git a/tests/LeftAndMainSubsitesTest.php b/tests/LeftAndMainSubsitesTest.php index 6fa553bd..405d9ed0 100644 --- a/tests/LeftAndMainSubsitesTest.php +++ b/tests/LeftAndMainSubsitesTest.php @@ -5,7 +5,7 @@ use SilverStripe\Dev\FunctionalTest; class LeftAndMainSubsitesTest extends FunctionalTest { - + static $fixture_file = 'subsites/tests/SubsiteTest.yml'; /** @@ -45,16 +45,16 @@ function testAccessChecksDontChangeCurrentSubsite() { $admin = $this->objFromFixture("SilverStripe\\Security\\Member","admin"); $this->loginAs($admin); $ids = array(); - + $subsite1 = $this->objFromFixture('Subsite', 'domaintest1'); $subsite2 = $this->objFromFixture('Subsite', 'domaintest2'); $subsite3 = $this->objFromFixture('Subsite', 'domaintest3'); - + $ids[] = $subsite1->ID; $ids[] = $subsite2->ID; $ids[] = $subsite3->ID; $ids[] = 0; - + // Enable session-based subsite tracking. Subsite::$use_session_subsiteid = true; @@ -67,20 +67,20 @@ function testAccessChecksDontChangeCurrentSubsite() { $this->assertEquals($id, Subsite::currentSubsiteID(), "The current subsite has not been changed in the process of checking permissions for admin user."); } - + } function testShouldChangeSubsite() { $l = new LeftAndMain(); Config::inst()->nest(); - Config::inst()->update('SilverStripe\\CMS\\Controllers\\CMSPageEditController', 'treats_subsite_0_as_global', false); + Config::modify()->set('SilverStripe\\CMS\\Controllers\\CMSPageEditController', 'treats_subsite_0_as_global', false); $this->assertTrue($l->shouldChangeSubsite('SilverStripe\\CMS\\Controllers\\CMSPageEditController', 0, 5)); $this->assertFalse($l->shouldChangeSubsite('SilverStripe\\CMS\\Controllers\\CMSPageEditController', 0, 0)); $this->assertTrue($l->shouldChangeSubsite('SilverStripe\\CMS\\Controllers\\CMSPageEditController', 1, 5)); $this->assertFalse($l->shouldChangeSubsite('SilverStripe\\CMS\\Controllers\\CMSPageEditController', 1, 1)); - Config::inst()->update('SilverStripe\\CMS\\Controllers\\CMSPageEditController', 'treats_subsite_0_as_global', true); + Config::modify()->set('SilverStripe\\CMS\\Controllers\\CMSPageEditController', 'treats_subsite_0_as_global', true); $this->assertFalse($l->shouldChangeSubsite('SilverStripe\\CMS\\Controllers\\CMSPageEditController', 0, 5)); $this->assertFalse($l->shouldChangeSubsite('SilverStripe\\CMS\\Controllers\\CMSPageEditController', 0, 0)); $this->assertTrue($l->shouldChangeSubsite('SilverStripe\\CMS\\Controllers\\CMSPageEditController', 1, 5)); diff --git a/tests/SubsiteAdminFunctionalTest.php b/tests/SubsiteAdminFunctionalTest.php index d77c19ea..468a2295 100644 --- a/tests/SubsiteAdminFunctionalTest.php +++ b/tests/SubsiteAdminFunctionalTest.php @@ -45,7 +45,7 @@ function testAnonymousIsForbiddenAdminAccess() { function testAdminCanAccessAllSubsites() { $member = $this->objFromFixture('SilverStripe\\Security\\Member', 'admin'); Session::set("loggedInAs", $member->ID); - + $this->getAndFollowAll('admin/pages/?SubsiteID=0'); $this->assertEquals(Subsite::currentSubsiteID(), '0', 'Can access main site.'); $this->assertRegExp('#^admin/pages.*#', $this->mainSession->lastUrl(), 'Lands on the correct section'); @@ -63,19 +63,19 @@ function testAdminCanAccessAllSubsites() { function testAdminIsRedirectedToObjectsSubsite() { $member = $this->objFromFixture('SilverStripe\\Security\\Member', 'admin'); Session::set("loggedInAs", $member->ID); - + $mainSubsitePage = $this->objFromFixture('Page', 'mainSubsitePage'); $subsite1Home = $this->objFromFixture('Page', 'subsite1_home'); Config::inst()->nest(); - Config::inst()->update('SilverStripe\\CMS\\Controllers\\CMSPageEditController', 'treats_subsite_0_as_global', false); + Config::modify()->set('SilverStripe\\CMS\\Controllers\\CMSPageEditController', 'treats_subsite_0_as_global', false); Subsite::changeSubsite(0); $this->getAndFollowAll("admin/pages/edit/show/$subsite1Home->ID"); $this->assertEquals(Subsite::currentSubsiteID(), $subsite1Home->SubsiteID, 'Loading an object switches the subsite'); $this->assertRegExp("#^admin/pages.*#", $this->mainSession->lastUrl(), 'Lands on the correct section'); - Config::inst()->update('SilverStripe\\CMS\\Controllers\\CMSPageEditController', 'treats_subsite_0_as_global', true); + Config::modify()->set('SilverStripe\\CMS\\Controllers\\CMSPageEditController', 'treats_subsite_0_as_global', true); Subsite::changeSubsite(0); $this->getAndFollowAll("admin/pages/edit/show/$subsite1Home->ID"); $this->assertEquals(Subsite::currentSubsiteID(), $subsite1Home->SubsiteID, 'Loading a non-main-site object still switches the subsite if configured with treats_subsite_0_as_global'); diff --git a/tests/SubsitesVirtualPageTest.php b/tests/SubsitesVirtualPageTest.php index 27dc1cab..61eba29a 100644 --- a/tests/SubsitesVirtualPageTest.php +++ b/tests/SubsitesVirtualPageTest.php @@ -34,25 +34,25 @@ public function tearDown() { AssetStoreTest_SpyStore::reset(); parent::tearDown(); } - + // Attempt to bring main:linky to subsite2:linky function testVirtualPageFromAnotherSubsite() { Subsite::$write_hostmap = false; - + $subsite = $this->objFromFixture('Subsite', 'subsite2'); - + Subsite::changeSubsite($subsite->ID); Subsite::$disable_subsite_filter = false; - + $linky = $this->objFromFixture('Page', 'linky'); - + $svp = new SubsitesVirtualPage(); $svp->CopyContentFromID = $linky->ID; $svp->SubsiteID = $subsite->ID; $svp->URLSegment = 'linky'; - + $svp->write(); - + $this->assertEquals($svp->SubsiteID, $subsite->ID); $this->assertEquals($svp->Title, $linky->Title); } @@ -70,12 +70,12 @@ function testFileLinkRewritingOnVirtualPages() { $svp->CopyContentFromID = $page->ID; $svp->write(); $svp->doPublish(); - + // Rename the file $file = $this->objFromFixture('SilverStripe\\Assets\\File', 'file1'); $file->Name = 'renamed-test-file.pdf'; $file->write(); - + // Verify that the draft and publish virtual pages both have the corrected link $this->assertContains('ID")->value()); @@ -99,27 +99,27 @@ function testSubsiteVirtualPagesArentInappropriatelyPublished() { $p->doPublish(); $this->fixVersionNumberCache($vp); $this->assertTrue($vp->IsAddedToStage); - + // A new VP created after P's initial construction $vp2 = new SubsitesVirtualPage(); $vp2->CopyContentFromID = $p->ID; $vp2->write(); $this->assertTrue($vp2->IsAddedToStage); - + // Also remains orange after a republish $p->Content = "new content"; $p->write(); $p->doPublish(); $this->fixVersionNumberCache($vp2); $this->assertTrue($vp2->IsAddedToStage); - + // VP is now published $vp->doPublish(); $this->fixVersionNumberCache($vp); $this->assertTrue($vp->ExistsOnLive); $this->assertFalse($vp->IsModifiedOnStage); - + // P edited, VP and P both go green $p->Content = "third content"; $p->write(); @@ -134,7 +134,7 @@ function testSubsiteVirtualPagesArentInappropriatelyPublished() { $this->assertTrue($vp->ExistsOnLive); $this->assertFalse($vp->IsModifiedOnStage); } - + /** * This test ensures published Subsites Virtual Pages immediately reflect updates * to their published target pages. Note - this has to happen when the virtual page @@ -150,12 +150,12 @@ function testPublishedSubsiteVirtualPagesUpdateIfTargetPageUpdates() $p->writeToStage('Stage'); $p->publish('Stage', 'Live'); $this->assertTrue($p->ExistsOnLive); - + // change to subsite $subsite = $this->objFromFixture('Subsite', 'subsite2'); Subsite::changeSubsite($subsite->ID); Subsite::$disable_subsite_filter = false; - + // create svp in subsite $svp = new SubsitesVirtualPage(); $svp->CopyContentFromID = $p->ID; @@ -164,33 +164,33 @@ function testPublishedSubsiteVirtualPagesUpdateIfTargetPageUpdates() $svp->publish('Stage', 'Live'); $this->assertEquals($svp->SubsiteID, $subsite->ID); $this->assertTrue($svp->ExistsOnLive); - + // change back to original subsite ("Main site") Subsite::changeSubsite(0); - + // update original page $p->Title = 'New Title'; // "save & publish" $p->writeToStage('Stage'); $p->publish('Stage', 'Live'); $this->assertNotEquals($p->SubsiteID, $subsite->ID); - + // reload SVP from database // can't use DO::get by id because caches. $svpdb = $svp->get()->byID($svp->ID); - + // ensure title changed - $this->assertEquals($svpdb->Title, $p->Title); + $this->assertEquals($svpdb->Title, $p->Title); } - + function testUnpublishingParentPageUnpublishesSubsiteVirtualPages() { - Config::inst()->update('StaticPublisher', 'disable_realtime', true); - + Config::modify()->set('StaticPublisher', 'disable_realtime', true); + // Go to main site, get parent page $subsite = $this->objFromFixture('Subsite', 'main'); Subsite::changeSubsite($subsite->ID); $page = $this->objFromFixture('Page', 'importantpage'); - + // Create two SVPs on other subsites $subsite = $this->objFromFixture('Subsite', 'subsite1'); Subsite::changeSubsite($subsite->ID); @@ -198,30 +198,30 @@ function testUnpublishingParentPageUnpublishesSubsiteVirtualPages() { $vp1->CopyContentFromID = $page->ID; $vp1->write(); $vp1->doPublish(); - + $subsite = $this->objFromFixture('Subsite', 'subsite2'); Subsite::changeSubsite($subsite->ID); $vp2 = new SubsitesVirtualPage(); $vp2->CopyContentFromID = $page->ID; $vp2->write(); $vp2->doPublish(); - + // Switch back to main site, unpublish source $subsite = $this->objFromFixture('Subsite', 'main'); Subsite::changeSubsite($subsite->ID); $page = $this->objFromFixture('Page', 'importantpage'); $page->doUnpublish(); - + Subsite::changeSubsite($vp1->SubsiteID); $onLive = Versioned::get_one_by_stage('SubsitesVirtualPage', 'Live', "\"SiteTree_Live\".\"ID\" = ".$vp1->ID); $this->assertNull($onLive, 'SVP has been removed from live'); - + $subsite = $this->objFromFixture('Subsite', 'subsite2'); Subsite::changeSubsite($vp2->SubsiteID); $onLive = Versioned::get_one_by_stage('SubsitesVirtualPage', 'Live', "\"SiteTree_Live\".\"ID\" = ".$vp2->ID); $this->assertNull($onLive, 'SVP has been removed from live'); } - + /** * Similar to {@link SiteTreeSubsitesTest->testTwoPagesWithSameURLOnDifferentSubsites()} * and {@link SiteTreeSubsitesTest->testPagesInDifferentSubsitesCanShareURLSegment()}. @@ -231,33 +231,33 @@ function testSubsiteVirtualPageCanHaveSameUrlsegmentAsOtherSubsite() { $subsite1 = $this->objFromFixture('Subsite', 'subsite1'); $subsite2 = $this->objFromFixture('Subsite', 'subsite2'); Subsite::changeSubsite($subsite1->ID); - + $subsite1Page = $this->objFromFixture('Page', 'subsite1_staff'); $subsite1Page->URLSegment = 'staff'; $subsite1Page->write(); - + // saving on subsite1, and linking to subsite1 $subsite1Vp = new SubsitesVirtualPage(); $subsite1Vp->CopyContentFromID = $subsite1Page->ID; $subsite1Vp->SubsiteID = $subsite1->ID; $subsite1Vp->write(); $this->assertNotEquals( - $subsite1Vp->URLSegment, + $subsite1Vp->URLSegment, $subsite1Page->URLSegment, "Doesn't allow explicit URLSegment overrides when already existing in same subsite" ); - + //Change to subsite 2 Subsite::changeSubsite($subsite2->ID); - // saving in subsite2 (which already has a page with URLSegment 'contact-us'), + // saving in subsite2 (which already has a page with URLSegment 'contact-us'), // but linking to a page in subsite1 $subsite2Vp = new SubsitesVirtualPage(); $subsite2Vp->CopyContentFromID = $subsite1Page->ID; - $subsite2Vp->SubsiteID = $subsite2->ID; + $subsite2Vp->SubsiteID = $subsite2->ID; $subsite2Vp->write(); $this->assertEquals( - $subsite2Vp->URLSegment, + $subsite2Vp->URLSegment, $subsite1Page->URLSegment, "Does allow explicit URLSegment overrides when only existing in a different subsite" );