From 0e071c9393195235e3c426cdf4fb5d333b6d1c11 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 18 Apr 2012 23:40:27 +0200 Subject: [PATCH] MINOR Fixed tests broken by recent CMS search and breadcrumbs changes --- tests/controller/CMSMainTest.php | 10 +++++----- tests/search/CMSMainSearchFormTest.php | 8 +++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/tests/controller/CMSMainTest.php b/tests/controller/CMSMainTest.php index 7e460940..11d232aa 100644 --- a/tests/controller/CMSMainTest.php +++ b/tests/controller/CMSMainTest.php @@ -228,14 +228,14 @@ class CMSMainTest extends FunctionalTest { $adminuser = $this->objFromFixture('Member', 'admin'); $this->session()->inst_set('loggedInAs', $adminuser->ID); - $response = $this->get('admin/page/edit/show/' . $page31->ID); + $response = $this->get('admin/pages/edit/show/' . $page31->ID); $parser = new CSSContentParser($response->getBody()); - $crumbs = $parser->getBySelector('#page-title-heading .crumb'); + $crumbs = $parser->getBySelector('.breadcrumbs-wrapper .crumb'); $this->assertNotNull($crumbs); - $this->assertEquals(2, count($crumbs)); - $this->assertEquals('Page 3', (string)$crumbs[0]); - $this->assertEquals('Page 3.1', (string)$crumbs[1]); + $this->assertEquals(3, count($crumbs)); + $this->assertEquals('Page 3', (string)$crumbs[1]); + $this->assertEquals('Page 3.1', (string)$crumbs[2]); $this->session()->inst_set('loggedInAs', null); } diff --git a/tests/search/CMSMainSearchFormTest.php b/tests/search/CMSMainSearchFormTest.php index 877edc87..fe28c5aa 100644 --- a/tests/search/CMSMainSearchFormTest.php +++ b/tests/search/CMSMainSearchFormTest.php @@ -11,12 +11,14 @@ class CMSMainSearchFormTest extends FunctionalTest { $response = $this->get( 'admin/pages/SearchForm/?' . http_build_query(array( - 'Title' => 'Page 10', - 'FilterClass' => 'CMSSiteTreeFilter_Search', + 'q' => array( + 'Title' => 'Page 10', + 'FilterClass' => 'CMSSiteTreeFilter_Search', + ), 'action_doSearch' => true )) ); - + $titles = $this->getPageTitles(); $this->assertEquals(count($titles), 1); // For some reason the title gets split into two lines