Permalink
Browse files

FIX CMSMainTest to access batch_action config property properly

  • Loading branch information...
1 parent 1e3473d commit 68ebc5d221b7cc3ba15c4365525ce4f59ae3ec60 Hamish Friedlander committed Feb 27, 2013
Showing with 2 additions and 18 deletions.
  1. +2 −18 tests/controller/CMSMainTest.php
@@ -9,23 +9,6 @@ class CMSMainTest extends FunctionalTest {
static protected $orig = array();
- public function setUpOnce() {
- self::$orig['CMSBatchActionHandler_batch_actions'] = CMSBatchActionHandler::$batch_actions;
- CMSBatchActionHandler::$batch_actions = array(
- 'publish' => 'CMSBatchAction_Publish',
- 'delete' => 'CMSBatchAction_Delete',
- 'deletefromlive' => 'CMSBatchAction_DeleteFromLive',
- );
-
- parent::setUpOnce();
- }
-
- public function tearDownOnce() {
- CMSBatchActionHandler::$batch_actions = self::$orig['CMSBatchActionHandler_batch_actions'];
-
- parent::tearDownOnce();
- }
-
function testSiteTreeHints() {
$cache = SS_Cache::factory('CMSMain_SiteTreeHints');
$cache->clean(Zend_Cache::CLEANING_MODE_ALL);
@@ -97,7 +80,8 @@ public function testPublish() {
);
// Some modules (e.g., cmsworkflow) will remove this action
- if(isset(CMSBatchActionHandler::$batch_actions['publish'])) {
+ $actions = CMSBatchActionHandler::config()->batch_actions;
+ if(isset($actions['publish'])) {
$response = $this->get('admin/pages/batchactions/publish?ajax=1&csvIDs=' . implode(',', array($page1->ID, $page2->ID)));
$responseData = Convert::json2array($response->getBody());
$this->assertArrayHasKey($page1->ID, $responseData['modified']);

0 comments on commit 68ebc5d

Please sign in to comment.