From d73d04d4c9e89550e84ea620cc378c816dc15f58 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Dec 22 2016 14:07:18 +0000
Subject: Fix unit-test broken by when we changed the UI on merge commits


---

diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py
index 2d570c3..5523497 100644
--- a/tests/test_pagure_flask_ui_repo.py
+++ b/tests/test_pagure_flask_ui_repo.py
@@ -1727,7 +1727,7 @@ class PagureFlaskRepotests(tests.Modeltests):
         self.assertTrue(
             '<div class="list-group" id="diff_list" style="display:none;">'
             in output.data)
-        self.assertTrue('  Authored by Alice Author\n' in output.data)
+        self.assertTrue('  Merged by Alice Author\n' in output.data)
         self.assertTrue('  Committed by Cecil Committer\n' in output.data)
 
         # View first commit - with the old URL scheme disabled - default
diff --git a/tests/test_zzz_pagure_flask_ui_old_commit.py b/tests/test_zzz_pagure_flask_ui_old_commit.py
index ec2f4b6..18c7bc8 100644
--- a/tests/test_zzz_pagure_flask_ui_old_commit.py
+++ b/tests/test_zzz_pagure_flask_ui_old_commit.py
@@ -94,7 +94,7 @@ class PagureFlaskRepoOldUrltests(tests.Modeltests):
         self.assertTrue(
             '<div class="list-group" id="diff_list" style="display:none;">'
             in output.data)
-        self.assertTrue('  Authored by Alice Author\n' in output.data)
+        self.assertTrue('  Merged by Alice Author\n' in output.data)
         self.assertTrue('  Committed by Cecil Committer\n' in output.data)
 
         self.assertTrue(
@@ -114,7 +114,7 @@ class PagureFlaskRepoOldUrltests(tests.Modeltests):
         self.assertTrue(
             '<div class="list-group" id="diff_list" style="display:none;">'
             in output.data)
-        self.assertTrue('  Authored by Alice Author\n' in output.data)
+        self.assertTrue('  Merged by Alice Author\n' in output.data)
         self.assertTrue('  Committed by Cecil Committer\n' in output.data)
 
         self.assertTrue(