From 0c654b7796e6b82742f3bbaba9aaac258c180d69 Mon Sep 17 00:00:00 2001 From: Ryan Lerch Date: Sep 21 2018 14:50:42 +0000 Subject: [PATCH 1/2] Make the term we call a Project configurable by the theme By default, Pagure refers to a code project or repository throughout as a "Project". In some cases, when running an instance of Pagure, it would be desirable to refer to this as something else, like simply a "repository" or in the case of src.fedoraproject.org, a "package". This change abstracts out this term, (and the icon used to represent a 'project') and adds the ability to set two new optional variables in the theme.html to change these to whatever the theme maker wants: * 'projectstring' -- default:'Project' * 'projecticon' -- default:'fa-calendar-o fa-rotate-270' This also updates the theme for srcfpo to change these to 'Package' and 'fa-archive' --- diff --git a/doc/usage/theming.rst b/doc/usage/theming.rst index ab805bc..2daf8c1 100644 --- a/doc/usage/theming.rst +++ b/doc/usage/theming.rst @@ -80,6 +80,37 @@ on every page on the site. Usage: {% set site_title = "Pagure" %} +`projectstring(Bool:plural)` macro +############################# + +A macro that returns a string used to refer to Projects in Pagure +The plural parameter informs if the string to be returned is the +plural form. +This macro is optional. +Usage: + +:: + + {% macro projectstring(plural=False) -%} + {% if plural %} + Repositories + {% else %} + Repository + {% endif %} + {% endmacro -%} + + +`projecticon` variable +############################# + +A string containing the name of the fontawesome icon to use for +Projects. This variable is optional. Usage: + +:: + + {% set projecticon = "Package" %} + + `head_imports()` macro ###################### diff --git a/pagure/templates/_browseheader.html b/pagure/templates/_browseheader.html index a984238..30d95fb 100644 --- a/pagure/templates/_browseheader.html +++ b/pagure/templates/_browseheader.html @@ -1,4 +1,5 @@ {% import "theme.html" as theme with context %} +{% from "_projectstring.html" import projectstring, projecticon %} {% macro browse_header(select) -%} @@ -8,7 +9,7 @@
  • Projects + endif %} href="{{ url_for('ui_ns.browse_projects') }}">{{projectstring()}}
  •   {%- else -%} -   +   {%- endif -%} {% if repo.is_fork %}   {%- else -%} -   +   {%- endif -%} {% if repo.is_fork %} @@ -12,7 +14,7 @@ {% endif %} @@ -31,7 +33,7 @@ {% if repo.avatar_email %} {% else %} -
    +
    {% endif %}
    @@ -40,7 +42,7 @@ {{ repo.namespace + '/' if repo.namespace }}{{ repo.name }} {% if repo.private %} - + {% endif %}
    @@ -66,7 +68,7 @@ {% else %} -

    No projects found

    +

    No {{projectstring(plural=True)}} found

    {% endfor %} {%- endmacro %} @@ -110,7 +112,7 @@ {%- if username -%} {%- endif -%} @@ -180,7 +182,7 @@ {% else %} -

    No projects found

    +

    No {{projectstring(plural=True)}} found

    {% endfor %} @@ -260,7 +262,7 @@ {% else %}
    - +
    {% endif %}
    @@ -282,7 +284,7 @@
    {% else %}
    -

    No projects found

    +

    No {{projectstring(plural=True)}} found

    {% endif %} diff --git a/pagure/templates/commits.html b/pagure/templates/commits.html index f92e8fc..a0735b2 100644 --- a/pagure/templates/commits.html +++ b/pagure/templates/commits.html @@ -1,6 +1,7 @@ {% extends "repo_master.html" %} {% from "_render_repo.html" import pagination_link %} +{% from "_projectstring.html" import projectstring, projecticon %} {% block title %}{{ select.capitalize() }} - {{ repo.namespace + '/' if repo.namespace }}{{ repo.name }}{% endblock %} @@ -64,7 +65,7 @@ {% if repo.is_fork %} the upstream - + {{ repo.name }} {% else %} @@ -261,7 +262,7 @@ var html = '' - + ' ' + + ' ' + _t + ' '; var el = $('#c_' + _c); $('#c_' + _c + " #commit-actions").append(html); diff --git a/pagure/templates/group_info.html b/pagure/templates/group_info.html index f0c548a..626cc1a 100644 --- a/pagure/templates/group_info.html +++ b/pagure/templates/group_info.html @@ -1,5 +1,6 @@ {% extends "master.html" %} {% from "userprofile_macros.html" import render_repo_listing %} +{% from "_projectstring.html" import projectstring, projecticon %} {% block title %}Group {{ group.group_name }}{% endblock %} {% set tag = "groups" %} @@ -50,14 +51,14 @@
    -

    Group Projects

    - {{ group.projects | length }} projects +

    Group {{projectstring(plural=True)}}

    + {{ group.projects | length }} {{projectstring(plural=True)}}
    {% if group.projects | length > 0 %} {{render_repo_listing(group.projects)}} {% else %}
    - no projects + no {{projectstring(plural=True)}}
    {% endif %} diff --git a/pagure/templates/group_list.html b/pagure/templates/group_list.html index 9838fe3..8cbd142 100644 --- a/pagure/templates/group_list.html +++ b/pagure/templates/group_list.html @@ -5,6 +5,7 @@ {% from "_browseheader.html" import browse_header %} {% from "_render_repo.html" import searchbox %} +{% from "_projectstring.html" import projectstring, projecticon %} {% block header %} @@ -46,8 +47,8 @@
    Formed {{ group.created |humanize }}
    - - + + {{group.projects | count }} diff --git a/pagure/templates/index.html b/pagure/templates/index.html index 98bf911..06db455 100644 --- a/pagure/templates/index.html +++ b/pagure/templates/index.html @@ -5,6 +5,7 @@ {% from "_render_repo.html" import render_repos, render_user_repos%} {% from "_browseheader.html" import browse_header %} +{% from "_projectstring.html" import projectstring, projecticon %} {% block header %} @@ -21,7 +22,7 @@ {% if namespace %}

    - These projects are under the `{{ namespace }}` namespace making them + These {{projectstring(plural=True)}} are under the `{{ namespace }}` namespace making them likely related to the {{ namespace }} group. @@ -31,7 +32,7 @@

    {{ render_repos( repos, total_page, 'page', page, - 'All Projects', repos_length, 'repos', username, sorting=sorting, select=select) }} + 'All '+projectstring()+'s', repos_length, 'repos', username, sorting=sorting, select=select) }}
    {% endblock %} @@ -82,7 +83,7 @@ $(document).ready(function() { {% set reponame = 'item.fullname' %} return '
    ' + '
    ' - + '' + + '' + '
    ' + '
    ' + '' diff --git a/pagure/templates/master.html b/pagure/templates/master.html index 8560232..2098256 100644 --- a/pagure/templates/master.html +++ b/pagure/templates/master.html @@ -1,4 +1,5 @@ {% import "theme.html" as theme with context %} +{% from "_projectstring.html" import projectstring, projecticon %} @@ -41,7 +42,7 @@
    {% if config.get('ENABLE_NEW_PROJECTS', True) and config.get('ENABLE_UI_NEW_PROJECTS', True) %} -  New Project +  New {{projectstring()}} {% endif %} {% if config.get('ENABLE_GROUP_MNGT', False) %} diff --git a/pagure/templates/releases.html b/pagure/templates/releases.html index d78509c..4baec5d 100644 --- a/pagure/templates/releases.html +++ b/pagure/templates/releases.html @@ -63,12 +63,12 @@ namespace=repo.namespace, identifier=tag['object'].oid) }}" class="font-weight-bold"> - {{tag['tagname']}} + {{tag['tagname']}}
    {{ tag['head_msg'] }} • {{tag['date'] | humanize}}
    {% else %} -
    {{tag['tagname']}}
    +
    {{tag['tagname']}}
    {{tag['date'] | humanize}}
    {% endif %}
    diff --git a/pagure/templates/repo_master.html b/pagure/templates/repo_master.html index ef37ad1..0a2cad1 100644 --- a/pagure/templates/repo_master.html +++ b/pagure/templates/repo_master.html @@ -1,4 +1,5 @@ {% extends "master.html" %} +{% from "_projectstring.html" import projectstring, projecticon %} {% macro print_ssh_url(repo, end_url_ssh, current_user) %} {% if not (current_user |user_can_clone_ssh) %} @@ -34,7 +35,7 @@ {% if repo.is_fork -%} {%- else -%} - + {%- endif -%}
    @@ -441,7 +442,7 @@ $("#pr-button").one("click", url = url.slice(0, -4) + res.message.new_branch[branch]['target_branch'] + '..' + branch; html = '' + '' - + ' ' + + ' ' + '{{ repo.name }}' + ' ' + '' @@ -575,7 +576,7 @@ $("#pr-button").one("click", repo=repo.name, username=username, namespace=repo.namespace) }}"> -  Releases +  Releases {% endblock %} diff --git a/pagure/templates/repo_new_pull_request.html b/pagure/templates/repo_new_pull_request.html index 50f5aa7..93bd759 100644 --- a/pagure/templates/repo_new_pull_request.html +++ b/pagure/templates/repo_new_pull_request.html @@ -1,6 +1,7 @@ {% extends "repo_master.html" %} {% from "_formhelper.html" import show_comment, show_pr_initial_comment, render_bootstrap_field %} {% from "_repo_renderdiff.html" import repo_renderdiff %} +{% from "_projectstring.html" import projectstring, projecticon %} {% block title %} {%- if pull_request -%} @@ -90,7 +91,7 @@ {%- if repo.is_fork -%}   {%- else -%} -   +   {%- endif -%} {%- if repo.namespace -%} {{repo.namespace}}/ @@ -123,7 +124,7 @@ {%- if parent.is_fork -%}   {%- else -%} -   +   {%- endif -%} {%- if parent.namespace -%} {{parent.namespace}}/ diff --git a/pagure/templates/user_info.html b/pagure/templates/user_info.html index ec5849b..9ca3c02 100644 --- a/pagure/templates/user_info.html +++ b/pagure/templates/user_info.html @@ -12,6 +12,7 @@ {% from "_render_repo.html" import render_repos_as_card, render_activity_graph %} +{% from "_projectstring.html" import projectstring, projecticon %} {% block content %} @@ -35,7 +36,7 @@
    {{ render_activity_graph(username) }} - {{ render_repos_as_card(repos, repos_length, 'Projects', 'repopage', repopage, total_page_repos) }} + {{ render_repos_as_card(repos, repos_length, projectstring()+'s', 'repopage', repopage, total_page_repos) }} {{ render_repos_as_card(forks, forks_length,'Forks', 'forkpage', forkpage, total_page_forks) }}
    diff --git a/pagure/templates/user_list.html b/pagure/templates/user_list.html index 1ca1668..723aec4 100644 --- a/pagure/templates/user_list.html +++ b/pagure/templates/user_list.html @@ -2,6 +2,7 @@ {% block title %}Users{% endblock %} {% set tag = "users" %} {% from "_browseheader.html" import browse_header %} +{% from "_projectstring.html" import projectstring, projecticon %} {% block header %} {{ user.created | humanize }}
    - - + + {{- user.repos_length}}   diff --git a/pagure/templates/user_settings.html b/pagure/templates/user_settings.html index 734bbf1..c3655b7 100644 --- a/pagure/templates/user_settings.html +++ b/pagure/templates/user_settings.html @@ -1,5 +1,6 @@ {% extends "master.html" %} {% from "_formhelper.html" import render_bootstrap_field %} +{% from "_projectstring.html" import projectstring, projecticon %} {% block title %}{{ user.user }}'s settings{% endblock %} {% set tag = "users"%} @@ -138,7 +139,7 @@

    API keys are tokens used to authenticate you on pagure. They can also be used to grant access to 3rd party application to behave on all - projects in your name. + {{projectstring(plural=True)}} in your name.

    These are your personal tokens; they are not visible to others. @@ -165,11 +166,11 @@ {% for acl in token.acls_list %} {% if acl == 'create_project' %} - + {% elif acl == 'fork_project' %} - + {% elif acl == 'modify_project' %} - + {% endif %} {% endfor %} diff --git a/pagure/templates/userdash_activity.html b/pagure/templates/userdash_activity.html index 550fab4..9e5503a 100644 --- a/pagure/templates/userdash_activity.html +++ b/pagure/templates/userdash_activity.html @@ -4,6 +4,7 @@ {% set tag = "projects" %} {% from "_browseheader.html" import browse_header %} {% from "_render_repo.html" import pagination_link %} +{% from "_projectstring.html" import projectstring, projecticon %} {% from "_render_repo.html" import render_repos_as_card, render_activity_graph %} @@ -17,8 +18,8 @@

    -

    My Projects

    - {{ userdash_counts['repos_length'] }} projects +

    My {{projectstring(plural=True)}}

    + {{ userdash_counts['repos_length'] }} {{projectstring(plural=True)}}
    @@ -50,7 +51,7 @@ {% elif log.pull_request %} {% elif not log.pull_request and not log.issue and log.log_type == 'created'%} - + {% elif self.log_type == 'committed' %} {% else %} diff --git a/pagure/templates/userdash_groups.html b/pagure/templates/userdash_groups.html index 8907587..f253466 100644 --- a/pagure/templates/userdash_groups.html +++ b/pagure/templates/userdash_groups.html @@ -4,6 +4,7 @@ {% set tag = "projects" %} {% from "_browseheader.html" import browse_header %} {% from "_render_repo.html" import pagination_link %} +{% from "_projectstring.html" import projectstring, projecticon %} {% from "_render_repo.html" import render_repos_as_card %} @@ -34,7 +35,7 @@
    - {{ group.projects | length }} + {{ group.projects | length }} diff --git a/pagure/templates/userdash_master.html b/pagure/templates/userdash_master.html index 5f2b32f..196dffe 100644 --- a/pagure/templates/userdash_master.html +++ b/pagure/templates/userdash_master.html @@ -1,4 +1,5 @@ {% extends "master.html" %} +{% from "_projectstring.html" import projectstring, projecticon %} {% block title %}{{ repo.namespace + '/' if repo.namespace }}{{ repo.name }}{% endblock %} @@ -20,7 +21,7 @@
  • - +
    • @@ -29,8 +30,8 @@ - - Projects  + + {{projectstring(plural=True)}} 
    @@ -145,7 +146,7 @@ $('#userdash-search').selectize({ render: { option: function(item, escape) { return '
    ' + - (item.is_fork == "True" ? '' : ' ') + + (item.is_fork == "True" ? '' : ' ') + '' + escape(item.repo_displayname) + '' + '
    '; } diff --git a/pagure/templates/userdash_projects.html b/pagure/templates/userdash_projects.html index 1a420e7..5382658 100644 --- a/pagure/templates/userdash_projects.html +++ b/pagure/templates/userdash_projects.html @@ -4,6 +4,7 @@ {% set tag = "projects" %} {% from "_browseheader.html" import browse_header %} {% from "_render_repo.html" import pagination_link %} +{% from "_projectstring.html" import projectstring, projecticon %} {% from "_render_repo.html" import render_repos_as_card %} @@ -14,8 +15,8 @@
    -

    My Projects

    - {{ userdash_counts['repos_length'] }} projects +

    My {{projectstring(plural=True)}}

    + {{ userdash_counts['repos_length'] }} {{projectstring(plural=True)}}
    @@ -29,7 +30,7 @@
    - {{filtered_repos_count}} Projects + {{filtered_repos_count}} {{projectstring(plural=True)}}
    @@ -210,7 +211,7 @@ {% if repo.avatar_email %}   {% else %} - + {% endif %} -
    You have no projects
    +
    You have no {{projectstring(plural=True)}}
    {% if config.get('ENABLE_NEW_PROJECTS', True) and config.get('ENABLE_UI_NEW_PROJECTS', True) %} @@ -296,7 +297,7 @@
    {% else %}
    -
    No Projects match this filter
    +
    No {{projectstring(plural=True)}} match this filter
    {% endif %} {% endif %} diff --git a/pagure/templates/userdash_watchlist.html b/pagure/templates/userdash_watchlist.html index 139dfda..6f795ac 100644 --- a/pagure/templates/userdash_watchlist.html +++ b/pagure/templates/userdash_watchlist.html @@ -4,6 +4,7 @@ {% set tag = "projects" %} {% from "_browseheader.html" import browse_header %} {% from "_render_repo.html" import pagination_link %} +{% from "_projectstring.html" import projectstring, projecticon %} {% from "_render_repo.html" import render_repos_as_card %} @@ -15,7 +16,7 @@

    My Watchlist

    - {{ userdash_counts['watchlist_length'] }} projects & forks + {{ userdash_counts['watchlist_length'] }} {{projectstring(plural=True)}} & forks
    @@ -42,7 +43,7 @@ 'ui_ns.view_repo', repo=repo.name, namespace=repo.namespace) }}">
    - +  {{ repo.namespace + '/' if repo.namespace }}{{ repo.name }} diff --git a/pagure/templates/userprofile_forks.html b/pagure/templates/userprofile_forks.html index e9196d9..839f828 100644 --- a/pagure/templates/userprofile_forks.html +++ b/pagure/templates/userprofile_forks.html @@ -4,6 +4,8 @@ {% from "_render_repo.html" import pagination_link %} {% from "userprofile_macros.html" import render_repo_listing %} +{% from "_projectstring.html" import projectstring, projecticon %} + {% block userprofile_content %} @@ -11,7 +13,7 @@

    Forks

    - {{ forks_length }} projects + {{ forks_length }} {{projectstring(plural=True)}}
    {% if forks %} {{ render_repo_listing(forks)}} diff --git a/pagure/templates/userprofile_macros.html b/pagure/templates/userprofile_macros.html index 6da5c45..79b345b 100644 --- a/pagure/templates/userprofile_macros.html +++ b/pagure/templates/userprofile_macros.html @@ -1,3 +1,5 @@ +{% from "_projectstring.html" import projectstring, projecticon %} + {% macro render_repo_listing(repos) %}
    {% for repo in repos %} @@ -17,7 +19,7 @@
    {% else %}
    - +
    {% endif %}
    diff --git a/pagure/templates/userprofile_master.html b/pagure/templates/userprofile_master.html index a0cd093..4bdb9c0 100644 --- a/pagure/templates/userprofile_master.html +++ b/pagure/templates/userprofile_master.html @@ -1,4 +1,5 @@ {% extends "master.html" %} +{% from "_projectstring.html" import projectstring, projecticon %} {% block title %}User {{username}}{% endblock %} @@ -43,7 +44,7 @@ - + Projects 
    diff --git a/pagure/templates/userprofile_overview.html b/pagure/templates/userprofile_overview.html index 9edf44c..de7d345 100644 --- a/pagure/templates/userprofile_overview.html +++ b/pagure/templates/userprofile_overview.html @@ -3,12 +3,13 @@ {% block title %}{{user.username}} - overview{% endblock %} {% from "_render_repo.html" import render_activity_graph %} +{% from "_projectstring.html" import projectstring, projecticon %} {% block userprofile_content %}
    {% if owned_repos %} -

    Top Projects

    +

    Top {{projectstring(plural=True)}}

    {% for repo in owned_repos %}
    @@ -16,7 +17,7 @@ {% if repo.avatar_email %}   {% else %} - + {% endif %}
    - view all {{repos_length}} projects + view all {{repos_length}} {{projectstring(plural=True)}}
    {% endif %} diff --git a/pagure/templates/userprofile_projects.html b/pagure/templates/userprofile_projects.html index bb3154a..e501860 100644 --- a/pagure/templates/userprofile_projects.html +++ b/pagure/templates/userprofile_projects.html @@ -4,14 +4,15 @@ {% from "_render_repo.html" import pagination_link %} {% from "userprofile_macros.html" import render_repo_listing %} +{% from "_projectstring.html" import projectstring, projecticon %} {% block userprofile_content %}
    -

    Projects

    - {{ repos_length }} projects +

    {{projectstring(plural=True)}}

    + {{ repos_length }} {{projectstring(plural=True)}}
    {% if repos %} {{ render_repo_listing(repos)}} @@ -20,7 +21,7 @@ {% endif %} {% else %}
    -

    No projects

    +

    No {{projectstring(plural=True)}}

    {% endif %}
    diff --git a/pagure/templates/userprofile_starred.html b/pagure/templates/userprofile_starred.html index a1c99f0..c0b0f15 100644 --- a/pagure/templates/userprofile_starred.html +++ b/pagure/templates/userprofile_starred.html @@ -1,6 +1,7 @@ {% extends "userprofile_master.html" %} {% from "userprofile_macros.html" import render_repo_listing %} +{% from "_projectstring.html" import projectstring, projecticon %} {% block title %}{{user.username}} - starred{% endblock %} @@ -8,14 +9,14 @@
    -

    Starred Projects

    - {{ user.stars | length }} projects +

    Starred {{projectstring}}s

    + {{ user.stars | length }} {{projectstring}}s
    {% if repos %} {{ render_repo_listing(repos)}} {% else %}
    -

    No starred projects or forks

    +

    No starred {{projectstring}}s or forks

    {% endif %}
    diff --git a/pagure/themes/srcfpo/templates/theme.html b/pagure/themes/srcfpo/templates/theme.html index 5bc3749..a6ec5a1 100644 --- a/pagure/themes/srcfpo/templates/theme.html +++ b/pagure/themes/srcfpo/templates/theme.html @@ -4,6 +4,17 @@ {# site title that shows in the head html element at the end #} {% set site_title = "src.fedoraproject.org" %} +{% macro projectstring(plural=False) -%} + {% if plural %} + Packages + {% else %} + Package + {% endif %} +{% endmacro -%} + +{% set projecticon = "fa-archive" %} + + {% macro head_imports() %} diff --git a/pagure/themes/srcfpo/templates/userprofile_master.html b/pagure/themes/srcfpo/templates/userprofile_master.html index c2ff8ae..e46ac9b 100644 --- a/pagure/themes/srcfpo/templates/userprofile_master.html +++ b/pagure/themes/srcfpo/templates/userprofile_master.html @@ -9,6 +9,7 @@ {% from "_render_repo.html" import render_repos_as_card, render_activity_graph %} +{% from "_projectstring.html" import projectstring, projecticon %} {% block content %} @@ -46,8 +47,8 @@ - - Projects  + + {{projectstring(plural=True)}} 
    From 837e8cb81619a812b36fe1a2a687a0f5446b05be Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Sep 21 2018 15:26:00 +0000 Subject: [PATCH 2/2] Fix the tests Signed-off-by: Pierre-Yves Chibon --- diff --git a/pagure/templates/_projectstring.html b/pagure/templates/_projectstring.html index 3833604..85b0f60 100644 --- a/pagure/templates/_projectstring.html +++ b/pagure/templates/_projectstring.html @@ -4,18 +4,18 @@ {%- if theme.projectstring is defined -%} {{theme.projectstring(plural)}} {%- else -%} - {% if plural %} + {%- if plural -%} Projects - {% else %} + {%- else -%} Project - {% endif %} + {%- endif -%} {%- endif -%} {% endmacro %} {% macro projecticon() %} {%- if theme.projecticon is defined -%} - {{theme.projecticon}} + {{ theme.projecticon }} {%- else -%} fa-calendar-o fa-rotate-270 {%- endif -%} -{% endmacro %} \ No newline at end of file +{% endmacro %} diff --git a/pagure/templates/userprofile_starred.html b/pagure/templates/userprofile_starred.html index c0b0f15..9691ee8 100644 --- a/pagure/templates/userprofile_starred.html +++ b/pagure/templates/userprofile_starred.html @@ -9,14 +9,15 @@
    -

    Starred {{projectstring}}s

    - {{ user.stars | length }} {{projectstring}}s +

    Starred {{ projectstring(plural=True) }}

    + {{ + user.stars | length }} {{ projectstring(plural=(user.stars | length > 1)) }}s
    {% if repos %} {{ render_repo_listing(repos)}} {% else %}
    -

    No starred {{projectstring}}s or forks

    +

    No starred {{ projectstring() }}s or forks

    {% endif %}
    diff --git a/pagure/ui/app.py b/pagure/ui/app.py index a9755ad..b49c908 100644 --- a/pagure/ui/app.py +++ b/pagure/ui/app.py @@ -99,6 +99,7 @@ def index(): return flask.render_template( "index.html", select="projects", + namespace=None, repos=repos, repos_length=num_repos, total_page=total_page, diff --git a/tests/test_pagure_flask_api_ui_private_repo.py b/tests/test_pagure_flask_api_ui_private_repo.py index 4cc1b9d..d61c8f6 100644 --- a/tests/test_pagure_flask_api_ui_private_repo.py +++ b/tests/test_pagure_flask_api_ui_private_repo.py @@ -420,12 +420,9 @@ class PagurePrivateRepotest(tests.Modeltests): self.assertIn( '

    My Projects

    ', output_text) - self.assertIn( - '2 projects', - output_text) + self.assertIn('2 Projects', output_text) self.assertNotIn( - 'Forks', - output_text) + 'Forks', output_text) self.assertEqual( output_text.count('Groups'), 0) @@ -605,7 +602,7 @@ class PagurePrivateRepotest(tests.Modeltests): '

    My Projects

    ', output_text) self.assertIn( - '0 projects    ', + '0 Projects    ', output_text) self.assertNotIn( 'Forks', @@ -633,7 +630,7 @@ class PagurePrivateRepotest(tests.Modeltests): '

    My Projects

    ', output_text) self.assertIn( - '1 projects    ', + '1 Projects    ', output_text) self.assertNotIn( 'Forks', diff --git a/tests/test_pagure_flask_ui_app.py b/tests/test_pagure_flask_ui_app.py index 32beae9..7ec343e 100644 --- a/tests/test_pagure_flask_ui_app.py +++ b/tests/test_pagure_flask_ui_app.py @@ -43,7 +43,7 @@ class PagureFlaskApptests(tests.Modeltests): output = self.app.get('/', follow_redirects=True) output_text = output.get_data(as_text=True) self.assertIn( - '
    You have no projects
    ', + '
    You have no Projects
    ', output_text) tests.create_projects(self.session) diff --git a/tests/test_pagure_flask_ui_app_browse.py b/tests/test_pagure_flask_ui_app_browse.py index 10072bd..115f533 100644 --- a/tests/test_pagure_flask_ui_app_browse.py +++ b/tests/test_pagure_flask_ui_app_browse.py @@ -64,10 +64,10 @@ class PagureFlaskAppBrowsetests(tests.Modeltests): '4', output_text) self.assertIn( - '', output_text) - self.assertEqual(output_text.count('title="Private project"'), 1) + self.assertEqual(output_text.count('title="Private Project"'), 1) @patch.dict('pagure.config.config', {'PRIVATE_PROJECTS': True}) def test_browse_project_unauth_private_project(self): @@ -85,10 +85,10 @@ class PagureFlaskAppBrowsetests(tests.Modeltests): '3', output_text) self.assertNotIn( - '', output_text) - self.assertEqual(output_text.count('title="Private project"'), 0) + self.assertEqual(output_text.count('title="Private Project"'), 0) @patch.dict('pagure.config.config', {'PRIVATE_PROJECTS': True}) def test_browse_project_logged_in_no_access_private_project(self): @@ -108,10 +108,10 @@ class PagureFlaskAppBrowsetests(tests.Modeltests): '3', output_text) self.assertNotIn( - '', output_text) - self.assertEqual(output_text.count('title="Private project"'), 0) + self.assertEqual(output_text.count('title="Private Project"'), 0) @patch.dict('pagure.config.config', {'PRIVATE_PROJECTS': True}) def test_browse_project_logged_in_ticket_private_project(self): @@ -144,10 +144,10 @@ class PagureFlaskAppBrowsetests(tests.Modeltests): '3', output_text) self.assertNotIn( - '', output_text) - self.assertEqual(output_text.count('title="Private project"'), 0) + self.assertEqual(output_text.count('title="Private Project"'), 0) @patch.dict('pagure.config.config', {'PRIVATE_PROJECTS': True}) def test_browse_project_logged_in_commit_private_project(self): @@ -179,10 +179,10 @@ class PagureFlaskAppBrowsetests(tests.Modeltests): '4', output_text) self.assertIn( - '', output_text) - self.assertEqual(output_text.count('title="Private project"'), 1) + self.assertEqual(output_text.count('title="Private Project"'), 1) @patch.dict('pagure.config.config', {'PRIVATE_PROJECTS': True}) def test_browse_project_logged_in_admin_private_project(self): @@ -214,10 +214,10 @@ class PagureFlaskAppBrowsetests(tests.Modeltests): '4', output_text) self.assertIn( - '', output_text) - self.assertEqual(output_text.count('title="Private project"'), 1) + self.assertEqual(output_text.count('title="Private Project"'), 1) class PagureFlaskAppBrowseGroupAdmintests(tests.Modeltests): """ Tests for the browse pages of flask app controller of pagure """ @@ -318,10 +318,10 @@ class PagureFlaskAppBrowseGroupAdmintests(tests.Modeltests): '4', output_text) self.assertIn( - '', output_text) - self.assertEqual(output_text.count('title="Private project"'), 1) + self.assertEqual(output_text.count('title="Private Project"'), 1) class PagureFlaskAppBrowseGroupCommittests(tests.Modeltests): @@ -423,10 +423,10 @@ class PagureFlaskAppBrowseGroupCommittests(tests.Modeltests): '4', output_text) self.assertIn( - '', output_text) - self.assertEqual(output_text.count('title="Private project"'), 1) + self.assertEqual(output_text.count('title="Private Project"'), 1) class PagureFlaskAppBrowseGroupTickettests(tests.Modeltests): @@ -494,10 +494,10 @@ class PagureFlaskAppBrowseGroupTickettests(tests.Modeltests): '3', output_text) self.assertNotIn( - '', output_text) - self.assertEqual(output_text.count('title="Private project"'), 0) + self.assertEqual(output_text.count('title="Private Project"'), 0) @patch.dict('pagure.config.config', {'PRIVATE_PROJECTS': True}) def test_browse_project_user_in_group(self): @@ -529,10 +529,10 @@ class PagureFlaskAppBrowseGroupTickettests(tests.Modeltests): '3', output_text) self.assertNotIn( - '', output_text) - self.assertEqual(output_text.count('title="Private project"'), 0) + self.assertEqual(output_text.count('title="Private Project"'), 0) if __name__ == '__main__': diff --git a/tests/test_pagure_flask_ui_app_index.py b/tests/test_pagure_flask_ui_app_index.py index 0646436..be7383b 100644 --- a/tests/test_pagure_flask_ui_app_index.py +++ b/tests/test_pagure_flask_ui_app_index.py @@ -80,7 +80,7 @@ class PagureFlaskAppIndextests(tests.Modeltests): self.assertIn( '' - '1 projects\n', + '1 Projects    \n', output_text) self.assertNotIn( '

    All Projects ' diff --git a/tests/test_pagure_flask_ui_app_userdash.py b/tests/test_pagure_flask_ui_app_userdash.py index 4765f6b..676e2c5 100644 --- a/tests/test_pagure_flask_ui_app_userdash.py +++ b/tests/test_pagure_flask_ui_app_userdash.py @@ -57,7 +57,7 @@ class PagureFlaskAppUserdashTests(tests.Modeltests): output_text = output.get_data(as_text=True) self.assertIn( '1 projects', + ' border-0 ml-auto font-weight-bold">1 Projects', output_text) self.assertIn( '
    No Projects match this filter
    ', @@ -79,7 +79,7 @@ class PagureFlaskAppUserdashTests(tests.Modeltests): # After self.assertIn( '1 projects', + ' border-0 ml-auto font-weight-bold">1 Projects', output_text) self.assertIn( '
    No Projects match this filter
    ', @@ -109,7 +109,7 @@ class PagureFlaskAppUserdashTests(tests.Modeltests): self.assertIn( '

    My Projects

    \n' ' 1 projects\n', + ' opacity-100 border-0 ml-auto font-weight-bold">1 Projects\n', output_text) # Add foo to test with commit level @@ -130,7 +130,7 @@ class PagureFlaskAppUserdashTests(tests.Modeltests): self.assertIn( '

    My Projects

    \n' ' 2 projects\n', + ' opacity-100 border-0 ml-auto font-weight-bold">2 Projects\n', output_text) def test_index_commit_access_while_ticket(self): @@ -157,7 +157,7 @@ class PagureFlaskAppUserdashTests(tests.Modeltests): self.assertIn( '

    My Projects

    \n' ' 1 projects\n', + ' opacity-100 border-0 ml-auto font-weight-bold">1 Projects\n', output_text) # Add foo to test with ticket level @@ -178,7 +178,7 @@ class PagureFlaskAppUserdashTests(tests.Modeltests): self.assertIn( '

    My Projects

    \n' ' 2 projects\n', + ' opacity-100 border-0 ml-auto font-weight-bold">2 Projects\n', output_text) def test_index_admin_access_while_admin(self): @@ -205,7 +205,7 @@ class PagureFlaskAppUserdashTests(tests.Modeltests): self.assertIn( '

    My Projects

    \n' ' 1 projects\n', + ' opacity-100 border-0 ml-auto font-weight-bold">1 Projects\n', output_text) # Add foo to test with admin level @@ -226,7 +226,7 @@ class PagureFlaskAppUserdashTests(tests.Modeltests): self.assertIn( '

    My Projects

    \n' ' 2 projects\n', + ' opacity-100 border-0 ml-auto font-weight-bold">2 Projects\n', output_text) def test_index_admin_access_while_commit(self): @@ -253,7 +253,7 @@ class PagureFlaskAppUserdashTests(tests.Modeltests): self.assertIn( '

    My Projects

    \n' ' 1 projects\n', + ' opacity-100 border-0 ml-auto font-weight-bold">1 Projects\n', output_text) # Add foo to test with commit level @@ -275,7 +275,7 @@ class PagureFlaskAppUserdashTests(tests.Modeltests): self.assertIn( '

    My Projects

    \n' ' 2 projects\n', + ' opacity-100 border-0 ml-auto font-weight-bold">2 Projects\n', output_text) def test_index_main_admin_access_while_commit(self): @@ -302,7 +302,7 @@ class PagureFlaskAppUserdashTests(tests.Modeltests): self.assertIn( '

    My Projects

    \n' ' 1 projects\n', + ' opacity-100 border-0 ml-auto font-weight-bold">1 Projects\n', output_text) # Add foo to test with commit level @@ -323,7 +323,7 @@ class PagureFlaskAppUserdashTests(tests.Modeltests): self.assertIn( '

    My Projects

    \n' ' 2 projects\n', + ' opacity-100 border-0 ml-auto font-weight-bold">2 Projects\n', output_text) @@ -351,7 +351,7 @@ class PagureFlaskAppUserdashTests(tests.Modeltests): self.assertIn( '

    My Projects

    \n' ' 1 projects\n', + ' opacity-100 border-0 ml-auto font-weight-bold">1 Projects\n', output_text) self.assertIn( '3 projects', output_text) + 'border-0 ml-auto font-weight-bold">3 Projects', output_text) self.assertNotIn( 'Forks ', output_text) @@ -3283,7 +3283,7 @@ index 0000000..fb7093d output_text = output.get_data(as_text=True) self.assertIn( '3 projects', output_text) + 'border-0 ml-auto font-weight-bold">3 Projects', output_text) self.assertNotIn( 'Forks ', output_text) @@ -3321,7 +3321,7 @@ index 0000000..fb7093d output_text = output.get_data(as_text=True) self.assertIn( '3 projects', output_text) + 'border-0 ml-auto font-weight-bold">3 Projects', output_text) self.assertIn( """ @@ -3845,7 +3845,7 @@ index 0000000..fb7093d output_text = output.get_data(as_text=True) self.assertIn( '1 projects', output_text) + 'border-0 ml-auto font-weight-bold">1 Projects', output_text) self.assertNotIn( 'Forks ', output_text) @@ -3874,7 +3874,7 @@ index 0000000..fb7093d output_text = output.get_data(as_text=True) self.assertIn( '1 projects', output_text) + 'border-0 ml-auto font-weight-bold">1 Projects', output_text) self.assertNotIn( 'Forks ', output_text) @@ -3950,7 +3950,7 @@ index 0000000..fb7093d output_text = output.get_data(as_text=True) self.assertIn( '1 projects', output_text) + 'border-0 ml-auto font-weight-bold">1 Projects', output_text) self.assertNotIn( 'Forks ', output_text) @@ -3997,7 +3997,7 @@ index 0000000..fb7093d output_text = output.get_data(as_text=True) self.assertIn( '1 projects', output_text) + 'border-0 ml-auto font-weight-bold">1 Projects', output_text) self.assertNotIn( 'Forks ', output_text) @@ -4069,7 +4069,7 @@ index 0000000..fb7093d output_text = output.get_data(as_text=True) self.assertIn( '1 projects', output_text) + 'border-0 ml-auto font-weight-bold">1 Projects', output_text) self.assertNotIn( 'Forks ', output_text) @@ -4104,7 +4104,7 @@ index 0000000..fb7093d output_text = output.get_data(as_text=True) self.assertIn( '1 projects', output_text) + 'border-0 ml-auto font-weight-bold">1 Projects', output_text) self.assertNotIn( 'Forks ', output_text) @@ -4330,7 +4330,7 @@ index 0000000..fb7093d self.assertIn('
    ', output_text) print(output_text) self.assertEqual( - output_text.count(''), + output_text.count(''), 1) def test_edit_file_no_signed_off(self): diff --git a/tests/test_pagure_flask_ui_star_project.py b/tests/test_pagure_flask_ui_star_project.py index 87b4e24..7f9ca4d 100644 --- a/tests/test_pagure_flask_ui_star_project.py +++ b/tests/test_pagure_flask_ui_star_project.py @@ -102,8 +102,7 @@ class TestStarProjectUI(tests.SimplePagureTest): '/test/star/1', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) self.assertIn( - 'You starred ' - 'this project', + 'You starred this project', output.get_data(as_text=True) ) @@ -115,8 +114,7 @@ class TestStarProjectUI(tests.SimplePagureTest): '/test/star/0', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) self.assertIn( - 'You unstarred ' - 'this project', + 'You unstarred this project', output.get_data(as_text=True) ) self._check_star_count(data=data, stars=0) @@ -138,8 +136,7 @@ class TestStarProjectUI(tests.SimplePagureTest): '/test/star/1', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) self.assertIn( - 'You starred ' - 'this project', + 'You starred this project', output.get_data(as_text=True) ) self._check_star_count(data=data, stars=1) @@ -170,8 +167,7 @@ class TestStarProjectUI(tests.SimplePagureTest): '/test/star/0', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) self.assertIn( - 'You unstarred ' - 'this project', + 'You unstarred this project', output.get_data(as_text=True) ) self._check_star_count(data=data, stars=0) @@ -201,7 +197,7 @@ class TestStarProjectUI(tests.SimplePagureTest): ) self.assertIn( '0 projects', + 'border-0 ml-auto font-weight-bold">0 Projects', output_text) # make pingou star the project @@ -218,8 +214,7 @@ class TestStarProjectUI(tests.SimplePagureTest): '/test/star/1', data=data, follow_redirects=True) self.assertEqual(output.status_code, 200) self.assertIn( - 'You starred ' - 'this project', + 'You starred this project', output.get_data(as_text=True) ) self._check_star_count(data=data, stars=1) @@ -232,7 +227,7 @@ class TestStarProjectUI(tests.SimplePagureTest): ) self.assertIn( '1 projects', + 'border-0 ml-auto font-weight-bold">1 Projects', output_text) self.assertEqual( output_text.count('class="list-group-item"'), 1) @@ -272,7 +267,7 @@ class TestStarProjectUI(tests.SimplePagureTest): ) self.assertIn( '0 projects', + 'border-0 ml-auto font-weight-bold">0 Projects', output_text) self.assertEqual( output_text.count('class="list-group-item"'), 0)