diff --git a/tests/test_progit_flask_api_fork.py b/tests/test_progit_flask_api_fork.py index 592a572..41ea5b9 100644 --- a/tests/test_progit_flask_api_fork.py +++ b/tests/test_progit_flask_api_fork.py @@ -54,7 +54,7 @@ class PagureFlaskApiForktests(tests.Modeltests): # Create a pull-request repo = pagure.lib.get_project(self.session, 'test') forked_repo = pagure.lib.get_project(self.session, 'test') - msg = pagure.lib.new_pull_request( + req = pagure.lib.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -65,7 +65,8 @@ class PagureFlaskApiForktests(tests.Modeltests): requestfolder=None, ) self.session.commit() - self.assertEqual(msg, 'Request created') + self.assertEqual(req.id, 1) + self.assertEqual(req.title, 'test pull-request') # Invalid repo output = self.app.get('/api/0/foo/pull-requests') @@ -177,7 +178,7 @@ class PagureFlaskApiForktests(tests.Modeltests): # Create a pull-request repo = pagure.lib.get_project(self.session, 'test') forked_repo = pagure.lib.get_project(self.session, 'test') - msg = pagure.lib.new_pull_request( + req = pagure.lib.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -188,7 +189,8 @@ class PagureFlaskApiForktests(tests.Modeltests): requestfolder=None, ) self.session.commit() - self.assertEqual(msg, 'Request created') + self.assertEqual(req.id, 1) + self.assertEqual(req.title, 'test pull-request') # Invalid repo output = self.app.get('/api/0/foo/pull-request/1') @@ -304,7 +306,7 @@ class PagureFlaskApiForktests(tests.Modeltests): # Create the pull-request to close repo = pagure.lib.get_project(self.session, 'test') forked_repo = pagure.lib.get_project(self.session, 'test') - msg = pagure.lib.new_pull_request( + req = pagure.lib.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -315,7 +317,8 @@ class PagureFlaskApiForktests(tests.Modeltests): requestfolder=None, ) self.session.commit() - self.assertEqual(msg, 'Request created') + self.assertEqual(req.id, 1) + self.assertEqual(req.title, 'test pull-request') headers = {'Authorization': 'token aaabbbcccddd'} @@ -414,7 +417,7 @@ class PagureFlaskApiForktests(tests.Modeltests): # Create the pull-request to close repo = pagure.lib.get_project(self.session, 'test') forked_repo = pagure.lib.get_project(self.session, 'test') - msg = pagure.lib.new_pull_request( + req = pagure.lib.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -425,7 +428,8 @@ class PagureFlaskApiForktests(tests.Modeltests): requestfolder=None, ) self.session.commit() - self.assertEqual(msg, 'Request created') + self.assertEqual(req.id, 1) + self.assertEqual(req.title, 'test pull-request') headers = {'Authorization': 'token aaabbbcccddd'} @@ -566,7 +570,7 @@ class PagureFlaskApiForktests(tests.Modeltests): # Create a pull-request repo = pagure.lib.get_project(self.session, 'test') forked_repo = pagure.lib.get_project(self.session, 'test') - msg = pagure.lib.new_pull_request( + req = pagure.lib.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -577,7 +581,8 @@ class PagureFlaskApiForktests(tests.Modeltests): requestfolder=None, ) self.session.commit() - self.assertEqual(msg, 'Request created') + self.assertEqual(req.id, 1) + self.assertEqual(req.title, 'test pull-request') # Check comments before request = pagure.lib.search_pull_requests( @@ -680,7 +685,7 @@ class PagureFlaskApiForktests(tests.Modeltests): # Create a pull-request repo = pagure.lib.get_project(self.session, 'test') forked_repo = pagure.lib.get_project(self.session, 'test') - msg = pagure.lib.new_pull_request( + req = pagure.lib.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -691,7 +696,8 @@ class PagureFlaskApiForktests(tests.Modeltests): requestfolder=None, ) self.session.commit() - self.assertEqual(msg, 'Request created') + self.assertEqual(req.id, 1) + self.assertEqual(req.title, 'test pull-request') # Check comments before request = pagure.lib.search_pull_requests( diff --git a/tests/test_progit_flask_internal.py b/tests/test_progit_flask_internal.py index 7300ceb..d812b13 100644 --- a/tests/test_progit_flask_internal.py +++ b/tests/test_progit_flask_internal.py @@ -58,7 +58,7 @@ class PagureFlaskInternaltests(tests.Modeltests): repo = pagure.lib.get_project(self.session, 'test') - msg = pagure.lib.new_pull_request( + req = pagure.lib.new_pull_request( session=self.session, repo_from=repo, branch_from='feature', @@ -69,7 +69,8 @@ class PagureFlaskInternaltests(tests.Modeltests): requestfolder=None, ) self.session.commit() - self.assertEqual(msg, 'Request created') + self.assertEqual(req.id, 1) + self.assertEqual(req.title, 'PR from the feature branch') request = repo.requests[0] self.assertEqual(len(request.comments), 0) @@ -353,7 +354,7 @@ class PagureFlaskInternaltests(tests.Modeltests): # Create a PR for these changes tests.create_projects(self.session) project = pagure.lib.get_project(self.session, 'test') - msg = pagure.lib.new_pull_request( + req = pagure.lib.new_pull_request( session=self.session, repo_from=project, branch_from='feature', @@ -364,7 +365,8 @@ class PagureFlaskInternaltests(tests.Modeltests): requestfolder=None, ) self.session.commit() - self.assertEqual(msg, 'Request created') + self.assertEqual(req.id, 1) + self.assertEqual(req.title, 'PR from the feature branch') # Check if the PR can be merged data = { @@ -474,7 +476,7 @@ class PagureFlaskInternaltests(tests.Modeltests): # Create a PR for these changes tests.create_projects(self.session) project = pagure.lib.get_project(self.session, 'test') - msg = pagure.lib.new_pull_request( + req = pagure.lib.new_pull_request( session=self.session, repo_from=project, branch_from='master', @@ -485,7 +487,8 @@ class PagureFlaskInternaltests(tests.Modeltests): requestfolder=None, ) self.session.commit() - self.assertEqual(msg, 'Request created') + self.assertEqual(req.id, 1) + self.assertEqual(req.title, 'PR from the feature branch') # Check if the PR can be merged data = { @@ -616,7 +619,7 @@ class PagureFlaskInternaltests(tests.Modeltests): # Create a PR for these changes tests.create_projects(self.session) project = pagure.lib.get_project(self.session, 'test') - msg = pagure.lib.new_pull_request( + req = pagure.lib.new_pull_request( session=self.session, repo_from=project, branch_from='feature', @@ -627,7 +630,8 @@ class PagureFlaskInternaltests(tests.Modeltests): requestfolder=None, ) self.session.commit() - self.assertEqual(msg, 'Request created') + self.assertEqual(req.id, 1) + self.assertEqual(req.title, 'PR from the feature branch') # Check if the PR can be merged data = {} @@ -756,7 +760,7 @@ class PagureFlaskInternaltests(tests.Modeltests): # Create a PR for these changes tests.create_projects(self.session) project = pagure.lib.get_project(self.session, 'test') - msg = pagure.lib.new_pull_request( + req = pagure.lib.new_pull_request( session=self.session, repo_from=project, branch_from='feature', @@ -767,7 +771,8 @@ class PagureFlaskInternaltests(tests.Modeltests): requestfolder=None, ) self.session.commit() - self.assertEqual(msg, 'Request created') + self.assertEqual(req.id, 1) + self.assertEqual(req.title, 'PR from the feature branch') # Check if the PR can be merged data = {} diff --git a/tests/test_progit_flask_ui_fork.py b/tests/test_progit_flask_ui_fork.py index da5f035..1068b72 100644 --- a/tests/test_progit_flask_ui_fork.py +++ b/tests/test_progit_flask_ui_fork.py @@ -187,7 +187,7 @@ class PagureFlaskForktests(tests.Modeltests): # Create a PR for these changes project = pagure.lib.get_project(self.session, 'test') - msg = pagure.lib.new_pull_request( + req = pagure.lib.new_pull_request( session=self.session, repo_from=project, branch_from=branch_from, @@ -198,7 +198,8 @@ class PagureFlaskForktests(tests.Modeltests): requestfolder=None, ) self.session.commit() - self.assertEqual(msg, 'Request created') + self.assertEqual(req.id, 1) + self.assertEqual(req.title, 'PR from the %s branch' % branch_from) shutil.rmtree(newpath) @@ -556,7 +557,7 @@ class PagureFlaskForktests(tests.Modeltests): # Create a PR for these changes project = pagure.lib.get_project(self.session, 'test') - msg = pagure.lib.new_pull_request( + req = pagure.lib.new_pull_request( session=self.session, repo_from=item, branch_from='feature', @@ -568,7 +569,8 @@ class PagureFlaskForktests(tests.Modeltests): ) self.session.commit() - self.assertEqual(msg, 'Request created') + self.assertEqual(req.id, 1) + self.assertEqual(req.title, 'PR from the feature branch') output = self.app.get('/test/pull-request/1') self.assertEqual(output.status_code, 200) @@ -613,7 +615,7 @@ class PagureFlaskForktests(tests.Modeltests): # Create a PR for these "changes" (there are none, both repos are # empty) project = pagure.lib.get_project(self.session, 'test') - msg = pagure.lib.new_pull_request( + req = pagure.lib.new_pull_request( session=self.session, repo_from=item, branch_from='feature', @@ -625,7 +627,8 @@ class PagureFlaskForktests(tests.Modeltests): ) self.session.commit() - self.assertEqual(msg, 'Request created') + self.assertEqual(req.id, 1) + self.assertEqual(req.title, 'PR from the feature branch') output = self.app.get('/test/pull-request/1', follow_redirects=True) self.assertEqual(output.status_code, 200) @@ -852,7 +855,7 @@ index 9f44358..2a552bb 100644 # Create a PR for these "changes" (there are none, both repos are # empty) project = pagure.lib.get_project(self.session, 'test') - msg = pagure.lib.new_pull_request( + req = pagure.lib.new_pull_request( session=self.session, repo_from=item, branch_from='feature', @@ -864,7 +867,8 @@ index 9f44358..2a552bb 100644 ) self.session.commit() - self.assertEqual(msg, 'Request created') + self.assertEqual(req.id, 1) + self.assertEqual(req.title, 'PR from the feature branch') output = self.app.get('/test/pull-request/1.patch', follow_redirects=True) self.assertEqual(output.status_code, 200) @@ -939,7 +943,7 @@ index 0000000..2a552bb # Create a PR for these "changes" (there are none, both repos are # empty) project = pagure.lib.get_project(self.session, 'test') - msg = pagure.lib.new_pull_request( + req = pagure.lib.new_pull_request( session=self.session, repo_from=item, branch_from='feature', @@ -951,7 +955,8 @@ index 0000000..2a552bb ) self.session.commit() - self.assertEqual(msg, 'Request created') + self.assertEqual(req.id, 1) + self.assertEqual(req.title, 'PR from the feature branch') output = self.app.get('/test/pull-request/1.patch', follow_redirects=True) self.assertEqual(output.status_code, 200) @@ -1282,7 +1287,8 @@ index 0000000..2a552bb '/test/diff/master..feature', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) self.assertIn( - 'Pull requests - test - Pagure', output.data) + 'Pull request #2 - test - Pagure', + output.data) self.assertIn( '
  • Request created
  • ', output.data) diff --git a/tests/test_progit_flask_ui_repo.py b/tests/test_progit_flask_ui_repo.py index 8eaf7ec..20e0212 100644 --- a/tests/test_progit_flask_ui_repo.py +++ b/tests/test_progit_flask_ui_repo.py @@ -1357,7 +1357,7 @@ index 0000000..fb7093d self.assertEqual(msg, 'Comment added') # add pull-requests - msg = pagure.lib.new_pull_request( + req = pagure.lib.new_pull_request( session=self.session, repo_from=repo, branch_from='feature', @@ -1368,9 +1368,10 @@ index 0000000..fb7093d requestfolder=os.path.join(tests.HERE, 'requests'), ) self.session.commit() - self.assertEqual(msg, 'Request created') + self.assertEqual(req.id, 3) + self.assertEqual(req.title, 'test pull-request') - msg = pagure.lib.new_pull_request( + req = pagure.lib.new_pull_request( session=self.session, repo_from=repo, branch_from='feature2', @@ -1381,7 +1382,8 @@ index 0000000..fb7093d requestfolder=os.path.join(tests.HERE, 'requests'), ) self.session.commit() - self.assertEqual(msg, 'Request created') + self.assertEqual(req.id, 4) + self.assertEqual(req.title, 'test pull-request') # Add comment on a pull-request request = pagure.lib.search_pull_requests( diff --git a/tests/test_progit_lib.py b/tests/test_progit_lib.py index 99c4748..c080b3e 100644 --- a/tests/test_progit_lib.py +++ b/tests/test_progit_lib.py @@ -1279,7 +1279,7 @@ class PagureLibtests(tests.Modeltests): forked_repo = pagure.lib.get_project( self.session, 'test', user='pingou') - msg = pagure.lib.new_pull_request( + req = pagure.lib.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -1290,7 +1290,8 @@ class PagureLibtests(tests.Modeltests): requestfolder=None, ) self.session.commit() - self.assertEqual(msg, 'Request created') + self.assertEqual(req.id, 1) + self.assertEqual(req.title, 'test pull-request') @patch('pagure.lib.notify.send_email') def test_add_pull_request_comment(self, mockemail): diff --git a/tests/test_progit_lib_git.py b/tests/test_progit_lib_git.py index 4abf331..9c30c08 100644 --- a/tests/test_progit_lib_git.py +++ b/tests/test_progit_lib_git.py @@ -630,7 +630,7 @@ index 458821a..77674a8 repo = pagure.lib.get_project(self.session, 'test_ticket_repo') # Create an issue to play with - msg = pagure.lib.new_pull_request( + req = pagure.lib.new_pull_request( session=self.session, repo_from=repo, branch_from='feature', @@ -644,8 +644,9 @@ index 458821a..77674a8 status=True, notify=True ) + self.assertEqual(req.id, 1) + self.assertEqual(req.title, 'test PR') - self.assertEqual(msg, 'Request created') request = repo.requests[0] self.assertEqual(request.title, 'test PR') pagure.lib.git.update_git(request, request.project, tests.HERE) diff --git a/tests/test_progit_lib_model.py b/tests/test_progit_lib_model.py index fa2bf1a..ff08eb6 100644 --- a/tests/test_progit_lib_model.py +++ b/tests/test_progit_lib_model.py @@ -87,7 +87,7 @@ class PagureLibModeltests(tests.Modeltests): self.session, 'test', user='pingou') # Create an pull-request - msg = pagure.lib.new_pull_request( + req = pagure.lib.new_pull_request( session=self.session, repo_from=forked_repo, branch_from='master', @@ -97,7 +97,13 @@ class PagureLibModeltests(tests.Modeltests): user='pingou', requestfolder=None, ) - self.assertEqual(msg, 'Request created') + self.assertEqual(req.id, 1) + self.assertEqual(req.title, 'test pull-request') + + self.assertEqual( + str(req), + 'PullRequest(1, project:test, user:pingou, ' + 'title:test pull-request)') request = pagure.lib.search_pull_requests(self.session, requestid=1) self.assertEqual(