Return to the pr view after merging it

pagure/lib/tasks.py

@@ -775,7 +775,11 @@ def merge_pull_request(
 
     refresh_pr_cache.delay(name, namespace, user)
     return ret(
-        "ui_ns.view_repo", repo=name, username=user, namespace=namespace
+        "ui_ns.request_pull",
+        repo=name,
+        requestid=requestid,
+        username=user,
+        namespace=namespace,
     )
 
 

tests/test_pagure_flask_ui_fork.py

@@ -802,7 +802,7 @@ class PagureFlaskForktests(tests.Modeltests):
             )
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                "<title>Overview - test - Pagure</title>",
+                "<title>PR#1: PR from the feature branch - test\n - Pagure</title>",
                 output.get_data(as_text=True),
             )
 
@@ -857,7 +857,7 @@ class PagureFlaskForktests(tests.Modeltests):
             )
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                "<title>Overview - test - Pagure</title>",
+                "<title>PR#1: PR from the feature branch - test\n - Pagure</title>",
                 output.get_data(as_text=True),
             )
 
@@ -915,7 +915,8 @@ class PagureFlaskForktests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                "<title>Overview - test - Pagure</title>", output_text
+                "<title>PR#1: PR from the feature-branch branch - test\n - Pagure</title>",
+                output_text,
             )
             # Check the branch is not mentioned
             self.assertNotIn(

tests/test_pagure_flask_ui_remote_pr.py

@@ -491,7 +491,8 @@ class PagureRemotePRtests(tests.Modeltests):
             output_text = output.get_data(as_text=True)
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                "<title>Overview - test - Pagure</title>", output_text
+                "<title>PR#1: Remote PR title - test\n - Pagure</title>",
+                output_text,
             )
 
     @patch("pagure.lib.notify.send_email", MagicMock(return_value=True))

tests/test_pagure_lib_git_auth.py

@@ -221,7 +221,8 @@ class PagureLibGitAuthtests(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                "<title>Overview - hooktest - Pagure</title>", output_text
+                "<title>PR#1: PR to master - hooktest\n - Pagure</title>",
+                output_text,
             )
 
             # Check file after the merge

tests/test_pagure_merge_pr_no_fork.py

@@ -187,7 +187,8 @@ class PagureMergePrNoForkTest(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                "<title>Overview - test - Pagure</title>", output_text
+                "<title>PR#1: test pull-request - test\n - Pagure</title>",
+                output_text,
             )
 
         self.session = pagure.lib.query.create_session(self.dbpath)
@@ -215,7 +216,8 @@ class PagureMergePrNoForkTest(tests.Modeltests):
             self.assertEqual(output.status_code, 200)
             output_text = output.get_data(as_text=True)
             self.assertIn(
-                "<title>Overview - test - Pagure</title>", output_text
+                "<title>PR#1: test pull-request - test\n - Pagure</title>",
+                output_text,
             )
 
         self.session = pagure.lib.query.create_session(self.dbpath)