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

Merge remote-tracking branch 'origin/3.1'

This commit is contained in:
Ingo Schommer 2014-02-04 07:56:10 +13:00
parent 7d7c75414c 5e79e66ccc
commit 172a1816f9
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/model/SiteTreeTest.php
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(

4
tests/model/VirtualPageTest.php
View File

@ -9,6 +9,10 @@ class VirtualPageTest extends SapphireTest {
'VirtualPageTest_VirtualPageSub',
);
protected $illegalExtensions = array(
'SiteTree' => array('SiteTreeSubsites', 'Translatable')
);
protected $requiredExtensions = array(
'SiteTree' => array('VirtualPageTest_PageExtension')
);

2
tests/search/CMSMainSearchFormTest.php
View File

@ -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'));

6
tests/search/SearchFormTest.php
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() {