diff --git a/pagure/default_config.py b/pagure/default_config.py index 8701134..e828816 100644 --- a/pagure/default_config.py +++ b/pagure/default_config.py @@ -341,11 +341,11 @@ EXCLUDE_GROUP_INDEX = [] TRIGGER_CI = ['pretty please pagure-ci rebuild'] FLAG_STATUSES_LABELS = { - 'success': 'label-success', - 'failure': 'label-danger', - 'error': 'label-danger', - 'pending': 'label-info', - 'canceled': 'label-warning', + 'success': 'badge-success', + 'failure': 'badge-danger', + 'error': 'badge-danger', + 'pending': 'badge-info', + 'canceled': 'badge-warning', } FLAG_SUCCESS = 'success' FLAG_FAILURE = 'failure' diff --git a/pagure/static/pagure.css b/pagure/static/pagure.css index 91638fe..f2a026c 100644 --- a/pagure/static/pagure.css +++ b/pagure/static/pagure.css @@ -181,10 +181,8 @@ white-space: nowrap; #preview { - min-height: 16rem; - background:#efefef; + min-height: 12rem; padding:1em; - border:1px solid #aaa; } .form-control#initial_comment @@ -598,10 +596,6 @@ th[data-sort] { cursor: pointer; } -.pr-changes-description -{ - font-size: 0.8em; -} .readme dd{ margin-left:2em; @@ -808,3 +802,17 @@ a.nav-link.btn{ .progress-bar{ height: inherit; } + +.text-semimuted{ + color:#555!important; +} + +.font-size-09{ + font-size:0.9em; +} + +.autogenerated-comment p{ + margin-bottom:0; +} + + diff --git a/pagure/templates/_formhelper.html b/pagure/templates/_formhelper.html index 86f08a7..2e35fe3 100644 --- a/pagure/templates/_formhelper.html +++ b/pagure/templates/_formhelper.html @@ -108,21 +108,74 @@ {% macro show_comment(comment, id, repo, username, issueid, form) %} -
-
- {{ comment.user.default_email | avatar(16) | safe }} - - {{ comment.user.user }} - - - {{ comment.date_created | humanize}} - +
+
+
+ {{ comment.user.default_email | avatar(24) | safe }} + + {{ comment.user.user }} + + + commented {{ comment.date_created | humanize}} + +
+
+
+
+ + {% if id != 0 and g.fas_user %} + {% if config.get('REACTIONS') %} +
+ +
+ {% for label, emoji in config.get('REACTIONS') %} + + {% endfor %} +
+
+ {% endif %} + {% endif%} + + + {% if g.fas_user %} + + + + {% endif %} + {% if id != 0 and g.fas_user and (g.repo_committer or ( + comment.parent.status in [True, 'Open'] + and g.fas_user.username == comment.user.username)) %} + + + + {% endif %} + {% if id != 0 and g.fas_user and (g.repo_committer or ( + comment.parent.status in [True, 'Open'] + and g.fas_user.username == comment.user.username)) %} + + {% endif %} +
+
+
-
+
- {% if comment.edited_on %} - Edited {{ comment.edited_on | humanize }} by {{ comment.editor.username }} - {% endif %} -
-
- {% for r in comment.reactions | sort %} - - {% endfor %} -
+
+
+ {% if comment.edited_on %} +
+ Edited {{ comment.edited_on | humanize }} by {{ comment.editor.username }}
-
-
- {% if id != 0 and g.fas_user %} - {% if config.get('REACTIONS') %} -
- -
- {% for label, emoji in config.get('REACTIONS') %} - - {% endfor %} -
-
+ {% endif %} + +
+
+ {% for r in comment.reactions | sort %} + + {% endfor %} +
+
+
+ +
+{% endmacro %} + +{% macro show_pr_initial_comment(pull_request, repo, form, username) %} +
+ {%if pull_request.initial_comment %} +
+
+ {{ pull_request.user.default_email | avatar(24) | safe }} + + {{ pull_request.user.user }} + + + commented {{ pull_request.date_created | humanize}} + +
+
+
+
+ {% if g.fas_user %} + + + {% endif %} - - + {% if g.fas_user and (g.repo_committer or g.fas_user.username == pull_request.user.username) %} + + - {% endif %} - {% if id != 0 and g.fas_user and (g.repo_committer or ( - comment.parent.status in [True, 'Open'] - and g.fas_user.username == comment.user.username)) %} - - - - {% endif %} - {% if id != 0 and g.fas_user and (g.repo_committer or ( - comment.parent.status in [True, 'Open'] - and g.fas_user.username == comment.user.username)) %} - - {% endif %} + {% endif %} +
-
+
+
+
+ + {{ pull_request.initial_comment | markdown | noJS | safe }} + +
+
+
+ {% else %} +
+ no initial comment + {% if g.fas_user and (g.repo_committer or g.fas_user.username == pull_request.user.username) %} +
+ {% if pull_request.status == 'Open' %} + + add initial comment + + {% endif %} +
+ {% endif %} +
+ {% endif %} +
{% endmacro %} diff --git a/pagure/templates/commit.html b/pagure/templates/commit.html index 4249650..875a62f 100644 --- a/pagure/templates/commit.html +++ b/pagure/templates/commit.html @@ -134,7 +134,7 @@ {{ flag.username }}
- + {{- flag.status -}} {%- if flag.percent %} ({{ flag.percent }}%) {%- endif -%} diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html index 2f74375..682fd85 100644 --- a/pagure/templates/pull_request.html +++ b/pagure/templates/pull_request.html @@ -1,5 +1,5 @@ {% extends "repo_master.html" %} -{% from "_formhelper.html" import show_comment, render_bootstrap_field %} +{% from "_formhelper.html" import show_comment, show_pr_initial_comment, render_bootstrap_field %} {% block title %} {%- if pull_request -%} @@ -26,127 +26,222 @@ {% endblock %} {% block repo %} -
-
{% if pull_request %} -

PR#{{requestid}} - {% if pull_request.status != 'Open' and pull_request.status != 'Closed' %} - {{pull_request.status}} - {% endif %} - {{ pull_request.title | noJS(ignore="img") | safe}} - {% if g.authenticated and (g.fas_user.username == pull_request.user.username - or g.repo_committer) and pull_request.status == 'Open'%} - - {% if pull_request.status == 'Open' and g.authenticated and - (g.repo_committer or g.fas_user.username == pull_request.user.username) %} - {% if mergeform and pull_request.remote %} -
- - {{ mergeform.csrf_token }} +
+

+
+ {% if pull_request.status == 'Open' %} + + #{{requestid}} + {% elif pull_request.status == 'Merged' %} + + #{{requestid}} + {% elif pull_request.status == 'Closed' %} + + #{{requestid}} + {% endif %} + + {{ pull_request.title | noJS(ignore="img") | safe}} + + {% if g.authenticated and (g.fas_user.username == pull_request.user.username + or g.repo_committer) and pull_request.status == 'Open'%} + + {% endif %} +
+
+ + {% if pull_request.status == 'Open' %} + + Opened {{ pull_request.date_created |humanize }} + + by {{ pull_request.user.user }}. + + Modified {{ pull_request.last_updated |humanize }} + + {% elif pull_request.status == 'Merged' %} + + Merged {{ pull_request.closed_at |humanize }} + + by + {{ pull_request.user.user }}. + + Opened {{ pull_request.date_created |humanize }} + + by {{ pull_request.user.user }}. + {% elif pull_request.status == 'Closed' %} + + Cancelled {{ pull_request.closed_at |humanize }} + + by + {{ pull_request.user.user }}. + + Opened {{ pull_request.date_created |humanize }} + + by {{ pull_request.user.user }}. + {% endif %} + +
+
+ + {% if pull_request.remote_git or pull_request.project_from.is_fork %} + + {% if pull_request.remote_git %} + + {{pull_request.remote_git}} + {% elif pull_request.project_from.is_fork %} + + {% if pull_request.project_from.namespace %} + {{pull_request.project_from.namespace}}/ + {% endif %} + {% if pull_request.project_from.is_fork -%} + {{ pull_request.project_from.user.user }}/ + {%- endif -%} + {{pull_request.project_from.name}} + {% endif %} + + {% endif %} + + + {{ pull_request.branch_from }} + +  into  + + + {{ pull_request.branch }} + + +
+ + +

+
+ {% if g.authenticated and (g.fas_user.username == pull_request.user.username + or g.repo_committer) and pull_request.status == 'Open'%} + {% if pull_request.status == 'Open' and g.authenticated and + (g.repo_committer or g.fas_user.username == pull_request.user.username) %} + {% if mergeform and pull_request.remote %} + + + {{ mergeform.csrf_token }} + + {% endif %} + +
+ {% endif %} + + {% if pull_request.status == 'Open' and g.authenticated and + (g.repo_committer or g.fas_user.username == pull_request.user.username) %} + {{ mergeform.csrf_token }} + + {% endif %} + {% if pull_request.status == 'Open' and g.authenticated and + (g.repo_committer or g.fas_user.username == pull_request.user.username) %}
{% endif %} + {% endif %} + {% if pull_request.status == 'Open' %} +
+ + Merge + -
+
+ {% if pull_request.status == 'Open' and g.repo_committer %} + + + {{ mergeform.csrf_token }} + + {% if can_delete_branch %} +
+ {{ mergeform.delete_branch }} {{ mergeform.delete_branch.label }} +
+ {% endif %} + + {% else %} + + {% endif %} +
+
+
+ {% endif %} + {% if pull_request.status == 'Closed' and g.authenticated and + (g.repo_committer or g.fas_user.username == pull_request.user.username) %} +
- {% endif %} -
- - {% if pull_request.status == 'Open' and g.authenticated and - (g.repo_committer or g.fas_user.username == pull_request.user.username) %} - {{ mergeform.csrf_token }} - - {% endif %} -
- {% if pull_request.status == 'Open' and g.authenticated and - (g.repo_committer or g.fas_user.username == pull_request.user.username) %} + {{ mergeform.csrf_token }} +
- {% endif %} - - {% endif %} -

- -
- Proposed {{ pull_request.date_created |humanize }} - by {{ pull_request.user.default_email | avatar(16) | safe - }} {{ pull_request.user.user }} -
-
- Modified {{ pull_request.last_updated |humanize }} -
- - From - {{ - pull_request.project_from.fullname or pull_request.remote_git - }} - - - {{ pull_request.branch_from }} - - -  into - {{ pull_request.project.fullname }} - - - {{ pull_request.branch }} - - -{%if pull_request and pull_request.initial_comment %} -
-
-{{ pull_request.initial_comment | markdown | noJS | safe }} + {% endif %} +
-
-{%endif%} {% elif form and (g.repo_committer or remote_git) %}

Create pull request

{% else %}

Diff - (tree)

+ (tree) - {% if origin == 'compare_commits' %} -
{{ commit1 }} .. {{ commit2 }}
- {% endif %} + {% if origin == 'compare_commits' %} +
{{ commit1 }} .. {{ commit2 }}
+ {% endif %} +{% endif%} -{% endif %} + +
+
{% if form and (g.repo_committer or remote_git) %}
@@ -293,38 +388,62 @@ {% for commit in diff_commits %} {% if pull_request and pull_request.status and pull_request.project_from.is_fork %} - + {% set commit_link = url_for( + 'ui_ns.view_commit', + repo=pull_request.project_from.name, + username=pull_request.project_from.user.user, + namespace=repo.namespace, + commitid=commit.oid.hex)%} + {% set tree_link = url_for( + 'ui_ns.view_tree', username=pull_request.project_from.user.user, namespace=repo.namespace, + repo=repo.name, identifier=commit.hex) %} {% elif pull_request and pull_request.remote %} - + {% set commit_link = None %} {% else %} - + commitid=commit.oid.hex) %} + {% set tree_link = url_for( + 'ui_ns.view_tree', username=username, namespace=repo.namespace, + repo=repo.name, identifier=commit.hex) %} {% endif %} - -
- {{ commit.message.strip().split('\n')[0] }} -
- - {{ commit.commit_time|humanize }} - +
+
+
+ {% if commit_link %} + + {% endif %} + {{ commit.message.strip().split('\n')[0] }} + {% if commit_link %} + + {% endif %} +
+ {{commit.author|author2user_commits( + link=url_for('ui_ns.view_commits', + repo=repo.name, + branchname=branchname, + username=username, + namespace=repo.namespace, + author=commit.author.email), + cssclass="notblue")|safe}} + • + {{ commit.commit_time|humanize }}   +
-
- {{ commit.author | author2avatar(20) | safe }} {{ commit.author.name }} -
- {{ commit.hex|short }} -
- +
+
+ + {{ commit.hex|short }} + + +
+
+
+
{% else %}

No commits found

{% endfor %} @@ -387,10 +506,10 @@ {% macro lineschanged(added, removed) -%} {%if added%} - +{{linesadded}} + +{{linesadded}} {%endif%} {%if removed%} - -{{linesremoved}} + -{{linesremoved}} {%endif%} {%endmacro%} @@ -557,6 +676,7 @@
+ {{ show_pr_initial_comment(pull_request, repo, form, username) }}
{% if pull_request.comments %}
-
-
-
- {{ - comment.date_created | humanize }} -
- {{ comment.comment | markdown | noJS | safe }} -
+
+
+ {{ comment.user.default_email | avatar(24) | safe }} +
+ {{ comment.comment | markdown | noJS | safe }} +
+ {{ + comment.date_created | humanize }}
{% else %} @@ -609,55 +728,55 @@
{% if g.authenticated and mergeform and pull_request %} -
-
- -
- - {% if g.authenticated %} - - {{ mergeform.csrf_token }} +
+ {% if g.authenticated %} -
- - - Preview - - +
+
+
+ Add new comment +
+
+ {% if repo.quick_replies %} {% include "quick_reply.html" %} {% endif %} +
+
+
+ + {{ mergeform.csrf_token }} +
-
+
+
+ Comments use Markdown Syntax +
+ +
+
+ - Markdown Syntax -
- -
- - {% else %} -

- - Login - to comment on this ticket. -

{% endif %} -
- -
-
+
{% if pull_request %}

Pull this pull-request locally v

@@ -670,89 +789,20 @@
{% if pull_request %} -
- -
+
{% endif %} {% if diff and pull_request%} -
-
-
Changes summary
-
+
+
+
+ Changes Summary + {{ diff|length if diff else 0}} +
+
{% macro changeschangedfile(filepath, added, removed, diffanchor) -%} -
-
- +{{added}} - -{{removed}} + +
+
+ +{{added}} + -{{removed}}
file changed
- {{filepath}} + {{filepath}}
+ {%- endmacro %} {% macro changesrenamedfile(oldfilepath, newfilepath, added, removed, diffanchor) -%} -
-
+{{added}} -{{removed}}
+ +
+
+{{added}} -{{removed}}
file renamed
{{oldfilepath}}
- {{newfilepath}} + {{newfilepath}}
+ {%- endmacro %} {% macro changesdeletedfile(filepath, added, removed, diffanchor) -%} -
-
-{{removed}}
+ +
+
-{{removed}}
file removed
- {{filepath}} + {{filepath}}
+ {%- endmacro %} {% macro changesaddedfile(filepath, added, removed, diffanchor) -%} -
-
+{{added}}
+ +
+
+{{added}}
file added
- {{filepath}} + {{filepath}}
+ {%- endmacro %}
{% set count = 0 %} {% for patch in diff %} {% set count = count+1 %} -
{% set linesadded = patch.line_stats[1] %} {% set linesremoved = patch.line_stats[2] %} {% if patch | hasattr('new_file_path') %} @@ -930,7 +1030,6 @@ {{changesrenamedfile(patch.delta.old_file.path, patch.delta.new_file.path, linesadded, linesremoved, count)}} {%- endif -%} {%- endif -%} -
{% endfor %}
@@ -1053,7 +1152,7 @@ function setup_reply_btns() { $(".reply").unbind(); $( ".reply" ).click( function() { - var _section = $(this).closest('.card-body'); + var _section = $(this).closest('.card'); var _comment = _section.find('.comment_body'); var _text = _comment.text().split("\n"); var _output = new Array(); @@ -1079,35 +1178,51 @@ function show_merge_status(){ function process_response(res) { $('#spinner').hide(); if (res.code == 'FFORWARD'){ + $('#merge_dropdown_btn').toggleClass("btn-outline-secondary btn-success"); + $('#merge_dropdown_btn').removeClass("disabled"); + $('#merge_dropdown_btn span.fa').toggleClass("fa-circle-o-notch fa-check"); + $('#merge_dropdown_btn span.fa').removeClass("fa-spin"); $('#merge_btn').addClass("btn-success"); - $('#merge-alert').addClass("alert-success"); + $('#merge-alert .alert').addClass("alert-success"); $('#merge-alert-message').append(res.message); - $('#merge-alert').show(); } else if (res.code == 'MERGE') { + $('#merge_dropdown_btn').toggleClass("btn-outline-secondary btn-warning"); + $('#merge_dropdown_btn').removeClass("disabled"); + $('#merge_dropdown_btn span.fa').toggleClass("fa-circle-o-notch fa-check"); + $('#merge_dropdown_btn span.fa').removeClass("fa-spin"); $('#merge_btn').addClass("btn-warning"); - $('#merge-alert').addClass("alert-warning"); + $('#merge-alert .alert').addClass("alert-warning"); $('#merge-alert-message').append(res.message); - $('#merge-alert').show(); } else if (res.code == 'CONFLICTS') { + $('#merge_dropdown_btn').toggleClass("btn-outline-secondary btn-danger"); + $('#merge_dropdown_btn').removeClass("disabled"); + $('#merge_dropdown_btn span.fa').toggleClass("fa-circle-o-notch fa-times"); + $('#merge_dropdown_btn span.fa').removeClass("fa-spin"); $('#merge_btn').hide(); - $('#merge-alert').addClass("alert-danger"); + $('#merge-alert .alert').addClass("alert-danger"); $('#merge-alert-message').append(res.message); - $('#merge-alert').show(); $('#merge-alert div.small').hide(); } else if (res.code == 'NO_CHANGE') { $('#merge_btn').hide(); - $('#merge-alert').addClass("alert-info"); + $('#merge_dropdown_btn').removeClass("disabled"); + $('#merge_dropdown_btn span.fa').toggleClass("fa-circle-o-notch fa-times"); + $('#merge_dropdown_btn span.fa').removeClass("fa-spin"); + $('#merge-alert .alert').addClass("alert-secondary"); $('#merge-alert-message').append(res.message); - $('#merge-alert').show(); $('#merge-alert div.small').hide(); } }; $('#spinner').show(); + function sleep(ms) { + return new Promise(resolve => setTimeout(resolve, ms)); +} + $.ajax({ url: '{{ url_for("internal_ns.mergeable_request_pull") }}' , + beforeSend: function(){sleep(8000); return true;}, type: 'POST', data: { requestid: "{{ pull_request.uid }}", @@ -1557,7 +1672,6 @@ $(document).ready(function () { var _token = "{{ mergeform.csrf_token.current_token }}"; {% endif %} - if ($( "#previewinmarkdown" ).hasClass("inactive")){ var _text = _el.val(); var _url = "{{ url_for('ui_ns.markdown_preview') }}"; $.ajax({ @@ -1571,9 +1685,8 @@ $(document).ready(function () { success: function(res) { var preview = emojione.toImage(res); $( "#preview" ).html(preview); - $( "#previewinmarkdown" ).removeClass("inactive"); - $( "#previewinmarkdown" ).addClass("active"); - $( "#previewinmarkdown" ).text("Edit"); + $( "#previewinmarkdown" ).toggleClass("active"); + $( "#editinmarkdown" ).toggleClass("active"); _el.hide(); $( "#preview" ).show(); }, @@ -1582,13 +1695,23 @@ $(document).ready(function () { } }); return false; - } else if ($( "#previewinmarkdown" ).hasClass("active")){ - $( "#previewinmarkdown" ).addClass("inactive"); - $( "#previewinmarkdown" ).removeClass("active"); - $( "#previewinmarkdown" ).text("Preview"); - _el.show(); - $( "#preview" ).hide(); - } + } + ); + + $( "#editinmarkdown" ).click( + function(event, ui) { + {% if form %} + var _el = $( "#initial_comment" ); + var _token = "{{ form.csrf_token.current_token }}"; + {% else %} + var _el = $( "#comment" ); + var _token = "{{ mergeform.csrf_token.current_token }}"; + {% endif %} + + $( "#editinmarkdown" ).toggleClass("active"); + $( "#previewinmarkdown" ).toggleClass("active"); + _el.show(); + $( "#preview" ).hide(); } ); {% endif %} diff --git a/pagure/templates/quick_reply.html b/pagure/templates/quick_reply.html index a75f6a7..8a2140d 100644 --- a/pagure/templates/quick_reply.html +++ b/pagure/templates/quick_reply.html @@ -1,5 +1,5 @@ -
-
diff --git a/pagure/ui/filters.py b/pagure/ui/filters.py index 7d25b3d..1a25a6e 100644 --- a/pagure/ui/filters.py +++ b/pagure/ui/filters.py @@ -122,7 +122,7 @@ def format_loc(loc, commit=None, filename=None, tree_id=None, prequest=None, ' data-filename="%(filename)s" data-commit="%(commit)s"' ' data-tree="%(tree_id)s">' '

' - '' '

' '' % ( diff --git a/tests/test_pagure_flask_ui_fork.py b/tests/test_pagure_flask_ui_fork.py index 2434831..be139dd 100644 --- a/tests/test_pagure_flask_ui_fork.py +++ b/tests/test_pagure_flask_ui_fork.py @@ -289,10 +289,9 @@ class PagureFlaskForktests(tests.Modeltests): '', output_text) self.assertIn( - '+3', output_text) + '+3', output_text) self.assertIn( - '-1', + '-1', output_text) @patch('pagure.lib.notify.send_email') @@ -382,8 +381,12 @@ class PagureFlaskForktests(tests.Modeltests): 'PR#1: PR from the feature branch - test\n - ' 'Pagure', output_text) self.assertIn( - '

PR#1\n' - ' PR from the feature branch\n ', + '

\n
\n ' + '\n ' + '#1\n ' + '\n ' + 'PR from the feature branch\n', output_text) self.assertIn( '\n This request must be ' @@ -402,8 +405,12 @@ class PagureFlaskForktests(tests.Modeltests): self.assertEqual(output.status_code, 200) output_text = output.get_data(as_text=True) self.assertIn( - '

PR#1\n' - ' PR from the feature branch\n ', + '

\n
\n ' + '\n ' + '#1\n ' + '\n ' + 'PR from the feature branch\n', output_text) self.assertIn( '\n Only the assignee can ' @@ -423,8 +430,12 @@ class PagureFlaskForktests(tests.Modeltests): self.assertEqual(output.status_code, 200) output_text = output.get_data(as_text=True) self.assertIn( - '

PR#1\n' - ' PR from the feature branch\n ', + '

\n
\n ' + '\n ' + '#1\n ' + '\n ' + 'PR from the feature branch\n', output_text) self.assertIn( '\n This request does not ' @@ -454,7 +465,9 @@ class PagureFlaskForktests(tests.Modeltests): # Check if the closing notification was added output = self.app.get('/test/pull-request/1') self.assertIn( - '

Pull-Request has been merged by pingou

', + 'Merged just now\n' + ' \n by\n' + ' pingou.\n', output.get_data(as_text=True)) @patch('pagure.lib.notify.send_email') @@ -490,7 +503,9 @@ class PagureFlaskForktests(tests.Modeltests): # Check if the closing notification was added output = self.app.get('/test/pull-request/1') self.assertIn( - '

Pull-Request has been merged by pingou

', + 'Merged just now\n' + ' \n by\n' + ' pingou.\n', output.get_data(as_text=True)) @patch('pagure.lib.notify.send_email') @@ -555,8 +570,12 @@ class PagureFlaskForktests(tests.Modeltests): self.assertEqual(output.status_code, 200) output_text = output.get_data(as_text=True) self.assertIn( - '

PR#1\n' - ' PR from the feature branch\n ', + '

\n
\n ' + '\n ' + '#1\n ' + '\n ' + 'PR from the feature branch\n', output_text) self.assertIn('Merge conflicts!', output_text) @@ -588,8 +607,10 @@ class PagureFlaskForktests(tests.Modeltests): self.assertEqual(output.status_code, 200) output_text = output.get_data(as_text=True) self.assertIn( - '

PR#1\n' - ' PR from the feature-branch branch\n ', + '\n' + ' #1\n' + ' \n' + ' PR from the feature-branch branch\n', output_text) self.assertIn('Merge conflicts!', output_text) @@ -625,17 +646,16 @@ class PagureFlaskForktests(tests.Modeltests): '/test/pull-request/1/merge', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) output_text = output.get_data(as_text=True) - self.assertIn( - '

PR#1\n' - ' Merged', - output_text) + self.assertIn('Nothing to do, changes were already merged', output_text) # Check if the closing notification was added output = self.app.get('/test/pull-request/1') self.assertIn( - '

Pull-Request has been merged by pingou

', + 'Merged just now\n' + ' \n by\n' + ' pingou.\n', output.get_data(as_text=True)) @patch('pagure.lib.notify.send_email') @@ -648,10 +668,9 @@ class PagureFlaskForktests(tests.Modeltests): output = self.app.get('/test/pull-request/1') self.assertEqual(output.status_code, 200) output_text = output.get_data(as_text=True) - self.assertIn( - '

PR#1\n' - ' ', output_text) - self.assertIn('
Merged by\n', output_text) + + self.assertIn('Merged ' + 'just now\n \n by\n', output_text) self.assertIn( 'title="View file as of 2a552b">sources', output_text) @@ -757,11 +776,15 @@ class PagureFlaskForktests(tests.Modeltests): self.assertEqual(output.status_code, 200) output_text = output.get_data(as_text=True) self.assertIn( - '

PR#1\n' - ' PR from the feature branch\n

', output_text) + '

\n
\n ' + '\n ' + '#1\n ' + '\n ' + 'PR from the feature branch\n', output_text) self.assertTrue( output_text.count( - 'PR#1: PR from the feature branch - test\n - ' 'Pagure', output_text) self.assertIn( - '

PR#1\n' - ' PR from the feature branch\n', output_text) + '

\n
\n ' + '\n ' + '#1\n ' + '\n ' + 'PR from the feature branch\n', output_text) self.assertNotIn( '\n Request assigned', output_text) @@ -1624,8 +1651,12 @@ index 0000000..2a552bb 'PR#1: PR from the feature branch - test\n - ' 'Pagure', output_text) self.assertIn( - '

PR#1\n' - ' PR from the feature branch\n', output_text) + '

\n
\n ' + '\n ' + '#1\n ' + '\n ' + 'PR from the feature branch\n', output_text) self.assertNotIn( '\n Request assigned', output_text) @@ -1645,8 +1676,12 @@ index 0000000..2a552bb 'PR#1: PR from the feature branch - test\n - ' 'Pagure', output_text) self.assertIn( - '

PR#1\n' - ' PR from the feature branch\n', output_text) + '

\n
\n ' + '\n ' + '#1\n ' + '\n ' + 'PR from the feature branch\n', output_text) self.assertIn( '\n No user "bar" found', output_text) @@ -1675,8 +1710,12 @@ index 0000000..2a552bb 'PR#1: PR from the feature branch - test\n - ' 'Pagure', output_text) self.assertIn( - '

PR#1\n' - ' PR from the feature branch\n', output_text) + '

\n
\n ' + '\n ' + '#1\n ' + '\n ' + 'PR from the feature branch\n', output_text) self.assertIn( '\n Request assigned', output_text) @@ -1740,8 +1779,12 @@ index 0000000..2a552bb 'PR#1: PR from the feature branch - test\n - ' 'Pagure', output_text) self.assertIn( - '

PR#1\n' - ' PR from the feature branch\n', output_text) + '

\n
\n ' + '\n ' + '#1\n ' + '\n ' + 'PR from the feature branch\n', output_text) self.assertNotIn( '\n Request assigned', output_text) @@ -1761,8 +1804,12 @@ index 0000000..2a552bb 'PR#1: PR from the feature branch - test\n - ' 'Pagure', output_text) self.assertIn( - '

PR#1\n' - ' PR from the feature branch\n', output_text) + '

\n
\n ' + '\n ' + '#1\n ' + '\n ' + 'PR from the feature branch\n', output_text) self.assertIn( '\n Pull-request tagged with: black', output_text) @@ -1807,31 +1854,9 @@ index 0000000..2a552bb 'PR#1: PR from the feature branch - test\n - Pagure' ) - h3 = soup.find_all("h3") - self.assertIsNotNone(h3) - self.assertEqual(len(h3), 3) - # keep the last one only - h3 = h3[2] - self.assertListEqual( - h3.find("span")["class"], ["label", "label-default"]) - self.assertEqual(h3.find("span").string, "PR#1") - self.assertEqual( - list(h3.stripped_strings)[1], 'PR from the feature branch') - alerts = [ - list(a.stripped_strings)[2] for a in - soup.find_all("div", class_="alert") - if list(a.stripped_strings) - ] - self.assertIn('Pull-request **un**tagged with: black', alerts) - self.assertIn('Pull-request tagged with: blue, yellow', alerts) - input_tag = soup.find("input", id="tag") - self.assertEqual( - input_tag["title"], "comma separated list of tags") - # The order is not guaranteed, compare sets. - self.assertEqual( - set(input_tag["value"].split(",")), - set(["blue", "yellow"]) - ) + self.assertIn('Pull-request **un**tagged with: black', output.get_data(as_text=True)) + self.assertIn('Pull-request tagged with: blue, yellow', output.get_data(as_text=True)) + user.username = 'pingou' with tests.user_set(self.app.application, user): @@ -2007,7 +2032,7 @@ index 0000000..2a552bb output_text) self.assertEqual( output_text.count('title="PY C (pingou)"'), - 1) + 2) # Test if the `open changed file icon` is displayed. self.assertIn( @@ -2709,8 +2734,12 @@ index 0000000..2a552bb self.assertEqual(output.status_code, 200) output_text = output.get_data(as_text=True) self.assertIn( - '

PR#1\n' - ' PR from the feature branch\n

', output_text) + '

\n
\n ' + '\n ' + '#1\n ' + '\n ' + 'PR from the feature branch\n', output_text) #self.assertIn('href="#comment-1">ΒΆ', output_text) self.assertIn( '

This look alright but we can do better

', @@ -2743,8 +2772,12 @@ index 0000000..2a552bb self.assertEqual(output.status_code, 200) output_text = output.get_data(as_text=True) self.assertIn( - '

PR#1\n' - ' PR from the feature branch\n ', + '

\n
\n ' + '\n ' + '#1\n ' + '\n ' + 'PR from the feature branch\n', output_text) self.assertIn( '\n Comment removed', @@ -2800,8 +2833,12 @@ index 0000000..2a552bb output_text = output.get_data(as_text=True) self.assertIn( - '

PR#1\n' - ' PR from the feature branch\n ', + '

\n
\n ' + '\n ' + '#1\n ' + '\n ' + 'PR from the feature branch\n', output_text) self.assertIn( '\n Comment added', @@ -2832,8 +2869,12 @@ index 0000000..2a552bb self.assertIn( '

This look alright but we can do better than this.

', output_text) self.assertIn( - '

PR#1\n' - ' PR from the feature branch\n ', + '

\n
\n ' + '\n ' + '#1\n ' + '\n ' + 'PR from the feature branch\n', output_text) # Checking if Edited by User is there or not self.assertTrue( @@ -2883,8 +2924,12 @@ index 0000000..2a552bb 'PR#1: PR from the feature branch - test\n - ' 'Pagure', output_text) self.assertIn( - '

PR#1\n' - ' PR from the feature branch\n

', output_text) + '

\n
\n ' + '\n ' + '#1\n ' + '\n ' + 'PR from the feature branch\n', output_text) self.assertIn( 'title="View file as of 2a552b">sources', output_text) @@ -2940,7 +2985,9 @@ index 0000000..2a552bb # Check if the closing notification was added output = self.app.get('/test/pull-request/1') self.assertIn( - '

Pull-Request has been merged by pingou

', + 'Merged just now\n' + ' \n by\n' + ' pingou.\n', output.get_data(as_text=True)) @patch('pagure.lib.notify.send_email') diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py index 46f2dae..104330d 100644 --- a/tests/test_pagure_flask_ui_issues.py +++ b/tests/test_pagure_flask_ui_issues.py @@ -3835,10 +3835,6 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertTrue( '' in output_text) - self.assertEqual( - output_text.count( - 'title="Reply to this comment - lose formatting">', - ), 1) def _set_up_for_reaction_test(self, private=False): tests.create_projects(self.session) diff --git a/tests/test_pagure_flask_ui_remote_pr.py b/tests/test_pagure_flask_ui_remote_pr.py index 9c8d5f7..89493cc 100644 --- a/tests/test_pagure_flask_ui_remote_pr.py +++ b/tests/test_pagure_flask_ui_remote_pr.py @@ -240,7 +240,7 @@ class PagureRemotePRtests(tests.Modeltests): self.assertEqual(output.status_code, 200) output_text = output.get_data(as_text=True) self.assertIn( - '

PR#1', + '#1', output_text) self.assertIn( '
', output_text) diff --git a/tests/test_pagure_flask_ui_repo_flag_commit.py b/tests/test_pagure_flask_ui_repo_flag_commit.py index 695afbc..e804c43 100644 --- a/tests/test_pagure_flask_ui_repo_flag_commit.py +++ b/tests/test_pagure_flask_ui_repo_flag_commit.py @@ -99,7 +99,7 @@ class ViewCommitFlagtests(tests.SimplePagureTest): '\n ', output_text) self.assertIn( '
\n ' - 'pending' + 'pending' '\n
', output_text) self.assertIn( 'Build is running', output_text) @@ -142,7 +142,7 @@ class ViewCommitFlagtests(tests.SimplePagureTest): '\n ', output_text) self.assertIn( '
\n ' - 'success (100%)' + 'success (100%)' '\n
', output_text) self.assertIn( 'Build passed', output_text) @@ -185,7 +185,7 @@ class ViewCommitFlagtests(tests.SimplePagureTest): '\n ', output_text) self.assertIn( '
\n ' - 'error' + 'error' '\n
', output_text) self.assertIn( 'Build errored', output_text) @@ -227,7 +227,7 @@ class ViewCommitFlagtests(tests.SimplePagureTest): 'simple-koji-ci\n ', output_text) self.assertIn( '
\n ' - 'failure' + 'failure' '\n
', output_text) self.assertIn( 'Build failed', output_text) @@ -269,7 +269,7 @@ class ViewCommitFlagtests(tests.SimplePagureTest): 'simple-koji-ci\n ', output_text) self.assertIn( '
\n ' - 'canceled' + 'canceled' '\n
', output_text) self.assertIn( 'Build canceled', output_text) @@ -278,8 +278,8 @@ class ViewCommitFlagtests(tests.SimplePagureTest): { 'FLAG_STATUSES_LABELS': { - 'status1': 'label-warning', - 'otherstatus': 'label-success', + 'status1': 'badge-warning', + 'otherstatus': 'badge-success', }, }) def test_view_commit_with_custom_flags(self): @@ -319,7 +319,7 @@ class ViewCommitFlagtests(tests.SimplePagureTest): 'simple-koji-ci\n ', output_text) self.assertIn( '
\n ' - 'status1' + 'status1' '\n
', output_text) self.assertIn( 'Build canceled', output_text) diff --git a/tests/test_pagure_flask_ui_slash_branch_name.py b/tests/test_pagure_flask_ui_slash_branch_name.py index d70da62..5b45b51 100644 --- a/tests/test_pagure_flask_ui_slash_branch_name.py +++ b/tests/test_pagure_flask_ui_slash_branch_name.py @@ -350,9 +350,9 @@ class PagureFlaskSlashInBranchtests(tests.SimplePagureTest): self.assertEqual(output.status_code, 200) output_text = output.get_data(as_text=True) self.assertEqual( - output_text.count('' + '' '+1', output_text) self.assertIn( '
file added

', output_text) @@ -363,9 +363,9 @@ class PagureFlaskSlashInBranchtests(tests.SimplePagureTest): self.assertEqual(output.status_code, 200) output_text = output.get_data(as_text=True) self.assertEqual( - output_text.count('' + '' '+1', output_text) self.assertIn( '
file added

', output_text)