diff --git a/pagure/lib/tasks.py b/pagure/lib/tasks.py index b2904e5..8b98f82 100644 --- a/pagure/lib/tasks.py +++ b/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, ) diff --git a/tests/test_pagure_flask_ui_fork.py b/tests/test_pagure_flask_ui_fork.py index 2c6b8a1..a7da7b2 100644 --- a/tests/test_pagure_flask_ui_fork.py +++ b/tests/test_pagure_flask_ui_fork.py @@ -802,7 +802,7 @@ class PagureFlaskForktests(tests.Modeltests): ) self.assertEqual(output.status_code, 200) self.assertIn( - "Overview - test - Pagure", + "PR#1: PR from the feature branch - test\n - Pagure", output.get_data(as_text=True), ) @@ -857,7 +857,7 @@ class PagureFlaskForktests(tests.Modeltests): ) self.assertEqual(output.status_code, 200) self.assertIn( - "Overview - test - Pagure", + "PR#1: PR from the feature branch - test\n - Pagure", 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( - "Overview - test - Pagure", output_text + "PR#1: PR from the feature-branch branch - test\n - Pagure", + output_text, ) # Check the branch is not mentioned self.assertNotIn( diff --git a/tests/test_pagure_flask_ui_remote_pr.py b/tests/test_pagure_flask_ui_remote_pr.py index 5efd64f..ad23a0c 100644 --- a/tests/test_pagure_flask_ui_remote_pr.py +++ b/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( - "Overview - test - Pagure", output_text + "PR#1: Remote PR title - test\n - Pagure", + output_text, ) @patch("pagure.lib.notify.send_email", MagicMock(return_value=True)) diff --git a/tests/test_pagure_lib_git_auth.py b/tests/test_pagure_lib_git_auth.py index 4a49e46..e71e5e0 100644 --- a/tests/test_pagure_lib_git_auth.py +++ b/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( - "Overview - hooktest - Pagure", output_text + "PR#1: PR to master - hooktest\n - Pagure", + output_text, ) # Check file after the merge diff --git a/tests/test_pagure_merge_pr_no_fork.py b/tests/test_pagure_merge_pr_no_fork.py index 3a08065..8ab13e3 100644 --- a/tests/test_pagure_merge_pr_no_fork.py +++ b/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( - "Overview - test - Pagure", output_text + "PR#1: test pull-request - test\n - Pagure", + 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( - "Overview - test - Pagure", output_text + "PR#1: test pull-request - test\n - Pagure", + output_text, ) self.session = pagure.lib.query.create_session(self.dbpath)