tonyair
/
silverstripe-cms
mirror of https://github.com/silverstripe/silverstripe-cms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

BUG Fix test regressions in CMS page filters

This commit is contained in:
Damian Mooyman 2018-02-21 10:32:00 +13:00
parent 3be0478e1c
commit 83c4ab8d18
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/php/Controllers/CMSSiteTreeFilterTest.php
View File

@ -2,6 +2,7 @@
namespace SilverStripe\CMS\Tests\Controllers; namespace SilverStripe\CMS\Tests\Controllers;
use Page;
use SilverStripe\CMS\Model\SiteTree; use SilverStripe\CMS\Model\SiteTree;
use SilverStripe\Versioned\Versioned; use SilverStripe\Versioned\Versioned;
use SilverStripe\CMS\Controllers\CMSSiteTreeFilter_Search; use SilverStripe\CMS\Controllers\CMSSiteTreeFilter_Search;
@ -65,14 +66,17 @@ class CMSSiteTreeFilterTest extends SapphireTest
public function testChangedPagesFilter() public function testChangedPagesFilter()
{ {
/** @var Page $unchangedPage */
$unchangedPage = $this->objFromFixture('Page', 'page1'); $unchangedPage = $this->objFromFixture('Page', 'page1');
$unchangedPage->publishRecursive(); $unchangedPage->publishRecursive();
/** @var Page $changedPage */
$changedPage = $this->objFromFixture('Page', 'page2'); $changedPage = $this->objFromFixture('Page', 'page2');
$changedPage->Title = 'Original'; $changedPage->Title = 'Original';
$changedPage->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE); $changedPage->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
$changedPage->Title = 'Changed'; $changedPage->Title = 'Changed';
$changedPage->write(); $changedPage->write();
$changedPageVersion = $changedPage->Version;
// Check that only changed pages are returned // Check that only changed pages are returned
$f = new CMSSiteTreeFilter_ChangedPages(array('Term' => 'Changed')); $f = new CMSSiteTreeFilter_ChangedPages(array('Term' => 'Changed'));
@ -93,8 +97,9 @@ class CMSSiteTreeFilterTest extends SapphireTest
// If we roll back to an earlier version than what's on the published site, we should still show the changed // If we roll back to an earlier version than what's on the published site, we should still show the changed
$changedPage->Title = 'Changed 2'; $changedPage->Title = 'Changed 2';
$changedPage->write();
$changedPage->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE); $changedPage->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
$changedPage->doRollbackTo(1); $changedPage->doRollbackTo($changedPageVersion);
$f = new CMSSiteTreeFilter_ChangedPages(array('Term' => 'Changed')); $f = new CMSSiteTreeFilter_ChangedPages(array('Term' => 'Changed'));
$results = $f->pagesIncluded(); $results = $f->pagesIncluded();