From 12d387d25cc5645ccf06449f3a91c99565e52989 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Tue, 17 Jul 2018 19:59:27 +1200
Subject: [PATCH] Fix message update routine.

Turns out this was seeming to pass but not because the test wasn't running.
---
 CRM/Upgrade/Incremental/MessageTemplates.php       |  1 +
 tests/phpunit/CRM/Upgrade/Incremental/BaseTest.php | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CRM/Upgrade/Incremental/MessageTemplates.php b/CRM/Upgrade/Incremental/MessageTemplates.php
index e04d4613cd..7b11e199df 100644
--- a/CRM/Upgrade/Incremental/MessageTemplates.php
+++ b/CRM/Upgrade/Incremental/MessageTemplates.php
@@ -138,6 +138,7 @@ class CRM_Upgrade_Incremental_MessageTemplates {
           ON reserved.workflow_id = default_template.workflow_id
         WHERE reserved.workflow_id = $workFlowID
         AND reserved.is_reserved = 1 AND default_template.is_default = 1 AND reserved.id <> default_template.id
+        AND reserved.msg_{$template['type']} = default_template.msg_{$template['type']}
       ");
       if ($defaultTemplateID) {
         $templatesToUpdate[] = $defaultTemplateID;
diff --git a/tests/phpunit/CRM/Upgrade/Incremental/BaseTest.php b/tests/phpunit/CRM/Upgrade/Incremental/BaseTest.php
index 6acfaeb204..fc8e00a9fc 100644
--- a/tests/phpunit/CRM/Upgrade/Incremental/BaseTest.php
+++ b/tests/phpunit/CRM/Upgrade/Incremental/BaseTest.php
@@ -4,7 +4,7 @@
  * Class CRM_UF_Page_ProfileEditorTest
  * @group headless
  */
-class CRM_Upgrade_Incremental_Base_Test extends CiviUnitTestCase {
+class CRM_Upgrade_Incremental_BaseTest extends CiviUnitTestCase {
 
   /**
    * Test message upgrade process.
@@ -24,7 +24,7 @@ class CRM_Upgrade_Incremental_Base_Test extends CiviUnitTestCase {
 
     foreach ($templates as $template) {
       $msg_text = $this->callAPISuccessGetValue('MessageTemplate', ['id' => $template['id'], 'return' => 'msg_text']);
-      $this->assertContains('{ts}Membership Information{/ts}', $msg_text);
+      $this->assertContains('{assign var="greeting" value="{contact.email_greeting}"}{if $greeting}{$greeting},{/if}', $msg_text);
       if ($msg_text !== $originalText) {
         // Reset value for future tests.
         $this->callAPISuccess('MessageTemplate', 'create', ['msg_text' => $originalText, 'id' => $template['id']]);
@@ -54,7 +54,7 @@ class CRM_Upgrade_Incremental_Base_Test extends CiviUnitTestCase {
     foreach ($templates as $template) {
       $msg_text = $this->callAPISuccessGetValue('MessageTemplate', ['id' => $template['id'], 'return' => 'msg_text']);
       if ($template['is_reserved']) {
-        $this->assertTrue(strstr($msg_text, '{ts}Membership Information{/ts}'));
+        $this->assertContains('{assign var="greeting" value="{contact.email_greeting}"}{if $greeting}{$greeting},{/if}', $msg_text);
       }
       else {
         $this->assertEquals('great what a silly sausage you are', $msg_text);
@@ -73,7 +73,11 @@ class CRM_Upgrade_Incremental_Base_Test extends CiviUnitTestCase {
   public function testMessageTemplateGetUpgradeMessages() {
     $messageTemplateObject = new CRM_Upgrade_Incremental_MessageTemplates('5.4.alpha1');
     $messages = $messageTemplateObject->getUpgradeMessages();
-    $this->assertEquals(['Memberships - Receipt (on-line)' => 'Use email greeting at top where available'], $messages);
+    $this->assertEquals([
+      'Memberships - Receipt (on-line)' => 'Use email greeting at top where available',
+      'Contributions - Receipt (on-line)' => 'Use email greeting at top where available',
+      'Events - Registration Confirmation and Receipt (on-line)' => 'Use email greeting at top where available',
+    ], $messages);
   }
 
 }
-- 
2.25.1