diff --git a/dev-data.py b/dev-data.py index 293d094..fe3dc3a 100644 --- a/dev-data.py +++ b/dev-data.py @@ -257,7 +257,7 @@ def insert_data(session, username, user_email): # projects_groups group = pagure.lib.search_groups(session, pattern=None, group_name="rel-eng", group_type=None) - repo = pagure.lib.get_project(session, 'test') + repo = pagure.get_authorized_project(session, 'test') item = pagure.lib.model.ProjectGroup( project_id=repo.id, group_id=group.id @@ -267,7 +267,7 @@ def insert_data(session, username, user_email): group = pagure.lib.search_groups(session, pattern=None, group_name="admin", group_type=None) - repo = pagure.lib.get_project(session, 'test2') + repo = pagure.get_authorized_project(session, 'test2') item = pagure.lib.model.ProjectGroup( project_id=repo.id, group_id=group.id @@ -277,8 +277,8 @@ def insert_data(session, username, user_email): ###################################### # pull_requests - repo = pagure.lib.get_project(session, 'test') - forked_repo = pagure.lib.get_project(session, 'test') + repo = pagure.get_authorized_project(session, 'test') + forked_repo = pagure.get_authorized_project(session, 'test') req = pagure.lib.new_pull_request( session=session, repo_from=forked_repo, @@ -298,7 +298,7 @@ def insert_data(session, username, user_email): ###################################### # user_projects user = pagure.lib.search_user(session, username='foo') - repo = pagure.lib.get_project(session, 'test') + repo = pagure.get_authorized_project(session, 'test') item = pagure.lib.model.ProjectUser( project_id=repo.id, user_id=user.id @@ -307,7 +307,7 @@ def insert_data(session, username, user_email): session.commit() user = pagure.lib.search_user(session, username=username) - repo = pagure.lib.get_project(session, 'test2') + repo = pagure.get_authorized_project(session, 'test2') item = pagure.lib.model.ProjectUser( project_id=repo.id, user_id=user.id @@ -327,8 +327,7 @@ def insert_data(session, username, user_email): ###################################### # issue_to_issue - repo = pagure.lib.get_project(session, 'test') - + repo = pagure.get_authorized_project(session, 'test') all_issues = pagure.lib.search_issues(session, repo) pagure.lib.add_issue_dependency(session, all_issues[0], all_issues[1], 'pingou', @@ -367,7 +366,7 @@ def insert_data(session, username, user_email): ###################################### # tags_issues - repo = pagure.lib.get_project(session, 'test') + repo = pagure.get_authorized_project(session, 'test') issues = pagure.lib.search_issues(session, repo) item = pagure.lib.model.TagIssue( issue_uid=issues[0].uid, @@ -408,7 +407,7 @@ def insert_data(session, username, user_email): except: print('requests folder already deleted') - repo = pagure.lib.get_project(session, 'test') + repo = pagure.get_authorized_project(session, 'test') result = pagure.lib.fork_project(session, 'foo', repo, pagure.APP.config['GIT_FOLDER'], pagure.APP.config['DOCS_FOLDER'], diff --git a/pagure/api/__init__.py b/pagure/api/__init__.py index 3c542f3..21eab81 100644 --- a/pagure/api/__init__.py +++ b/pagure/api/__init__.py @@ -341,7 +341,7 @@ def api_project_tags(repo, username=None): if pattern is not None and not pattern.endswith('*'): pattern += '*' - project_obj = pagure.lib.get_project(SESSION, repo, username) + project_obj = pagure.get_authorized_project(SESSION, repo, username) if not project_obj: output = {'output': 'notok', 'error': 'Project not found'} jsonout = flask.jsonify(output) diff --git a/pagure/docs_server.py b/pagure/docs_server.py index bc17900..a72331d 100644 --- a/pagure/docs_server.py +++ b/pagure/docs_server.py @@ -16,6 +16,7 @@ import pygit2 from binaryornot.helpers import is_binary_string +import pagure import pagure.doc_utils import pagure.exceptions import pagure.lib @@ -139,8 +140,8 @@ def view_docs(repo, username=None, namespace=None, filename=None): if '.' in repo: namespace, repo = repo.split('.', 1) - repo = pagure.lib.get_project( - SESSION, repo, user=username, namespace=namespace) + repo = pagure.get_authorized_project(SESSION, repo, user=username, + namespace=namespace) if not repo: flask.abort(404, 'Project not found') diff --git a/pagure/internal/__init__.py b/pagure/internal/__init__.py index 17ac510..abbdb96 100644 --- a/pagure/internal/__init__.py +++ b/pagure/internal/__init__.py @@ -249,7 +249,7 @@ def get_pull_request_ready_branch(): response.status_code = 400 return response - repo = pagure.lib.get_project( + repo = pagure.get_authorized_project( pagure.SESSION, flask.request.form.get('repo', '').strip() or None, namespace=flask.request.form.get('namespace', '').strip() or None, @@ -336,7 +336,7 @@ def get_ticket_template(repo, username=None): response.status_code = 400 return response - repo = pagure.lib.get_project(pagure.SESSION, repo, user=username) + repo = pagure.get_authorized_project(pagure.SESSION, repo, user=username) if repo is None: response = flask.jsonify({ @@ -405,7 +405,7 @@ def get_branches_of_commit(): response.status_code = 400 return response - repo = pagure.lib.get_project( + repo = pagure.get_authorized_project( pagure.SESSION, flask.request.form.get('repo', '').strip() or None, user=flask.request.form.get('repouser', '').strip() or None) diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py index 4335bd0..a92a7c7 100644 --- a/pagure/lib/__init__.py +++ b/pagure/lib/__init__.py @@ -44,6 +44,7 @@ from sqlalchemy.orm import scoped_session import pygit2 +import pagure import pagure.exceptions import pagure.lib.git import pagure.lib.login diff --git a/pagure/lib/link.py b/pagure/lib/link.py index f1f87e1..f6fb84b 100644 --- a/pagure/lib/link.py +++ b/pagure/lib/link.py @@ -12,7 +12,7 @@ import re - +import pagure import pagure.exceptions diff --git a/pagure/pfmarkdown.py b/pagure/pfmarkdown.py index 4be6cb8..ccb765f 100644 --- a/pagure/pfmarkdown.py +++ b/pagure/pfmarkdown.py @@ -315,8 +315,10 @@ def makeExtension(*arg, **kwargs): def _issue_exists(user, namespace, repo, idx): """ Utility method checking if a given issue exists. """ + repo_obj = pagure.lib.get_project( pagure.SESSION, name=repo, user=user, namespace=namespace) + if not repo_obj: return False @@ -332,6 +334,7 @@ def _pr_exists(user, namespace, repo, idx): """ Utility method checking if a given PR exists. """ repo_obj = pagure.lib.get_project( pagure.SESSION, name=repo, user=user, namespace=namespace) + if not repo_obj: return False diff --git a/tests/test_pagure_flask_api_fork.py b/tests/test_pagure_flask_api_fork.py index 3ecdecf..8a03857 100644 --- a/tests/test_pagure_flask_api_fork.py +++ b/tests/test_pagure_flask_api_fork.py @@ -23,7 +23,7 @@ from mock import patch sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) -import pagure.api +import pagure import pagure.lib import tests @@ -55,8 +55,8 @@ class PagureFlaskApiForktests(tests.Modeltests): tests.create_tokens_acl(self.session) # Create a pull-request - repo = pagure.lib.get_project(self.session, 'test') - forked_repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') + forked_repo = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=forked_repo, @@ -216,8 +216,8 @@ class PagureFlaskApiForktests(tests.Modeltests): tests.create_tokens_acl(self.session) # Create a pull-request - repo = pagure.lib.get_project(self.session, 'test') - forked_repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') + forked_repo = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=forked_repo, @@ -381,8 +381,8 @@ class PagureFlaskApiForktests(tests.Modeltests): tests.create_tokens_acl(self.session) # Create the pull-request to close - repo = pagure.lib.get_project(self.session, 'test') - forked_repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') + forked_repo = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=forked_repo, @@ -494,8 +494,8 @@ class PagureFlaskApiForktests(tests.Modeltests): tests.create_tokens_acl(self.session) # Create the pull-request to close - repo = pagure.lib.get_project(self.session, 'test') - forked_repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') + forked_repo = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=forked_repo, @@ -757,8 +757,8 @@ 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') + repo = pagure.get_authorized_project(self.session, 'test') + forked_repo = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=forked_repo, @@ -981,8 +981,8 @@ 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') + repo = pagure.get_authorized_project(self.session, 'test') + forked_repo = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=forked_repo, diff --git a/tests/test_pagure_flask_api_issue.py b/tests/test_pagure_flask_api_issue.py index 77b9964..f1c04ac 100644 --- a/tests/test_pagure_flask_api_issue.py +++ b/tests/test_pagure_flask_api_issue.py @@ -25,6 +25,7 @@ from mock import patch sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) +import pagure import pagure.lib import tests @@ -614,8 +615,6 @@ class PagureFlaskApiIssuetests(tests.Modeltests): 'title': 'test issue', 'issue_content': 'This issue needs attention', } - - # Valid request output = self.app.post( '/api/0/test/new_issue', data=data, headers=headers) self.assertEqual(output.status_code, 200) @@ -1716,7 +1715,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): ) # Create private issue - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -1886,7 +1885,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): ) # Create normal issue - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -1928,7 +1927,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): self.session.add(item) self.session.commit() - repo = pagure.lib.get_project(self.session, 'foo') + repo = pagure.get_authorized_project(self.session, 'foo') # Create private issue msg = pagure.lib.new_issue( session=self.session, @@ -1943,7 +1942,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): self.assertEqual(msg.title, 'Test issue') # Check status before - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.status, 'Open') @@ -1966,7 +1965,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): ) # No change - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.status, 'Open') @@ -1985,7 +1984,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): ) # No change - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.status, 'Open') @@ -2264,7 +2263,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): ) # Create normal issue - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -2279,7 +2278,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): self.assertEqual(msg.title, 'Test issue #1') # Check comments before - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 0) @@ -2302,7 +2301,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): ) # No change - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.status, 'Open') @@ -2321,7 +2320,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): ) # One comment added - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 1) @@ -2355,7 +2354,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): self.session.add(item) self.session.commit() - repo = pagure.lib.get_project(self.session, 'foo') + repo = pagure.get_authorized_project(self.session, 'foo') # Create private issue msg = pagure.lib.new_issue( session=self.session, @@ -2371,7 +2370,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): self.assertEqual(msg.title, 'Test issue') # Check before - repo = pagure.lib.get_project(self.session, 'foo') + repo = pagure.get_authorized_project(self.session, 'foo') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 0) @@ -2390,7 +2389,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): self.assertEqual(pagure.api.APIERROR.EINVALIDTOK.value, data['error']) # No comment added - repo = pagure.lib.get_project(self.session, 'foo') + repo = pagure.get_authorized_project(self.session, 'foo') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 0) @@ -2787,7 +2786,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): ) # Create normal issue - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -2802,7 +2801,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): self.assertEqual(msg.title, 'Test issue #1') # Check comments before - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 0) @@ -2834,7 +2833,8 @@ class PagureFlaskApiIssuetests(tests.Modeltests): data, {'message': 'Assignee reset'} ) - repo = pagure.lib.get_project(self.session, 'test') + # No change + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.assignee, None) @@ -2886,7 +2886,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): ) # One comment added - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.assignee.user, 'pingou') @@ -2920,7 +2920,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): self.session.add(item) self.session.commit() - repo = pagure.lib.get_project(self.session, 'foo') + repo = pagure.get_authorized_project(self.session, 'foo') # Create private issue msg = pagure.lib.new_issue( session=self.session, @@ -2936,7 +2936,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): self.assertEqual(msg.title, 'Test issue') # Check before - repo = pagure.lib.get_project(self.session, 'foo') + repo = pagure.get_authorized_project(self.session, 'foo') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 0) @@ -2955,7 +2955,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): self.assertEqual(pagure.api.APIERROR.EINVALIDTOK.value, data['error']) # No comment added - repo = pagure.lib.get_project(self.session, 'foo') + repo = pagure.get_authorized_project(self.session, 'foo') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 0) diff --git a/tests/test_pagure_flask_api_project.py b/tests/test_pagure_flask_api_project.py index 6bfb9b5..8940d9e 100644 --- a/tests/test_pagure_flask_api_project.py +++ b/tests/test_pagure_flask_api_project.py @@ -115,7 +115,7 @@ class PagureFlaskApiProjecttests(tests.Modeltests): tests.create_projects(self.session) # Check before adding - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(repo.tags, []) # Adding a tag @@ -125,7 +125,7 @@ class PagureFlaskApiProjecttests(tests.Modeltests): self.assertEqual(output, ['Issue tagged with: infra']) # Check after adding - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.tags), 1) self.assertEqual(repo.tags_text, ['infra']) diff --git a/tests/test_pagure_flask_docs.py b/tests/test_pagure_flask_docs.py index de232f8..5ca5d64 100644 --- a/tests/test_pagure_flask_docs.py +++ b/tests/test_pagure_flask_docs.py @@ -24,6 +24,7 @@ from mock import patch sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) +import pagure import pagure.docs_server import pagure.lib import tests @@ -120,7 +121,7 @@ class PagureFlaskDocstests(tests.Modeltests): tests.create_projects(self.session) # Turn on the docs project since it's off by default - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.settings = {'project_documentation': True} self.session.add(repo) self.session.commit() @@ -163,6 +164,51 @@ class PagureFlaskDocstests(tests.Modeltests): self.assertEqual(output.status_code, 404) self._set_up_doc() + # forked doc repo + docrepo = os.path.join(self.path, 'docs', 'test', 'test.git') + repo = pygit2.init_repository(docrepo) + + # Create files in that git repo + with open(os.path.join(docrepo, 'sources'), 'w') as stream: + stream.write('foo\n bar') + repo.index.add('sources') + repo.index.write() + + folderpart = os.path.join(docrepo, 'folder1', 'folder2') + os.makedirs(folderpart) + with open(os.path.join(folderpart, 'test_file'), 'w') as stream: + stream.write('row1\nrow2\nrow3') + repo.index.add(os.path.join('folder1', 'folder2', 'test_file')) + repo.index.write() + + # Commits the files added + tree = repo.index.write_tree() + author = pygit2.Signature( + 'Alice Author', 'alice@authors.tld') + committer = pygit2.Signature( + 'Cecil Committer', 'cecil@committers.tld') + repo.create_commit( + 'refs/heads/master', # the name of the reference to update + author, + committer, + 'Add test files and folder', + # binary string representing the tree object ID + tree, + # list of binary strings representing parents of the new commit + [] + ) + + # Push the changes to the bare repo + remote = repo.create_remote( + 'origin', os.path.join(self.path, 'docs', 'test.git')) + + PagureRepo.push(remote, 'refs/heads/master:refs/heads/master') + + # Turn on the docs project since it's off by default + repo = pagure.get_authorized_project(self.session, 'test') + repo.settings = {'project_documentation': True} + self.session.add(repo) + self.session.commit() # Now check the UI diff --git a/tests/test_pagure_flask_dump_load_ticket.py b/tests/test_pagure_flask_dump_load_ticket.py index aecf319..ac84724 100644 --- a/tests/test_pagure_flask_dump_load_ticket.py +++ b/tests/test_pagure_flask_dump_load_ticket.py @@ -24,6 +24,7 @@ from mock import patch sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) +import pagure import pagure.lib import tests @@ -67,7 +68,7 @@ class PagureFlaskDumpLoadTicketTests(tests.Modeltests): os.makedirs(self.gitrepo) repo_obj = pygit2.init_repository(self.gitrepo, bare=True) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') # Create an issue to play with msg = pagure.lib.new_issue( session=self.session, @@ -208,7 +209,7 @@ class PagureFlaskDumpLoadTicketTests(tests.Modeltests): ) # Post loading - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.issues), 1) issue = pagure.lib.search_issues(self.session, repo, issueid=1) diff --git a/tests/test_pagure_flask_internal.py b/tests/test_pagure_flask_internal.py index 0a51015..017f286 100644 --- a/tests/test_pagure_flask_internal.py +++ b/tests/test_pagure_flask_internal.py @@ -23,6 +23,7 @@ from mock import patch sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) +import pagure import pagure.lib import tests @@ -55,7 +56,7 @@ class PagureFlaskInternaltests(tests.Modeltests): tests.create_projects(self.session) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, @@ -117,7 +118,7 @@ class PagureFlaskInternaltests(tests.Modeltests): js_data = json.loads(output.data) self.assertDictEqual(js_data, {'message': 'Comment added'}) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') request = repo.requests[0] self.assertEqual(len(request.comments), 1) self.assertEqual(len(request.discussion), 1) @@ -139,7 +140,7 @@ class PagureFlaskInternaltests(tests.Modeltests): tests.create_projects(self.session) # Create issues to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -196,7 +197,7 @@ class PagureFlaskInternaltests(tests.Modeltests): js_data = json.loads(output.data) self.assertDictEqual(js_data, {'message': 'Comment added'}) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = repo.issues[0] self.assertEqual(len(issue.comments), 1) @@ -218,7 +219,7 @@ class PagureFlaskInternaltests(tests.Modeltests): tests.create_projects(self.session) # Create issues to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -285,7 +286,7 @@ class PagureFlaskInternaltests(tests.Modeltests): js_data = json.loads(output.data) self.assertDictEqual(js_data, {'message': 'Comment added'}) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = repo.issues[0] self.assertEqual(len(issue.comments), 1) @@ -494,7 +495,7 @@ class PagureFlaskInternaltests(tests.Modeltests): # Create a PR for these changes tests.create_projects(self.session) - project = pagure.lib.get_project(self.session, 'test') + project = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=project, @@ -533,7 +534,7 @@ class PagureFlaskInternaltests(tests.Modeltests): self.assertEqual(output.status_code, 404) # With all the desired information - project = pagure.lib.get_project(self.session, 'test') + project = pagure.get_authorized_project(self.session, 'test') data = { 'csrf_token': csrf_token, 'requestid': project.requests[0].uid, @@ -616,7 +617,7 @@ class PagureFlaskInternaltests(tests.Modeltests): # Create a PR for these changes tests.create_projects(self.session) - project = pagure.lib.get_project(self.session, 'test') + project = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=project, @@ -655,7 +656,7 @@ class PagureFlaskInternaltests(tests.Modeltests): self.assertEqual(output.status_code, 404) # With all the desired information - project = pagure.lib.get_project(self.session, 'test') + project = pagure.get_authorized_project(self.session, 'test') data = { 'csrf_token': csrf_token, 'requestid': project.requests[0].uid, @@ -759,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') + project = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=project, @@ -796,7 +797,7 @@ class PagureFlaskInternaltests(tests.Modeltests): self.assertEqual(output.status_code, 404) # With all the desired information - project = pagure.lib.get_project(self.session, 'test') + project = pagure.get_authorized_project(self.session, 'test') data = { 'csrf_token': csrf_token, 'requestid': project.requests[0].uid, @@ -900,7 +901,7 @@ class PagureFlaskInternaltests(tests.Modeltests): # Create a PR for these changes tests.create_projects(self.session) - project = pagure.lib.get_project(self.session, 'test') + project = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=project, @@ -937,7 +938,7 @@ class PagureFlaskInternaltests(tests.Modeltests): self.assertEqual(output.status_code, 404) # With all the desired information - project = pagure.lib.get_project(self.session, 'test') + project = pagure.get_authorized_project(self.session, 'test') data = { 'csrf_token': csrf_token, 'requestid': project.requests[0].uid, diff --git a/tests/test_pagure_flask_ui_fork.py b/tests/test_pagure_flask_ui_fork.py index fbe0b33..7464448 100644 --- a/tests/test_pagure_flask_ui_fork.py +++ b/tests/test_pagure_flask_ui_fork.py @@ -24,6 +24,7 @@ from mock import patch sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) +import pagure import pagure.lib import tests from pagure.lib.repo import PagureRepo @@ -206,7 +207,7 @@ class PagureFlaskForktests(tests.Modeltests): PagureRepo.push(ori_remote, refname) # Create a PR for these changes - project = pagure.lib.get_project(self.session, 'test') + project = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=project, @@ -242,7 +243,7 @@ class PagureFlaskForktests(tests.Modeltests): self.set_up_git_repo(new_project=None, branch_from='feature') - project = pagure.lib.get_project(self.session, 'test') + project = pagure.get_authorized_project(self.session, 'test') self.assertEqual(len(project.requests), 1) # View the pull-request @@ -317,7 +318,7 @@ class PagureFlaskForktests(tests.Modeltests): self.assertEqual(output.status_code, 404) # Project w/o pull-request - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -351,7 +352,7 @@ class PagureFlaskForktests(tests.Modeltests): 'assigned to be merged', output.data) # PR assigned but not to this user - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') req = repo.requests[0] req.assignee_id = 2 self.session.add(req) @@ -565,7 +566,7 @@ class PagureFlaskForktests(tests.Modeltests): self.set_up_git_repo(new_project=None, branch_from='feature') # Project w/o pull-request - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -633,7 +634,7 @@ class PagureFlaskForktests(tests.Modeltests): PagureRepo.push(ori_remote, refname) # Create a PR for these changes - project = pagure.lib.get_project(self.session, 'test') + project = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=item, @@ -695,7 +696,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') + project = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=item, @@ -789,7 +790,7 @@ class PagureFlaskForktests(tests.Modeltests): 'href="/test/pull-requests?status=0">Closed', output.data) # Project w/o pull-request - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -862,7 +863,7 @@ index 9f44358..2a552bb 100644 self.assertEqual(patch, exp) # Project w/o pull-request - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -976,7 +977,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') + project = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=item, @@ -1067,7 +1068,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') + project = pagure.get_authorized_project(self.session, 'test') req = pagure.lib.new_pull_request( session=self.session, repo_from=item, @@ -1149,7 +1150,7 @@ index 0000000..2a552bb user.username = 'pingou' with tests.user_set(pagure.APP, user): # Project w/o pull-request - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -1162,7 +1163,7 @@ index 0000000..2a552bb self.assertEqual(output.status_code, 404) # Project w/ pull-request - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = True repo.settings = settings @@ -1288,7 +1289,7 @@ index 0000000..2a552bb output.data) # Pull-Request closed - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') req = repo.requests[0] req.status = 'Closed' req.closed_by_in = 1 @@ -1301,7 +1302,7 @@ index 0000000..2a552bb self.assertEqual(output.status_code, 403) # Project w/o pull-request - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -1370,8 +1371,8 @@ index 0000000..2a552bb tests.create_projects_git( os.path.join(self.path, 'requests'), bare=True) - repo = pagure.lib.get_project(self.session, 'test') - fork = pagure.lib.get_project(self.session, 'test', user='foo') + repo = pagure.get_authorized_project(self.session, 'test') + fork = pagure.get_authorized_project(self.session, 'test', user='foo') self.set_up_git_repo( new_project=fork, branch_from='feature', mtype='FF') @@ -1518,8 +1519,8 @@ index 0000000..2a552bb tests.create_projects_git( os.path.join(self.path, 'requests'), bare=True) - repo = pagure.lib.get_project(self.session, 'test') - fork = pagure.lib.get_project(self.session, 'test', user='foo') + repo = pagure.get_authorized_project(self.session, 'test') + fork = pagure.get_authorized_project(self.session, 'test', user='foo') # Create a git repo to play with gitrepo = os.path.join(self.path, 'repos', 'test.git') @@ -1569,8 +1570,8 @@ index 0000000..2a552bb tests.create_projects_git( os.path.join(self.path, 'requests'), bare=True) - repo = pagure.lib.get_project(self.session, 'test') - fork = pagure.lib.get_project(self.session, 'test', user='foo') + repo = pagure.get_authorized_project(self.session, 'test') + fork = pagure.get_authorized_project(self.session, 'test', user='foo') # Create a git repo to play with gitrepo = os.path.join(self.path, 'repos', 'test.git') @@ -1634,7 +1635,7 @@ index 0000000..2a552bb output.data) # Project w/o pull-request - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -1653,7 +1654,7 @@ index 0000000..2a552bb self.test_pull_request_add_comment() # Project w/ pull-request - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = True repo.settings = settings @@ -1715,7 +1716,7 @@ index 0000000..2a552bb output.data) # Project w/o pull-request - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -1809,7 +1810,7 @@ index 0000000..2a552bb '\n Comment updated', output.data) # Project w/o pull-request - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') settings = repo.settings settings['pull_requests'] = False repo.settings = settings @@ -1879,7 +1880,7 @@ index 0000000..2a552bb self.assertEqual(output.status_code, 404) # Project requiring a merge commit - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') settings = repo.settings settings['always_merge'] = True repo.settings = settings diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py index b328ea0..bb47299 100644 --- a/tests/test_pagure_flask_ui_issues.py +++ b/tests/test_pagure_flask_ui_issues.py @@ -29,6 +29,7 @@ from mock import patch sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) +import pagure import pagure.lib import tests @@ -145,7 +146,7 @@ class PagureFlaskIssuestests(tests.Modeltests): output.data) # Project w/o issue tracker - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -211,7 +212,7 @@ class PagureFlaskIssuestests(tests.Modeltests): output.data) # Project w/o issue tracker - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -297,7 +298,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertTrue( '

\n 0 Open Issues' in output.data) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') # Create some custom fields to play with msg = pagure.lib.set_custom_key_fields( session=self.session, @@ -461,7 +462,7 @@ class PagureFlaskIssuestests(tests.Modeltests): output.data) # Project w/o issue tracker - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -496,7 +497,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 404) # Create issues to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -560,7 +561,7 @@ class PagureFlaskIssuestests(tests.Modeltests): 'name="csrf_token" type="hidden" value="')[1].split('">')[0] # Create private issue - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -600,7 +601,7 @@ class PagureFlaskIssuestests(tests.Modeltests): output.data) # Project w/o issue tracker - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -952,7 +953,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 302) # Create issues to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -1167,7 +1168,7 @@ class PagureFlaskIssuestests(tests.Modeltests): in output.data) # Create another issue with a dependency - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -1213,7 +1214,7 @@ class PagureFlaskIssuestests(tests.Modeltests): in output.data) # Create private issue - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -1234,7 +1235,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 403) # Project w/o issue tracker - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -1259,7 +1260,7 @@ class PagureFlaskIssuestests(tests.Modeltests): os.path.join(self.path), bare=True) # Create issues to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -1309,7 +1310,7 @@ class PagureFlaskIssuestests(tests.Modeltests): '

Woohoo a second comment !

' in output.data) self.assertEqual(output.data.count('comment_body">'), 2) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 1) @@ -1353,7 +1354,7 @@ class PagureFlaskIssuestests(tests.Modeltests): '/test/issue/1/update', data=data, follow_redirects=True) self.assertEqual(output.status_code, 404) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 0) @@ -1369,7 +1370,7 @@ class PagureFlaskIssuestests(tests.Modeltests): os.path.join(self.path), bare=True) # Create issues to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -1381,7 +1382,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.session.commit() self.assertEqual(msg.title, 'Test issue') - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -1445,7 +1446,7 @@ class PagureFlaskIssuestests(tests.Modeltests): 'Successfully edited issue #1', output.data) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.depending_text, [2]) self.assertEqual(issue.blocking_text, []) @@ -1462,7 +1463,7 @@ class PagureFlaskIssuestests(tests.Modeltests): os.path.join(self.path), bare=True) # Create issues to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -1474,7 +1475,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.session.commit() self.assertEqual(msg.title, 'Test issue') - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -1567,7 +1568,7 @@ class PagureFlaskIssuestests(tests.Modeltests): 'Successfully edited issue #1', output.data) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(issue.depending_text, []) self.assertEqual(issue.blocking_text, [2]) @@ -1588,7 +1589,7 @@ class PagureFlaskIssuestests(tests.Modeltests): os.path.join(self.path, 'tickets'), bare=True) # Create issues to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -1678,7 +1679,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertDictEqual(json_data, exp) # Project w/o issue tracker - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -1695,7 +1696,7 @@ class PagureFlaskIssuestests(tests.Modeltests): os.path.join(self.path, 'tickets'), bare=True) # Create issues to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -1719,7 +1720,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 404) # Project w/o issue tracker - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -1733,7 +1734,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.test_upload_issue() # Project w/ issue tracker - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': True} self.session.add(repo) self.session.commit() @@ -1754,7 +1755,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 200) # Project w/o issue tracker - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -1795,7 +1796,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 404) # Create issues to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -1868,7 +1869,7 @@ class PagureFlaskIssuestests(tests.Modeltests): '

We should work on this!

'), 1) # Project w/o issue tracker - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -1905,7 +1906,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 302) # Create issues to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -2008,7 +2009,7 @@ class PagureFlaskIssuestests(tests.Modeltests): self.assertEqual(output.status_code, 302) # Create issues to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -2076,7 +2077,7 @@ class PagureFlaskIssuestests(tests.Modeltests): tests.create_projects_git(os.path.join(self.path, 'tickets')) # Create issues to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -2136,7 +2137,7 @@ class PagureFlaskIssuestests(tests.Modeltests): output.data) # Project w/o issue tracker - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': False} self.session.add(repo) self.session.commit() @@ -2158,7 +2159,7 @@ class PagureFlaskIssuestests(tests.Modeltests): os.path.join(self.path), bare=True) # Create issues to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -2208,7 +2209,7 @@ class PagureFlaskIssuestests(tests.Modeltests): '

Woohoo a second comment !

' in output.data) self.assertEqual(output.data.count('comment_body">'), 2) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 1) self.assertEqual( @@ -2251,7 +2252,7 @@ class PagureFlaskIssuestests(tests.Modeltests): '\n Comment updated', output.data) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 1) self.assertEqual(issue.comments[0].comment, 'Updated comment') @@ -2289,7 +2290,7 @@ class PagureFlaskIssuestests(tests.Modeltests): '\n Comment updated', output.data) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(len(issue.comments), 1) self.assertEqual(issue.comments[0].comment, 'Second update') @@ -2410,7 +2411,7 @@ class PagureFlaskIssuestests(tests.Modeltests): '

Issues GIT URLs
', output.data) # Project w/o issue tracker - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.settings = {'issue_tracker': True} self.session.add(repo) self.session.commit() diff --git a/tests/test_pagure_flask_ui_priorities.py b/tests/test_pagure_flask_ui_priorities.py index 9666b0a..34a843f 100644 --- a/tests/test_pagure_flask_ui_priorities.py +++ b/tests/test_pagure_flask_ui_priorities.py @@ -25,6 +25,7 @@ from mock import patch sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) +import pagure import pagure.lib import tests from pagure.lib.repo import PagureRepo @@ -110,7 +111,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): tests.create_projects_git(os.path.join(self.path), bare=True) # Set some priorities - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.priorities = {'1': 'High', '2': 'Normal'} self.session.add(repo) self.session.commit() @@ -156,7 +157,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): tests.create_projects_git(os.path.join(self.path), bare=True) # Set some priorities - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(repo.priorities, {}) user = tests.FakeUser() @@ -185,7 +186,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): 'Settings - test - Pagure', output.data) self.assertIn('

Settings for test

', output.data) # Check the result of the action -- None, no CSRF - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(repo.priorities, {}) data = { @@ -201,7 +202,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): 'Settings - test - Pagure', output.data) self.assertIn('

Settings for test

', output.data) # Check the result of the action -- Priority recorded - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(repo.priorities, {u'': u'', u'1': u'High'}) data = { @@ -222,7 +223,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): self.assertTrue( output.data.find('Normal') < output.data.find('Low')) # Check the result of the action -- Priority recorded - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual( repo.priorities, {u'': u'', u'1': u'High', u'2': u'Normal', u'3': u'Low'} @@ -245,7 +246,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): '\n' ' Priorities weights and titles are ' 'not of the same length', output.data) # Check the result of the action -- Priorities un-changed - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual( repo.priorities, {u'': u'', u'1': u'High', u'2': u'Normal', u'3': u'Low'} @@ -269,7 +270,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): ' Priorities weights must be numbers', output.data) # Check the result of the action -- Priorities un-changed - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual( repo.priorities, {u'': u'', u'1': u'High', u'2': u'Normal', u'3': u'Low'} @@ -293,7 +294,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): ' Priority weight 2 is present 2 times', output.data) # Check the result of the action -- Priorities un-changed - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual( repo.priorities, {u'': u'', u'1': u'High', u'2': u'Normal', u'3': u'Low'} @@ -317,7 +318,7 @@ class PagureFlaskPrioritiestests(tests.Modeltests): ' Priority Normal is present 2 times', output.data) # Check the result of the action -- Priorities un-changed - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual( repo.priorities, {u'': u'', u'1': u'High', u'2': u'Normal', u'3': u'Low'} diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py index 9e25d9d..05eea20 100644 --- a/tests/test_pagure_flask_ui_repo.py +++ b/tests/test_pagure_flask_ui_repo.py @@ -25,6 +25,7 @@ from mock import patch, MagicMock sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) +import pagure import pagure.lib import tests from pagure.lib.repo import PagureRepo @@ -499,7 +500,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertEqual(output.status_code, 302) # Add an user to a project - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.add_user_to_project( session=self.session, project=repo, @@ -646,7 +647,7 @@ class PagureFlaskRepotests(tests.Modeltests): 'access on the repo', output.data) # Add an user to a project - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.add_user_to_project( session=self.session, project=repo, @@ -722,7 +723,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertEqual(msg, 'User `pingou` added to the group `testgrp`.') self.session.commit() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') # Add the group to a project msg = pagure.lib.add_group_to_project( session=self.session, @@ -808,7 +809,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.assertEqual(msg, 'User `pingou` added to the group `testgrp`.') self.session.commit() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') # Add the group to a project msg = pagure.lib.add_group_to_project( session=self.session, @@ -1310,7 +1311,7 @@ class PagureFlaskRepotests(tests.Modeltests): self.perfReset() # Turn that repo into a fork - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.parent_id = 2 repo.is_fork = True self.session.add(repo) @@ -1445,7 +1446,7 @@ class PagureFlaskRepotests(tests.Modeltests): 'test project #1 ', output.data) # Turn that repo into a fork - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.parent_id = 2 repo.is_fork = True self.session.add(repo) @@ -1540,7 +1541,7 @@ class PagureFlaskRepotests(tests.Modeltests): 'test project #1 ', output.data) # Turn that repo into a fork - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.parent_id = 2 repo.is_fork = True self.session.add(repo) @@ -2598,7 +2599,7 @@ index 0000000..fb7093d output.data) # add issues - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -2692,9 +2693,9 @@ index 0000000..fb7093d output = self.app.post('/test/delete', follow_redirects=True) self.assertEqual(output.status_code, 404) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertNotEqual(repo, None) - repo = pagure.lib.get_project(self.session, 'test2') + repo = pagure.get_authorized_project(self.session, 'test2') self.assertNotEqual(repo, None) # Add a fork of a fork @@ -2849,7 +2850,7 @@ index 0000000..fb7093d output.data) # add issues - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -2949,9 +2950,9 @@ index 0000000..fb7093d 'Forks 0', output.data) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(repo, None) - repo = pagure.lib.get_project(self.session, 'test2') + repo = pagure.get_authorized_project(self.session, 'test2') self.assertNotEqual(repo, None) # Add a fork of a fork @@ -3267,7 +3268,7 @@ index 0000000..fb7093d tests.create_projects(self.session) tests.create_projects_git(self.path) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(repo.hook_token, 'aaabbbccc') user = tests.FakeUser() @@ -3293,7 +3294,7 @@ index 0000000..fb7093d pagure.APP.config['WEBHOOK'] = False - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(repo.hook_token, 'aaabbbccc') user.username = 'pingou' @@ -3304,7 +3305,7 @@ index 0000000..fb7093d data = {'csrf_token': csrf_token} - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(repo.hook_token, 'aaabbbccc') output = self.app.post( @@ -3315,7 +3316,7 @@ index 0000000..fb7093d output.data) pagure.APP.config['WEBHOOK'] = False - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertNotEqual(repo.hook_token, 'aaabbbccc') @patch('pagure.lib.notify.send_email') @@ -3364,7 +3365,7 @@ index 0000000..fb7093d self.assertEqual(output.status_code, 400) # Create an issue to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_issue( session=self.session, repo=repo, @@ -3385,7 +3386,7 @@ index 0000000..fb7093d output.data) # Create a request to play with - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.new_pull_request( session=self.session, repo_from=repo, @@ -3925,7 +3926,7 @@ index 0000000..fb7093d output.data) # Existing token will expire in 60 days - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual( repo.tokens[0].expiration.date(), datetime.datetime.utcnow().date() + datetime.timedelta(days=60)) @@ -3942,7 +3943,7 @@ index 0000000..fb7093d output.data) # Existing token has been expired - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual( repo.tokens[0].expiration.date(), repo.tokens[0].created.date()) diff --git a/tests/test_pagure_flask_ui_roadmap.py b/tests/test_pagure_flask_ui_roadmap.py index 503382b..b97469c 100644 --- a/tests/test_pagure_flask_ui_roadmap.py +++ b/tests/test_pagure_flask_ui_roadmap.py @@ -25,6 +25,7 @@ from mock import patch sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) +import pagure import pagure.lib import tests from pagure.lib.repo import PagureRepo @@ -108,7 +109,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): tests.create_projects_git(os.path.join(self.path), bare=True) # Set some milestone - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.milestone = {'v1.0': '', 'v2.0': 'Tomorrow!'} self.session.add(repo) self.session.commit() @@ -168,7 +169,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): tests.create_projects_git(os.path.join(self.path), bare=True) # Set some milestones - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(repo.milestones, {}) user = tests.FakeUser() @@ -197,7 +198,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): u'Settings - test - Pagure', output.data) self.assertIn('

Settings for test

', output.data) # Check the result of the action -- None, no CSRF - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(repo.milestones, {}) data = { @@ -214,7 +215,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): self.assertIn(u'

Settings for test

', output.data) self.assertIn(u'Milestones updated', output.data) # Check the result of the action -- Milestones recorded - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(repo.milestones, {u'1': u'Tomorrow'}) data = { @@ -231,7 +232,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): self.assertIn(u'

Settings for test

', output.data) self.assertIn(u'Milestones updated', output.data) # Check the result of the action -- Milestones recorded - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual( repo.milestones, {u'v1.0': u'Tomorrow', u'v2.0': u''} ) @@ -254,7 +255,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): ' Milestones and dates are not of the ' 'same length', output.data) # Check the result of the action -- Milestones un-changed - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual( repo.milestones, {u'v1.0': u'Tomorrow', u'v2.0': u''} ) @@ -277,7 +278,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): ' Milestone v2.0 is present 2 times', output.data) # Check the result of the action -- Milestones un-changed - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual( repo.milestones, {u'v1.0': u'Tomorrow', u'v2.0': u''} ) @@ -300,7 +301,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): ' Date Next week is present 2 times', output.data) # Check the result of the action -- Milestones un-changed - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual( repo.milestones, {u'v1.0': u'Tomorrow', u'v2.0': u''} ) @@ -363,7 +364,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): self.assertIn(u'

Settings for test

', output.data) self.assertIn(u'Milestones updated', output.data) # Check the result of the action -- Milestones recorded - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(repo.milestones, {u'v1.0': u'', u'v2.0': u''}) @patch('pagure.lib.git.update_git') @@ -464,7 +465,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): u'Issue set to the milestone: %s\n' % mstone, output.data) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') # Mark ticket #1 as Fixed for iid in [1, 4]: @@ -528,7 +529,7 @@ class PagureFlaskRoadmaptests(tests.Modeltests): output = self.app.get('/foo/roadmap') self.assertEqual(output.status_code, 404) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') settings = repo.settings settings['issue_tracker'] = False repo.settings = settings diff --git a/tests/test_pagure_lib.py b/tests/test_pagure_lib.py index c4e3b59..632484d 100644 --- a/tests/test_pagure_lib.py +++ b/tests/test_pagure_lib.py @@ -21,6 +21,7 @@ from mock import patch, MagicMock sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) +import pagure import pagure.lib import pagure.lib.model import tests @@ -141,7 +142,7 @@ class PagureLibtests(tests.Modeltests): p_ugt.return_value = True tests.create_projects(self.session) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') # Before issues = pagure.lib.search_issues(self.session, repo) @@ -162,7 +163,7 @@ class PagureLibtests(tests.Modeltests): ) # Add an extra user to project `foo` - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') msg = pagure.lib.add_user_to_project( session=self.session, project=repo, @@ -225,7 +226,7 @@ class PagureLibtests(tests.Modeltests): self.test_new_issue() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=2) self.assertEqual(repo.open_tickets, 2) @@ -508,7 +509,7 @@ class PagureLibtests(tests.Modeltests): p_ugt.return_value = True self.test_new_issue() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) issue_blocked = pagure.lib.search_issues( self.session, repo, issueid=2) @@ -560,7 +561,7 @@ class PagureLibtests(tests.Modeltests): p_ugt.return_value = True self.test_edit_issue() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) # Add a tag to the issue @@ -598,7 +599,7 @@ class PagureLibtests(tests.Modeltests): p_ugt.return_value = True self.test_add_tag_obj() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertRaises( pagure.exceptions.PagureException, @@ -626,7 +627,7 @@ class PagureLibtests(tests.Modeltests): p_ugt.return_value = True self.test_add_tag_obj() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) msgs = pagure.lib.remove_tags_obj( @@ -682,7 +683,7 @@ class PagureLibtests(tests.Modeltests): p_ugt.return_value = True self.test_add_tag_obj() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertRaises( @@ -774,7 +775,7 @@ class PagureLibtests(tests.Modeltests): p_ugt.return_value = True self.test_edit_issue() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') # All issues issues = pagure.lib.search_issues(self.session, repo) @@ -847,7 +848,7 @@ class PagureLibtests(tests.Modeltests): p_ugt.return_value = True self.test_new_issue() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=2) # Before @@ -951,7 +952,7 @@ class PagureLibtests(tests.Modeltests): p_ugt.return_value = True self.test_new_issue() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') # Before issue = pagure.lib.search_issues(self.session, repo, issueid=1) @@ -992,7 +993,7 @@ class PagureLibtests(tests.Modeltests): tests.create_projects(self.session) # Before - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.users), 0) # Add an user to a project @@ -1015,7 +1016,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msg, 'User added') # After - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(len(repo.users), 1) self.assertEqual(repo.users[0].user, 'foo') self.assertEqual(repo.admins[0].user, 'foo') @@ -1123,7 +1124,7 @@ class PagureLibtests(tests.Modeltests): parent_id=None, ) - repo = pagure.lib.get_project(self.session, 'testproject') + repo = pagure.get_authorized_project(self.session, 'testproject') self.assertEqual(repo.path, 'testproject.git') gitrepo = os.path.join(gitfolder, repo.path) @@ -1373,7 +1374,7 @@ class PagureLibtests(tests.Modeltests): tests.create_projects(self.session) # Before - repo = pagure.lib.get_project(self.session, 'test2') + repo = pagure.get_authorized_project(self.session, 'test2') self.assertTrue(repo.settings['issue_tracker']) self.assertFalse(repo.settings['project_documentation']) @@ -1430,7 +1431,7 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(args[1]['topic'], 'project.edit') # After - repo = pagure.lib.get_project(self.session, 'test2') + repo = pagure.get_authorized_project(self.session, 'test2') self.assertFalse(repo.settings['issue_tracker']) self.assertTrue(repo.settings['project_documentation']) self.assertFalse(repo.settings['pull_requests']) @@ -1529,7 +1530,7 @@ class PagureLibtests(tests.Modeltests): """ Test the get_tags_of_project of pagure.lib. """ self.test_add_tag_obj() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') tags = pagure.lib.get_tags_of_project(self.session, repo) self.assertEqual([tag.tag for tag in tags], ['tag1']) @@ -1538,7 +1539,7 @@ class PagureLibtests(tests.Modeltests): self.session, repo, pattern='T*') self.assertEqual([tag.tag for tag in tags], ['tag1']) - repo = pagure.lib.get_project(self.session, 'test2') + repo = pagure.get_authorized_project(self.session, 'test2') tags = pagure.lib.get_tags_of_project(self.session, repo) self.assertEqual([tag.tag for tag in tags], []) @@ -1679,7 +1680,7 @@ class PagureLibtests(tests.Modeltests): projects = pagure.lib.search_projects(self.session) self.assertEqual(len(projects), 1) - repo = pagure.lib.get_project(self.session, 'testproject') + repo = pagure.get_authorized_project(self.session, 'testproject') gitrepo = os.path.join(gitfolder, repo.path) docrepo = os.path.join(docfolder, repo.path) ticketrepo = os.path.join(ticketfolder, repo.path) @@ -1785,7 +1786,7 @@ class PagureLibtests(tests.Modeltests): # Fork a fork - repo = pagure.lib.get_project( + repo = pagure.get_authorized_project( self.session, 'testproject', user='foo') msg = pagure.lib.fork_project( @@ -1987,7 +1988,7 @@ class PagureLibtests(tests.Modeltests): self.session.add(item) # Add an extra user to project `foo` - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(repo.open_requests, 0) msg = pagure.lib.add_user_to_project( @@ -1999,8 +2000,8 @@ class PagureLibtests(tests.Modeltests): self.session.commit() self.assertEqual(msg, 'User added') - repo = pagure.lib.get_project(self.session, 'test') - forked_repo = pagure.lib.get_project( + repo = pagure.get_authorized_project(self.session, 'test') + forked_repo = pagure.get_authorized_project( self.session, 'test', user='pingou') req = pagure.lib.new_pull_request( @@ -2185,7 +2186,7 @@ class PagureLibtests(tests.Modeltests): self.test_new_pull_request() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(repo.open_requests, 1) request = pagure.lib.search_pull_requests(self.session, requestid=1) @@ -2197,7 +2198,7 @@ class PagureLibtests(tests.Modeltests): merged=True, ) self.session.commit() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') self.assertEqual(repo.open_requests, 0) prs = pagure.lib.search_pull_requests( @@ -2231,7 +2232,7 @@ class PagureLibtests(tests.Modeltests): p_ugt.return_value = True self.test_add_issue_dependency() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) issue_blocked = pagure.lib.search_issues( self.session, repo, issueid=2) @@ -2291,7 +2292,7 @@ class PagureLibtests(tests.Modeltests): self.test_add_issue_comment() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual( @@ -2311,7 +2312,7 @@ class PagureLibtests(tests.Modeltests): self.test_new_issue() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual( @@ -2330,7 +2331,7 @@ class PagureLibtests(tests.Modeltests): p_ugt.return_value = True self.test_new_issue() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) # before @@ -2378,7 +2379,7 @@ class PagureLibtests(tests.Modeltests): p_ugt.return_value = True self.test_new_issue() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) self.assertEqual(repo.open_tickets, 2) @@ -2434,7 +2435,7 @@ class PagureLibtests(tests.Modeltests): p_ugt.return_value = True self.test_new_issue() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) # Create issues to play with @@ -3052,7 +3053,7 @@ class PagureLibtests(tests.Modeltests): tests.create_projects(self.session) self.test_add_group() - project = pagure.lib.get_project(self.session, 'test2') + project = pagure.get_authorized_project(self.session, 'test2') # Group does not exist self.assertRaises( @@ -3135,7 +3136,7 @@ class PagureLibtests(tests.Modeltests): """ Test the update_watch_status method of pagure.lib. """ tests.create_projects(self.session) - project = pagure.lib.get_project(self.session, 'test') + project = pagure.get_authorized_project(self.session, 'test') # User does not exist self.assertRaises( @@ -3192,7 +3193,7 @@ class PagureLibtests(tests.Modeltests): tests.create_projects(self.session) self.test_add_group() - project = pagure.lib.get_project(self.session, 'test') + project = pagure.get_authorized_project(self.session, 'test') # If user not logged in watch = pagure.lib.is_watching( diff --git a/tests/test_pagure_lib_git.py b/tests/test_pagure_lib_git.py index ea521e7..0113ee2 100644 --- a/tests/test_pagure_lib_git.py +++ b/tests/test_pagure_lib_git.py @@ -26,6 +26,7 @@ from mock import patch sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) +import pagure import pagure.lib.git import tests @@ -54,7 +55,7 @@ class PagureLibGittests(tests.Modeltests): when the new uesr is an made an admin """ tests.create_projects(self.session) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') # Add an user to a project # The user will be an admin of the project msg = pagure.lib.add_user_to_project( @@ -484,7 +485,7 @@ repo requests/forks/pingou/test3 """ tests.create_projects(self.session) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') # Add a couple of groups # They would be admins @@ -1317,7 +1318,7 @@ index 9f44358..2a552bb 100644 os.makedirs(self.gitrepo) repo_obj = pygit2.init_repository(self.gitrepo, bare=True) - repo = pagure.lib.get_project(self.session, 'test_ticket_repo') + repo = pagure.get_authorized_project(self.session, 'test_ticket_repo') # Create an issue to play with msg = pagure.lib.new_issue( session=self.session, @@ -1538,7 +1539,7 @@ index 458821a..77674a8 files = [entry.name for entry in commit.tree] self.assertEqual(files, [hash_file]) - repo = pagure.lib.get_project(self.session, 'test_ticket_repo') + repo = pagure.get_authorized_project(self.session, 'test_ticket_repo') issue = pagure.lib.search_issues(self.session, repo, issueid=1) pagure.lib.git.clean_git(issue, repo, self.path) @@ -1567,8 +1568,9 @@ index 458821a..77674a8 os.makedirs(self.gitrepo) repo_obj = pygit2.init_repository(self.gitrepo, bare=True) - repo = pagure.lib.get_project(self.session, 'test_ticket_repo') # Create a PR to play with + repo = pagure.get_authorized_project(self.session, 'test_ticket_repo') + # Create an issue to play with req = pagure.lib.new_pull_request( session=self.session, repo_from=repo, @@ -1848,7 +1850,7 @@ index 0000000..60f7480 """ Test the update_ticket_from_git method from pagure.lib.git. """ tests.create_projects(self.session) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') # Set some priorities to the project repo.priorities = {'1': 'High', '2': 'Normal'} self.session.add(repo) diff --git a/tests/test_pagure_lib_git_get_tags_objects.py b/tests/test_pagure_lib_git_get_tags_objects.py index 0a964a2..3acf7a5 100644 --- a/tests/test_pagure_lib_git_get_tags_objects.py +++ b/tests/test_pagure_lib_git_get_tags_objects.py @@ -18,6 +18,7 @@ import pygit2 sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) +import pagure import pagure.lib.git import tests @@ -89,7 +90,7 @@ class PagureLibGitGetTagstests(tests.Modeltests): self.assertEqual(exp, get_tag_name(tags)) # Case 4 - Sorting with different splitting characters - project = pagure.lib.get_project(self.session, 'test2') + project = pagure.get_authorized_project(self.session, 'test2') tests.add_readme_git_repo(os.path.join(os.path.join( self.path, 'repos'), 'test2.git')) repo = pygit2.Repository(os.path.join(os.path.join( diff --git a/tests/test_pagure_lib_link.py b/tests/test_pagure_lib_link.py index bd8cb22..119775d 100644 --- a/tests/test_pagure_lib_link.py +++ b/tests/test_pagure_lib_link.py @@ -23,6 +23,7 @@ from mock import patch sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) +import pagure import pagure.lib.link import tests @@ -66,7 +67,7 @@ class PagureLibLinktests(tests.Modeltests): self.assertEqual(link, []) # Create the issue - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') pagure.lib.new_issue( self.session, repo, @@ -104,7 +105,7 @@ class PagureLibLinktests(tests.Modeltests): self.assertEqual(link, []) # Create the issue - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') pagure.lib.new_issue( self.session, repo, @@ -162,7 +163,7 @@ class PagureLibLinktests(tests.Modeltests): self.assertEqual(link, []) # Create the issue - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') pagure.lib.new_issue( self.session, repo, diff --git a/tests/test_pagure_lib_model.py b/tests/test_pagure_lib_model.py index 9099ead..f2c1b79 100644 --- a/tests/test_pagure_lib_model.py +++ b/tests/test_pagure_lib_model.py @@ -20,6 +20,7 @@ from mock import patch sys.path.insert(0, os.path.join(os.path.dirname( os.path.abspath(__file__)), '..')) +import pagure import pagure.lib import tests @@ -43,7 +44,7 @@ class PagureLibModeltests(tests.Modeltests): p_ugt.return_value = True tests.create_projects(self.session) - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') # Create an issue msg = pagure.lib.new_issue( @@ -82,8 +83,8 @@ class PagureLibModeltests(tests.Modeltests): self.session.commit() self.session.add(item) - repo = pagure.lib.get_project(self.session, 'test') - forked_repo = pagure.lib.get_project( + repo = pagure.get_authorized_project(self.session, 'test') + forked_repo = pagure.get_authorized_project( self.session, 'test', user='pingou') # Create an pull-request @@ -127,7 +128,7 @@ class PagureLibModeltests(tests.Modeltests): def test_tagissue__repr__(self): """ Test the TagIssue.__repr__ function of pagure.lib.model. """ self.test_issue__repr__() - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') issues = pagure.lib.search_issues(self.session, repo) self.assertEqual(len(issues), 1)