From ee78190953b50a1ab0a9ddb1e4dc22b95d54876e Mon Sep 17 00:00:00 2001
From: demeritcowboy <demeritcowboy@hotmail.com>
Date: Sun, 12 Jul 2020 06:43:22 -0400
Subject: [PATCH] comment out dependent test committed shortly after PR 17379
---
tests/phpunit/api/v3/ACLPermissionTest.php | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/tests/phpunit/api/v3/ACLPermissionTest.php b/tests/phpunit/api/v3/ACLPermissionTest.php
index 3035ac86687..af330361cae 100644
--- a/tests/phpunit/api/v3/ACLPermissionTest.php
+++ b/tests/phpunit/api/v3/ACLPermissionTest.php
@@ -1045,25 +1045,26 @@ class api_v3_ACLPermissionTest extends CiviUnitTestCase {
$this->cleanupCachedPermissions();
$vals = CustomValue::get($group)->execute();
- $this->assertCount(2, $vals);
+ //This is dependent on PR 17379 which is being reverted just for 5.28/5.27, so commenting this out for same.
+ //$this->assertCount(2, $vals);
$this->allowedContactId = $c2;
$this->hookClass->setHook('civicrm_aclWhereClause', [$this, 'aclWhereOnlyOne']);
$this->cleanupCachedPermissions();
$vals = CustomValue::get($group)->addSelect('*', 'contact.first_name')->execute();
- $this->assertCount(1, $vals);
- $this->assertEquals($c2, $vals[0]['entity_id']);
- $this->assertEquals('C2', $vals[0]['contact.first_name']);
+ //$this->assertCount(1, $vals);
+ //$this->assertEquals($c2, $vals[0]['entity_id']);
+ //$this->assertEquals('C2', $vals[0]['contact.first_name']);
$vals = Contact::get()
->addJoin('Custom_' . $group . ' AS cf')
->addSelect('first_name', 'cf.' . $textField)
->addWhere('is_deleted', '=', TRUE)
->execute();
- $this->assertCount(1, $vals);
- $this->assertEquals('C2', $vals[0]['first_name']);
- $this->assertEquals('2', $vals[0]['cf.' . $textField]);
+ //$this->assertCount(1, $vals);
+ //$this->assertEquals('C2', $vals[0]['first_name']);
+ //$this->assertEquals('2', $vals[0]['cf.' . $textField]);
}
}
--
GitLab