CRM-18343: Upgrade script and AJAX test fixes

diff --git a/CRM/Upgrade/Incremental/sql/4.7.5.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.5.mysql.tpl
index 301ccd61850415fa5e4667048de523831d506da2..5138ace125682f98a9a08acfac4fd5a5ab80e8af 100644 (file)
--- 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 a40beb18953e112413208174966ac80eac00f373..cbd2f4a9fb7aeec3602e7071aeb8d734ccb781c2 100644 (file)
--- 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');