diff --git a/tests/test_pagure_flask_api.py b/tests/test_pagure_flask_api.py index f3e627d..e22a2e4 100644 --- a/tests/test_pagure_flask_api.py +++ b/tests/test_pagure_flask_api.py @@ -133,6 +133,7 @@ class PagureFlaskApitests(tests.Modeltests): item = pagure.lib.model.PagureGroup( group_name='group1', group_type='user', + display_name='User group', user_id=1, # pingou ) self.session.add(item) @@ -140,6 +141,7 @@ class PagureFlaskApitests(tests.Modeltests): item = pagure.lib.model.PagureGroup( group_name='rel-eng', group_type='user', + display_name='Release engineering group', user_id=1, # pingou ) self.session.add(item) diff --git a/tests/test_pagure_flask_ui_groups.py b/tests/test_pagure_flask_ui_groups.py index 26e392d..efb2a9e 100644 --- a/tests/test_pagure_flask_ui_groups.py +++ b/tests/test_pagure_flask_ui_groups.py @@ -88,10 +88,12 @@ class PagureFlaskGroupstests(tests.Modeltests): self.assertEqual(output.status_code, 200) self.assertIn('

Create group

', output.data) self.assertEqual(output.data.count( - 'This field is required.'), 1) + 'This field is required.'), 3) data = { 'group_name': 'test_group', + 'display_name': 'Test Group', + 'description': 'This is a group for the tests', } # Missing CSRF @@ -130,6 +132,8 @@ class PagureFlaskGroupstests(tests.Modeltests): data = { 'group_name': 'test_admin_group', 'group_type': 'admin', + 'display_name': 'Test Admin Group', + 'description': 'This is another group for the tests', 'csrf_token': csrf_token, } diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py index 8d20941..fb23dc9 100644 --- a/tests/test_pagure_flask_ui_repo.py +++ b/tests/test_pagure_flask_ui_repo.py @@ -190,6 +190,8 @@ class PagureFlaskRepotests(tests.Modeltests): self.session, group_name='foo', group_type='bar', + display_name='foo group', + description=None, user='pingou', is_admin=False, blacklist=pagure.APP.config['BLACKLISTED_GROUPS'], @@ -269,6 +271,8 @@ class PagureFlaskRepotests(tests.Modeltests): msg = pagure.lib.add_group( self.session, group_name='foo', + display_name='foo group', + description=None, group_type='bar', user='pingou', is_admin=False, @@ -313,7 +317,6 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertIn( '\n Group added', output.data) - @patch('pagure.ui.repo.admin_session_timedout') def test_remove_user_when_user_mngt_off(self, ast): """ Test the remove_user endpoint when user management is turned @@ -469,6 +472,8 @@ class PagureFlaskRepotests(tests.Modeltests): session=self.session, group_name='testgrp', group_type='user', + display_name='testgrp group', + description=None, user='pingou', is_admin=False, blacklist=[], @@ -548,6 +553,8 @@ class PagureFlaskRepotests(tests.Modeltests): session=self.session, group_name='testgrp', group_type='user', + display_name='testgrp group', + description=None, user='pingou', is_admin=False, blacklist=[], diff --git a/tests/test_pagure_lib.py b/tests/test_pagure_lib.py index f233651..f566487 100644 --- a/tests/test_pagure_lib.py +++ b/tests/test_pagure_lib.py @@ -1895,6 +1895,8 @@ class PagureLibtests(tests.Modeltests): pagure.lib.add_group, self.session, group_name='foo', + display_name='foo group', + description=None, group_type='bar', user='pingou', is_admin=True, @@ -1910,6 +1912,8 @@ class PagureLibtests(tests.Modeltests): pagure.lib.add_group, self.session, group_name='foo', + display_name='foo group', + description=None, group_type='user', user='test', is_admin=False, @@ -1922,6 +1926,8 @@ class PagureLibtests(tests.Modeltests): msg = pagure.lib.add_group( self.session, group_name='foo', + display_name='foo group', + description=None, group_type='bar', user='pingou', is_admin=False, @@ -1940,6 +1946,8 @@ class PagureLibtests(tests.Modeltests): pagure.lib.add_group, self.session, group_name='foo', + display_name='foo group', + description=None, group_type='bar', user='pingou', is_admin=False, @@ -1952,6 +1960,8 @@ class PagureLibtests(tests.Modeltests): pagure.lib.add_group, self.session, group_name='forks', + display_name='foo group', + description=None, group_type='bar', user='pingou', is_admin=False, @@ -2072,6 +2082,8 @@ class PagureLibtests(tests.Modeltests): msg = pagure.lib.add_group( self.session, group_name='foo', + display_name='foo group', + description=None, group_type='bar', user='pingou', is_admin=False, @@ -2087,6 +2099,8 @@ class PagureLibtests(tests.Modeltests): msg = pagure.lib.add_group( self.session, group_name='bar', + display_name='bar group', + description=None, group_type='admin', user='pingou', is_admin=True, diff --git a/tests/test_pagure_lib_git.py b/tests/test_pagure_lib_git.py index fff7ac4..730e512 100644 --- a/tests/test_pagure_lib_git.py +++ b/tests/test_pagure_lib_git.py @@ -148,6 +148,8 @@ repo requests/forks/pingou/test3 msg = pagure.lib.add_group( self.session, group_name='sysadmin', + display_name='sysadmin group', + description=None, group_type='user', user='pingou', is_admin=False, @@ -158,6 +160,8 @@ repo requests/forks/pingou/test3 msg = pagure.lib.add_group( self.session, group_name='devs', + display_name='devs group', + description=None, group_type='user', user='pingou', is_admin=False, diff --git a/tests/test_pagure_lib_model.py b/tests/test_pagure_lib_model.py index ff08eb6..9e21ca4 100644 --- a/tests/test_pagure_lib_model.py +++ b/tests/test_pagure_lib_model.py @@ -115,6 +115,8 @@ class PagureLibModeltests(tests.Modeltests): """ Test the PagureGroup.__repr__ function of pagure.lib.model. """ item = pagure.lib.model.PagureGroup( group_name='admin', + display_name='admin group', + description='the local admin group', user_id=1, ) self.session.add(item)