Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: civicrm/civicrm-core
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b253bf3f02560a1ba98af04539836818194f71d8
Choose a base ref
..
head repository: civicrm/civicrm-core
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 05fe457afe95ce7d684ce1943a4da8957a4b64f2
Choose a head ref
Showing with 4 additions and 2 deletions.
  1. +4 −2 tests/phpunit/CRM/Dedupe/MergerTest.php
6 changes: 4 additions & 2 deletions tests/phpunit/CRM/Dedupe/MergerTest.php
Original file line number Diff line number Diff line change
@@ -285,8 +285,10 @@ public function testBatchMergeAllDuplicates() {
*/
public function testGetCidRefs() {
$this->entityCustomGroupWithSingleFieldCreate(__FUNCTION__, 'Contacts');
$this->assertEquals($this->getStaticCIDRefs(), CRM_Dedupe_Merger::cidRefs());
$this->assertEquals($this->getCalculatedCIDRefs(), CRM_Dedupe_Merger::cidRefs());
// These are deliberately unset.
$unsetRefs = array_fill_keys(['civicrm_group_contact_cache', 'civicrm_acl_cache', 'civicrm_acl_contact_cache'], 1);
$this->assertEquals(array_diff_key($this->getStaticCIDRefs(), $unsetRefs), CRM_Dedupe_Merger::cidRefs());
$this->assertEquals(array_diff_key($this->getCalculatedCIDRefs(), $unsetRefs), CRM_Dedupe_Merger::cidRefs());
}

/**