From 24e4c7b806066121c959e691a91466c46cd75335 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Sat, 8 Aug 2009 04:21:51 +0000
Subject: [PATCH] MINOR: Updated SiteTreeActionsTest to have more precise
 fixture generation

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@84067 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 tests/SiteTreeActionsTest.php | 34 ++++++----------------------------
 1 file changed, 6 insertions(+), 28 deletions(-)

diff --git a/tests/SiteTreeActionsTest.php b/tests/SiteTreeActionsTest.php
index b06fd8d3d..4cdc40ff6 100644
--- a/tests/SiteTreeActionsTest.php
+++ b/tests/SiteTreeActionsTest.php
@@ -16,37 +16,13 @@ class SiteTreeActionsTest extends FunctionalTest {
 
 	static $fixture_file = 'sapphire/tests/SiteTreeActionsTest.yml';
 
-	function testActionsNewPage() {
-		if(class_exists('SiteTreeCMSWorkflow')) return true;
-		
-		$className = 'Page';
-		$page = new $className();
-		$page->Title = 'New ' . $className;
-		$page->URLSegment = "new-" . strtolower($className);
-		$page->ClassName = $className;
-		$page->ParentID = 0;
-		$page->ID = 'new-Page-1';
-	
-		$author = $this->objFromFixture('Member', 'cmseditor');
-		$this->session()->inst_set('loggedInAs', $author->ID);
-	
-		$actionsArr = $page->getCMSActions()->column('Name');
-	
-		$this->assertContains('action_save',$actionsArr);
-		$this->assertContains('action_publish',$actionsArr);
-		$this->assertNotContains('action_unpublish',$actionsArr);
-		$this->assertContains('action_delete',$actionsArr);
-		$this->assertNotContains('action_deletefromlive',$actionsArr);
-		$this->assertNotContains('action_rollback',$actionsArr);
-		$this->assertNotContains('action_revert',$actionsArr);
-	}
-
 	function testActionsPublishedRecord() {
 		if(class_exists('SiteTreeCMSWorkflow')) return true;
 		
 		$page = new Page();
+		$page->CanEditType = 'LoggedInUsers';
 		$page->write();
-		$page->publish('Stage', 'Live');
+		$page->doPublish();
 	
 		$author = $this->objFromFixture('Member', 'cmseditor');
 		$this->session()->inst_set('loggedInAs', $author->ID);
@@ -66,9 +42,10 @@ class SiteTreeActionsTest extends FunctionalTest {
 		if(class_exists('SiteTreeCMSWorkflow')) return true;
 		
 		$page = new Page();
+		$page->CanEditType = 'LoggedInUsers';
 		$page->write();
 		$pageID = $page->ID;
-		$page->publish('Stage', 'Live');
+		$page->doPublish();
 		$page->deleteFromStage('Stage');
 		
 		// Get the live version of the page
@@ -92,8 +69,9 @@ class SiteTreeActionsTest extends FunctionalTest {
 		if(class_exists('SiteTreeCMSWorkflow')) return true;
 		
 		$page = new Page();
+		$page->CanEditType = 'LoggedInUsers';
 		$page->write();
-		$page->publish('Stage', 'Live');
+		$page->doPublish();
 		$page->Content = 'Changed on Stage';
 		$page->write();
 		$page->flushCache();