From 8b09d794923ef4fd646a19775d3a9f56f5307b75 Mon Sep 17 00:00:00 2001 From: "deb.monish" Date: Tue, 5 Apr 2016 17:04:43 +0530 Subject: [PATCH] CRM-18343: Upgrade script and AJAX test fixes --- CRM/Upgrade/Incremental/sql/4.7.5.mysql.tpl | 2 +- tests/phpunit/CRM/Group/Page/AjaxTest.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CRM/Upgrade/Incremental/sql/4.7.5.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.5.mysql.tpl index 301ccd6185..5138ace125 100644 --- a/CRM/Upgrade/Incremental/sql/4.7.5.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.7.5.mysql.tpl @@ -30,4 +30,4 @@ WHERE ov.name = 'Contact Deleted by Merge' AND og.name = 'activity_type'; {/foreach} {else} ALTER TABLE civicrm_option_value CHANGE label label varchar( 512 ) DEFAULT NULL ; -{/if} \ No newline at end of file +{/if} diff --git a/tests/phpunit/CRM/Group/Page/AjaxTest.php b/tests/phpunit/CRM/Group/Page/AjaxTest.php index a40beb1895..cbd2f4a9fb 100644 --- a/tests/phpunit/CRM/Group/Page/AjaxTest.php +++ b/tests/phpunit/CRM/Group/Page/AjaxTest.php @@ -287,6 +287,7 @@ class CRM_Group_Page_AjaxTest extends CiviUnitTestCase { public function testTraditionalACLNotFoundTitle() { $this->_params['title'] = 'n'; $this->setupACL(); + $this->setPermissionAndRequest('edit groups'); list($groups, $total) = CRM_Group_Page_AJAX::getGroupList(); $this->assertEquals(0, count($groups), 'Returned groups should exclude disabled by default'); $this->assertEquals(0, $total, 'Total needs to be set correctly'); @@ -328,6 +329,7 @@ class CRM_Group_Page_AjaxTest extends CiviUnitTestCase { $this->_params['status'] = 2; $this->_params['title'] = 'n'; $this->setupACL(); + $this->setPermissionAndRequest('edit groups'); list($groups, $total) = CRM_Group_Page_AJAX::getGroupList(); $this->assertEquals(0, count($groups), 'Returned groups should exclude disabled by default'); $this->assertEquals(0, $total, 'Total needs to be set correctly'); -- 2.25.1