Merge pull request #924 from halkyon/modules_illegal_extensions_tests

Fixing test failures because of Translatable and SiteTreeSubsites
This commit is contained in:
Mateusz U 2014-01-15 16:15:19 -08:00
commit c8c56756a9
2 changed files with 6 additions and 2 deletions

View File

@ -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(

View File

@ -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() {