From 3ad1af927298370b2c1b4c272e268e1f4ed7c8c0 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 8 Apr 2020 14:26:39 +1200
Subject: [PATCH] Enable test on merging country, it now works

---
 tests/phpunit/api/v3/ContactTest.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/phpunit/api/v3/ContactTest.php b/tests/phpunit/api/v3/ContactTest.php
index 90f0e22e82..85457a2c34 100644
--- a/tests/phpunit/api/v3/ContactTest.php
+++ b/tests/phpunit/api/v3/ContactTest.php
@@ -3893,7 +3893,7 @@ class api_v3_ContactTest extends CiviUnitTestCase {
   /**
    * Test merging 2 contacts with custom fields.
    *
-   * @throws \Exception
+   * @throws \CRM_Core_Exception
    */
   public function testMergeCustomFields() {
     $contact1 = $this->individualCreate();
@@ -3921,8 +3921,7 @@ class api_v3_ContactTest extends CiviUnitTestCase {
       $linkField => 'http://example.org',
       $dateField => '2018-01-01 17:10:56',
       $selectField => 'G',
-      // Currently broken.
-      //$countryField => $countriesByName['New Zealand'],
+      $countryField => $countriesByName['New Zealand'],
     ];
     $this->callAPISuccess('Contact', 'create', array_merge([
       'id' => $contact1,
-- 
2.25.1