Permalink
Browse files

MINOR Made CMSMainTest more resilient against database ID changes (Po…

…stgres doesn't have auto-increment resets across tests at the moment)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106248 467b73ca-7a2a-4603-9d3b-597d59a354a9
  • Loading branch information...
1 parent 3877eae commit a010ab82a35aedec87f6dd8c07fd74daf6b88f9b @chillu chillu committed with sminnee Jun 8, 2010
Showing with 5 additions and 3 deletions.
  1. +5 −3 tests/CMSMainTest.php
View
@@ -31,6 +31,8 @@ static function tear_down_once() {
* @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,10 +44,10 @@ function testPublish() {
// 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());
- $this->assertContains('setNodeTitle(1, \'Page 1\');', $response->getBody());
- $this->assertContains('setNodeTitle(2, \'Page 2\');', $response->getBody());
+ $this->assertContains(sprintf('setNodeTitle(%d, \'Page 1\');', $page1->ID), $response->getBody());
+ $this->assertContains(sprintf('setNodeTitle(%d, \'Page 2\');', $page2->ID), $response->getBody());
}
// Get the latest version of the redirector page

0 comments on commit a010ab8

Please sign in to comment.