tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-06-28 07:29:27 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote branch 'origin/master'

Browse Source
This commit is contained in:
Sam Minnee 2011-02-22 10:23:08 +13:00
commit 5a23f69f0b
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/LeftAndMain.php
View File

@ -183,8 +183,8 @@ class LeftAndMain extends Controller {
$theme = false;
}
if($theme) $cssFiles .= ', ' . THEMES_DIR . "/{$theme}/css/editor.css";
else if(project()) $cssFiles .= ', ' . project() . '/css/editor.css';
if($theme) $cssFiles .= ',' . THEMES_DIR . "/{$theme}/css/editor.css";
else if(project()) $cssFiles .= ',' . project() . '/css/editor.css';
$htmlEditorConfig->setOption('content_css', $cssFiles);
}

8
tests/CMSMainTest.php
View File

@ -150,7 +150,7 @@ class CMSMainTest extends FunctionalTest {
$response = $this->get('admin/cms/getitem?ID=' . $pageID . '&ajax=1');
$livePage = Versioned::get_one_by_stage("SiteTree", "Live", "\"SiteTree\".\"ID\" = $pageID");
$this->assertType('SiteTree', $livePage);
$this->assertInstanceOf('SiteTree', $livePage);
$this->assertTrue($livePage->canDelete());
// Check that the 'restore' button exists as a simple way of checking that the correct page is returned.
@ -174,12 +174,12 @@ class CMSMainTest extends FunctionalTest {
$this->assertNull($cmsMain->getRecord('asdf'));
// Pages that are on draft and aren't on draft should both work
$this->assertType('Page', $cmsMain->getRecord($page1ID));
$this->assertType('Page', $cmsMain->getRecord($this->idFromFixture('Page','page2')));
$this->assertInstanceOf('Page', $cmsMain->getRecord($page1ID));
$this->assertInstanceOf('Page', $cmsMain->getRecord($this->idFromFixture('Page','page2')));
// This functionality isn't actually used any more.
$newPage = $cmsMain->getRecord('new-Page-5');
$this->assertType('Page', $newPage);
$this->assertInstanceOf('Page', $newPage);
$this->assertEquals('5', $newPage->ParentID);
}

6
tests/CMSMenuTest.php
View File

@ -16,7 +16,7 @@ class CMSMenuTest extends SapphireTest implements TestOnly {
CMSMenu::add_controller('CMSMain');
$menuItems = CMSMenu::get_menu_items();
$menuItem = $menuItems['CMSMain'];
$this->assertType('CMSMenuItem', $menuItem, 'Controller menu item is of class CMSMenuItem');
$this->assertInstanceOf('CMSMenuItem', $menuItem, 'Controller menu item is of class CMSMenuItem');
$this->assertEquals($menuItem->url, singleton('CMSMain')->Link(), 'Controller menu item has the correct link');
$this->assertEquals($menuItem->controller, 'CMSMain', 'Controller menu item has the correct controller class');
$this->assertEquals($menuItem->priority, singleton('CMSMain')->stat('menu_priority'), 'Controller menu item has the correct priority');
@ -26,7 +26,7 @@ class CMSMenuTest extends SapphireTest implements TestOnly {
CMSMenu::add_link('LinkCode', 'link title', 'http://www.example.com');
$menuItems = CMSMenu::get_menu_items();
$menuItem = $menuItems['LinkCode'];
$this->assertType('CMSMenuItem', $menuItem, 'Link menu item is of class CMSMenuItem');
$this->assertInstanceOf('CMSMenuItem', $menuItem, 'Link menu item is of class CMSMenuItem');
$this->assertEquals($menuItem->title, 'link title', 'Link menu item has the correct title');
$this->assertEquals($menuItem->url,'http://www.example.com', 'Link menu item has the correct link');
$this->assertNull($menuItem->controller, 'Link menu item has no controller class');
@ -53,7 +53,7 @@ class CMSMenuTest extends SapphireTest implements TestOnly {
CMSMenu::clear_menu();
CMSMenu::populate_menu();
$menuItem = CMSMenu::get_menu_item('CMSMain');
$this->assertType('CMSMenuItem', $menuItem, 'CMSMain menu item exists');
$this->assertInstanceOf('CMSMenuItem', $menuItem, 'CMSMain menu item exists');
$this->assertEquals($menuItem->url, singleton('CMSMain')->Link(), 'Menu item has the correct link');
$this->assertEquals($menuItem->controller, 'CMSMain', 'Menu item has the correct controller class');
$this->assertEquals(

2
tests/LeftAndMainTest.php
View File

@ -49,7 +49,7 @@ class LeftAndMainTest extends FunctionalTest {
$response = $this->get($link);
$this->assertType('SS_HTTPResponse', $response, "$link should return a response object");
$this->assertInstanceOf('SS_HTTPResponse', $response, "$link should return a response object");
$this->assertEquals(200, $response->getStatusCode(), "$link should return 200 status code");
// Check that a HTML page has been returned
$this->assertRegExp('/<html[^>]*>/i', $response->getBody(), "$link should contain <html> tag");

2
tests/MemberTableFieldTest.php
View File

@ -72,7 +72,7 @@ class MemberTableFieldTest extends FunctionalTest {
$this->assertNotContains($member1->ID, $group1->Members()->column('ID'),
'Member relation to group is removed'
);
$this->assertType(
$this->assertInstanceOf(
'DataObject',
DataObject::get_by_id('Member', $member1->ID),
'Member record still exists'