From 00b4f76f48a607ab56f84b52424141b0f2b7cb7f Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jan 07 2016 11:12:41 +0000 Subject: [PATCH 1/2] Remove trailing spaces and handle the situation where there are no differences There are cases where the user could ask for a diff between two branches that have no differences in fact. We should account for this (and we do in the unit-tests) --- diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html index d465ccb..d808e0a 100644 --- a/pagure/templates/pull_request.html +++ b/pagure/templates/pull_request.html @@ -35,7 +35,7 @@ href="{{ url_for('request_pull_edit', username=username, repo=repo.name, requestid=requestid) }}" title="Update title">edit - + {% if pull_request.status == 'Open' and authenticated and (repo_admin or g.fas_user.username == pull_request.user.username) %}
- Proposed {{ pull_request.date_created |humanize }} + Proposed {{ pull_request.date_created |humanize }} by {{ pull_request.user.user | avatar(16) | safe }} {{ pull_request.user.user }} From - {{ pull_request.project_from.fullname or pull_request.remote_git}} + {{ pull_request.project_from.fullname or pull_request.remote_git}} {{ pull_request.branch_from }} into - {{ pull_request.project.fullname }} + {{ pull_request.project.fullname }} {{ pull_request.branch }}
@@ -133,14 +133,14 @@ {% endif %}
@@ -293,7 +295,7 @@ {% endif %} - + {% if authenticated and mergeform and pull_request %}
@@ -354,7 +356,7 @@ {% endif %}
- + {% if pull_request.flags %}
    @@ -375,7 +377,7 @@
{% endif %} - + {#
@@ -702,7 +704,7 @@ function setup_reply_btns() { $('#merge-alert').addClass("alert-success"); $('#merge-alert-message').append(res.message); $('#merge-alert').show(); - } + } else if (res.code == 'MERGE') { $('#merge_btn').addClass("btn-warning"); $('#merge-alert').addClass("alert-warning"); From fec7dec0fc2959012d7c1409325c4c2d90851d91 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jan 07 2016 11:12:51 +0000 Subject: [PATCH 2/2] Fix the unit-tests for the change in the PR page --- diff --git a/tests/test_progit_flask_ui_fork.py b/tests/test_progit_flask_ui_fork.py index d5f153e..5fb889b 100644 --- a/tests/test_progit_flask_ui_fork.py +++ b/tests/test_progit_flask_ui_fork.py @@ -318,8 +318,9 @@ class PagureFlaskForktests(tests.Modeltests): 'PR#1: PR from the feature branch - test\n - ' 'Pagure', output.data) self.assertIn( - '

PR#1 ' - 'PR from the feature branch', output.data) + '

PR#1 PR from ' + 'the feature branch ', + output.data) self.assertIn( '\n This request must be ' 'assigned to be merged', output.data) @@ -335,8 +336,9 @@ class PagureFlaskForktests(tests.Modeltests): '/test/pull-request/1/merge', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) self.assertIn( - '

PR#1 ' - 'PR from the feature branch', output.data) + '

PR#1 PR from ' + 'the feature branch ', + output.data) self.assertIn( '\n Only the assignee can ' 'merge this review', output.data) @@ -352,8 +354,9 @@ class PagureFlaskForktests(tests.Modeltests): '/test/pull-request/1/merge', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) self.assertIn( - '

PR#1 ' - 'PR from the feature branch', output.data) + '

PR#1 PR from ' + 'the feature branch ', + output.data) self.assertIn( '\n This request does not ' 'have the minimum review score necessary to be merged', @@ -436,8 +439,9 @@ class PagureFlaskForktests(tests.Modeltests): '/test/pull-request/1/merge', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) self.assertIn( - '

PR#1 ' - 'PR from the feature branch', output.data) + '

PR#1 PR from ' + 'the feature branch ', + output.data) self.assertIn( '\n Merge conflicts!', output.data) @@ -593,7 +597,8 @@ class PagureFlaskForktests(tests.Modeltests): self.assertIn( '

PR#1 ' 'PR from the feature branch

', output.data) - self.assertTrue(output.data.count(''), 1) + self.assertTrue( + output.data.count('0', + output.data) self.assertIn('(0 Closed)', output.data) self.set_up_git_repo(new_project=None, branch_from='feature') output = self.app.get('/test/pull-requests') self.assertEqual(output.status_code, 200) - self.assertIn('Pull-requests (1)', output.data) + self.assertIn( + 'Pull Requests 1', + output.data) self.assertIn('(0 Closed)', output.data) output = self.app.get('/test/pull-requests?status=Closed') self.assertEqual(output.status_code, 200) - self.assertIn('Closed Pull-requests (0)', output.data) + self.assertIn( + 'Closed Pull Requests 0', + output.data) self.assertIn('(1 Open)', output.data) output = self.app.get('/test/pull-requests?status=0') self.assertEqual(output.status_code, 200) - self.assertIn('Closed/Merged Pull-requests (0)', output.data) + self.assertIn( + 'Closed/Merged Pull Requests 0', + output.data) self.assertIn('(1 Open)', output.data) # Project w/o pull-request @@ -1284,7 +1297,7 @@ index 0000000..2a552bb 'Diff from master to feature - test - Pagure', output.data) self.assertIn( - ' No commits found ', output.data) + '

No commits found

', output.data) output = self.app.get('/test/diff/master..feature') self.assertEqual(output.status_code, 200) @@ -1303,8 +1316,8 @@ index 0000000..2a552bb ' Create new Pull Request for master - test - ' 'Pagure', output.data) self.assertIn( - '', output.data) + '', + output.data) csrf_token = output.data.split( 'name="csrf_token" type="hidden" value="')[1].split('">')[0] @@ -1527,8 +1540,9 @@ index 0000000..2a552bb follow_redirects=True) self.assertEqual(output.status_code, 200) self.assertIn( - '

PR#1 ' - 'PR from the feature branch', output.data) + '

PR#1 PR from ' + 'the feature branch ', + output.data) self.assertIn( '\n Comment removed', output.data) @@ -1583,8 +1597,9 @@ index 0000000..2a552bb self.assertEqual(output.status_code, 200) self.assertIn( - '

PR#1 ' - 'PR from the feature branch', output.data) + '

PR#1 PR from ' + 'the feature branch ', + output.data) self.assertIn( '\n Comment added', output.data) @@ -1613,8 +1628,9 @@ index 0000000..2a552bb self.assertIn( '

This look alright but we can do better than this.

', output.data) self.assertIn( - '

PR#1 ' - 'PR from the feature branch', output.data) + '

PR#1 PR from ' + 'the feature branch ', + output.data) # Checking if Edited by User is there or not self.assertIn( 'Edited just now by pingou ', diff --git a/tests/test_progit_flask_ui_slash_branch_name.py b/tests/test_progit_flask_ui_slash_branch_name.py index 38743c7..d01050e 100644 --- a/tests/test_progit_flask_ui_slash_branch_name.py +++ b/tests/test_progit_flask_ui_slash_branch_name.py @@ -352,7 +352,8 @@ class PagureFlaskSlashInBranchtests(tests.Modeltests): output = self.app.get('/test/diff/master..maxamilion/feature') # (used to be 302 but seeing a diff is allowed even logged out) self.assertEqual(output.status_code, 200) - self.assertEqual(output.data.count(''), 1) + self.assertEqual( + output.data.count('.gitignore', output.data) user = tests.FakeUser() @@ -360,7 +361,7 @@ class PagureFlaskSlashInBranchtests(tests.Modeltests): output = self.app.get('/test/diff/master..maxamilion/feature') self.assertEqual(output.status_code, 200) self.assertEqual( - output.data.count(''), 1) + output.data.count('.gitignore', output.data)