From 66f2fad70a2744915fc82c72775bbbb2cce341ec Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Fri, 15 Oct 2010 03:31:30 +0000 Subject: [PATCH] MINOR Made CMSMainTest more resilient against database ID changes (Postgres doesn't have auto-increment resets across tests at the moment) (from r106248) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112578 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- tests/CMSMainTest.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/CMSMainTest.php b/tests/CMSMainTest.php index 67e9e838..48eac79d 100644 --- a/tests/CMSMainTest.php +++ b/tests/CMSMainTest.php @@ -31,6 +31,8 @@ class CMSMainTest extends FunctionalTest { * @todo Test the results of a publication better */ function testPublish() { + $page1 = $this->objFromFixture('Page', "page1"); + $page2 = $this->objFromFixture('Page', "page2"); $this->session()->inst_set('loggedInAs', $this->idFromFixture('Member', 'admin')); $response = Director::test("admin/cms/publishall", array('confirm' => 1), $this->session()); @@ -42,7 +44,7 @@ class CMSMainTest extends FunctionalTest { // Some modules (e.g., cmsworkflow) will remove this action if(isset(CMSBatchActionHandler::$batch_actions['publish'])) { - $response = Director::test("admin/cms/batchactions/publish", array('csvIDs' => '1,2', 'ajax' => 1), $this->session()); + $response = Director::test("admin/cms/batchactions/publish", array('csvIDs' => implode(',', array($page1->ID, $page2->ID)), 'ajax' => 1), $this->session()); $responseData = Convert::json2array($response->getBody()); $this->assertTrue(property_exists($responseData['modified'], '1'));