From e93abc6eb23c2ed1405035d21f47c52d6dfdd1ca Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Thu, 16 Jan 2014 11:36:25 +1300 Subject: [PATCH 1/3] Fixing test failures because of Translatable and SiteTreeSubsites --- tests/model/SiteTreeTest.php | 2 +- tests/search/SearchFormTest.php | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/model/SiteTreeTest.php b/tests/model/SiteTreeTest.php index 46e0afc4..3c57dcb2 100644 --- a/tests/model/SiteTreeTest.php +++ b/tests/model/SiteTreeTest.php @@ -8,7 +8,7 @@ class SiteTreeTest extends SapphireTest { protected static $fixture_file = 'SiteTreeTest.yml'; protected $illegalExtensions = array( - 'SiteTree' => array('SiteTreeSubsites') + 'SiteTree' => array('SiteTreeSubsites', 'Translatable') ); protected $extraDataObjects = array( diff --git a/tests/search/SearchFormTest.php b/tests/search/SearchFormTest.php index c6d5867c..9a3a42b6 100644 --- a/tests/search/SearchFormTest.php +++ b/tests/search/SearchFormTest.php @@ -11,7 +11,11 @@ class ZZZSearchFormTest extends FunctionalTest { protected static $fixture_file = 'SearchFormTest.yml'; - + + protected $illegalExtensions = array( + 'SiteTree' => array('SiteTreeSubsites', 'Translatable') + ); + protected $mockController; public function waitUntilIndexingFinished() { From 93dca704fb4a04fcfab3181b0f02edd2b4d3b9bf Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Fri, 17 Jan 2014 10:36:00 +1300 Subject: [PATCH 2/3] Fixing test failures introduced by Translatable and SiteTreeSubsites Same fix as e93abc6, except it applies to VirtualPageTest. --- tests/model/VirtualPageTest.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/model/VirtualPageTest.php b/tests/model/VirtualPageTest.php index 36ff59c5..aa6bd301 100644 --- a/tests/model/VirtualPageTest.php +++ b/tests/model/VirtualPageTest.php @@ -9,6 +9,10 @@ class VirtualPageTest extends SapphireTest { 'VirtualPageTest_VirtualPageSub', ); + protected $illegalExtensions = array( + 'SiteTree' => array('SiteTreeSubsites', 'Translatable') + ); + protected $requiredExtensions = array( 'SiteTree' => array('VirtualPageTest_PageExtension') ); From e9b10e5b16f40cabcd8107d980d1d5291a886def Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Fri, 17 Jan 2014 12:57:28 +1300 Subject: [PATCH 3/3] Fixing test not auto-following admin/pages/SearchForm With additional modules like Translatable, this test fails because a 301 is issued to redirect the admin/pages/SearchForm request to the correct URL containining a locale in the query string. --- tests/search/CMSMainSearchFormTest.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/search/CMSMainSearchFormTest.php b/tests/search/CMSMainSearchFormTest.php index 0de41ade..c0de0779 100644 --- a/tests/search/CMSMainSearchFormTest.php +++ b/tests/search/CMSMainSearchFormTest.php @@ -3,8 +3,6 @@ class CMSMainSearchFormTest extends FunctionalTest { protected static $fixture_file = '../controller/CMSMainTest.yml'; - protected $autoFollowRedirection = false; - public function testTitleFilter() { $this->session()->inst_set('loggedInAs', $this->idFromFixture('Member', 'admin'));