From 643b8d436a2719782dc8c4250b5e10a894121223 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Tue, 7 Sep 2021 15:36:57 +1200 Subject: [PATCH] MNT Fix test to work with session-manager module --- tests/php/SubsiteAdminTest.php | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/tests/php/SubsiteAdminTest.php b/tests/php/SubsiteAdminTest.php index f5815f9..9e3a282 100644 --- a/tests/php/SubsiteAdminTest.php +++ b/tests/php/SubsiteAdminTest.php @@ -3,13 +3,11 @@ namespace SilverStripe\Subsites\Tests; use SilverStripe\CMS\Controllers\CMSMain; -use SilverStripe\Control\Director; -use SilverStripe\Control\Session; use SilverStripe\Core\Config\Config; -use SilverStripe\Security\Member; +use SilverStripe\Dev\FunctionalTest; use SilverStripe\Subsites\Model\Subsite; -class SubsiteAdminTest extends BaseSubsiteTest +class SubsiteAdminTest extends FunctionalTest { protected static $fixture_file = 'SubsiteTest.yml'; @@ -20,13 +18,6 @@ class SubsiteAdminTest extends BaseSubsiteTest Config::modify()->set(Subsite::class, 'write_hostmap', false); } - protected function adminLoggedInSession() - { - return new Session([ - 'loggedInAs' => $this->idFromFixture(Member::class, 'admin') - ]); - } - /** * Test generation of the view */ @@ -34,24 +25,20 @@ class SubsiteAdminTest extends BaseSubsiteTest { $subsite1ID = $this->objFromFixture(Subsite::class, 'domaintest1')->ID; - // Open the admin area logged in as admin - $response1 = Director::test('admin/subsites/', null, $this->adminLoggedInSession()); + $this->logInAs('admin'); // Confirm that this URL gets you the entire page, with the edit form loaded - $response2 = Director::test( + $response = $this->get( "admin/subsites/SilverStripe-Subsites-Model-Subsite/EditForm/field/" - ."SilverStripe-Subsites-Model-Subsite/item/$subsite1ID/edit", - null, - $this->adminLoggedInSession() + ."SilverStripe-Subsites-Model-Subsite/item/$subsite1ID/edit" ); $this->assertTrue( - strpos($response2->getBody(), 'id="Form_ItemEditForm_ID"') !== false, + strpos($response->getBody(), 'id="Form_ItemEditForm_ID"') !== false, 'Testing Form_ItemEditForm_ID exists' ); - $this->assertTrue(strpos($response2->getBody(), ' exists'); + $this->assertTrue(strpos($response->getBody(), ' exists'); } - /** * Test that the main-site user with ADMIN permissions can access all subsites, regardless * of whether he is in a subsite-specific group or not.