From 638fb464078cdcd612b20403f0c14dc4df12ad95 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Wed, 19 Nov 2014 11:03:48 +1300 Subject: [PATCH] Resolve merge regressions --- tests/controller/CMSMainTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/controller/CMSMainTest.php b/tests/controller/CMSMainTest.php index f2d1f31d..f9eb4cb5 100644 --- a/tests/controller/CMSMainTest.php +++ b/tests/controller/CMSMainTest.php @@ -247,7 +247,7 @@ class CMSMainTest extends FunctionalTest { $this->get('admin/pages/add'); $response = $this->post( 'admin/pages/add/AddForm', - array('ParentID' => '0', 'ClassName' => 'Page', 'Locale' => 'en_US', 'action_doAdd' => 1) + array('ParentID' => '0', 'PageType' => 'Page', 'Locale' => 'en_US', 'action_doAdd' => 1) ); // should redirect, which is a permission error $this->assertEquals(403, $response->getStatusCode(), 'Add TopLevel page must fail for normal user'); @@ -258,7 +258,7 @@ class CMSMainTest extends FunctionalTest { $response = $this->post( 'admin/pages/add/AddForm', - array('ParentID' => '0', 'ClassName' => 'Page', 'Locale' => 'en_US', 'action_doAdd' => 1) + array('ParentID' => '0', 'PageType' => 'Page', 'Locale' => 'en_US', 'action_doAdd' => 1) ); $this->assertEquals(302, $response->getStatusCode(), 'Must be a redirect on success');