From d81cae7dfd7e2a627cadb89fff2c6ff7859d0046 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Mon, 12 Apr 2010 10:08:00 +0000 Subject: [PATCH] BUGFIX: Fixed viewing of deleted pages. (from r89833) (from r96795) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102486 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- tests/CMSMainTest.php | 9 ++++++++- tests/CMSMainTest.yml | 10 ++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/tests/CMSMainTest.php b/tests/CMSMainTest.php index 1bb415d2..df89c3c6 100644 --- a/tests/CMSMainTest.php +++ b/tests/CMSMainTest.php @@ -36,7 +36,7 @@ class CMSMainTest extends FunctionalTest { $response = Director::test("admin/cms/publishall", array('confirm' => 1), $this->session()); $this->assertContains( - sprintf(_t('CMSMain.PUBPAGES',"Done: Published %d pages"), 5), + sprintf(_t('CMSMain.PUBPAGES',"Done: Published %d pages"), 7), $response->getBody() ); @@ -157,4 +157,11 @@ class CMSMainTest extends FunctionalTest { $this->assertEquals('5', $newPage->ParentID); } + + function testDeletedPagesSiteTreeFilter() { + $id = $this->idFromFixture('Page', 'page3'); + $this->logInWithPermssion('ADMIN'); + $result = $this->get('admin/getsubtree?filter=CMSSiteTreeFilter_DeletedPages&ajax=1&ID=' . $id); + $this->assertEquals(200, $result->getStatusCode()); + } } diff --git a/tests/CMSMainTest.yml b/tests/CMSMainTest.yml index 0b7fc3f5..2288554f 100644 --- a/tests/CMSMainTest.yml +++ b/tests/CMSMainTest.yml @@ -4,9 +4,15 @@ Page: page2: Title: Page 2 page3: - Title: Page 2 + Title: Page 3 + page31: + Title: Page 3.1 + Parent: =>Page.page3 + page32: + Title: Page 3.2 + Parent: =>Page.page3 page4: - Title: Page 2 + Title: Page 4 home: Title: Home URLSegment: home