Fix merge conflict

civicrm · Apr 28, 2017 · 7873f40 · 7873f40
1 parent 43c6eb8
commit 7873f40
Showing 1 changed file with 0 additions and 23 deletions.
diff --git a/tests/phpunit/CRM/Activity/BAO/ActivityTest.php b/tests/phpunit/CRM/Activity/BAO/ActivityTest.php
@@ -463,29 +463,6 @@ public function testGetActivitiesForAdminDashboardAclLimitedViewContacts() {
 
   }
 
-  /**
-   * Test getActivities BAO method.
-   */
-  public function testGetActivitiesForAdminDashboardNoViewContacts() {
-    CRM_Core_Config::singleton()->userPermissionClass->permissions = array('access CiviCRM');
-    $this->setUpForActivityDashboardTests();
-    $activities = CRM_Activity_BAO_Activity::getActivities($this->_params);
-    $this->assertEquals(0, count($activities));
-  }
-
-  /**
-   * Test getActivities BAO method.
-   */
-  public function testGetActivitiesForAdminDashboardAclLimitedViewContacts() {
-    CRM_Core_Config::singleton()->userPermissionClass->permissions = array('access CiviCRM');
-    $this->allowedContacts = array(1, 3, 4, 5);
-    $this->hookClass->setHook('civicrm_aclWhereClause', array($this, 'aclWhereMultipleContacts'));
-    $this->setUpForActivityDashboardTests();
-    $activities = CRM_Activity_BAO_Activity::getActivities($this->_params);
-    $this->assertEquals(1, count($activities));
-
-  }
-
   /**
    * Test getActivities BAO method.
    */