projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c20af6a)
Disabled other obsolete output.
authorMattias Michaux <mattias.michaux@gmail.com>
Mon, 16 May 2016 19:49:43 +0000 (21:49 +0200)
committerMattias Michaux <mattias.michaux@gmail.com>
Mon, 16 May 2016 19:49:43 +0000 (21:49 +0200)
tests/phpunit/CRM/Dedupe/MergerTest.php patch | blob | blame | history

diff --git a/tests/phpunit/CRM/Dedupe/MergerTest.php b/tests/phpunit/CRM/Dedupe/MergerTest.php
index 069743f7855e240a1ef142c9c2fb583c8fe6e7ac..b86eb8b3a54eaaa3cb2d3c0d289031eedd580dea 100644 (file)
--- a/tests/phpunit/CRM/Dedupe/MergerTest.php
+++ b/tests/phpunit/CRM/Dedupe/MergerTest.php
@@ -157,6 +157,7 @@ class CRM_Dedupe_MergerTest extends CiviUnitTestCase {
     $object->set('gid', $this->_groupId);
     $object->set('rgid', $dao->id);
     $object->set('action', CRM_Core_Action::UPDATE);
+    $object->setEmbedded(TRUE);
     @$object->run();
 
     // Retrieve pairs from prev next cache table
@@ -219,6 +220,7 @@ class CRM_Dedupe_MergerTest extends CiviUnitTestCase {
     $object->set('gid', $this->_groupId);
     $object->set('rgid', $dao->id);
     $object->set('action', CRM_Core_Action::UPDATE);
+    $object->setEmbedded(TRUE);
     @$object->run();
 
     // Retrieve pairs from prev next cache table