diff --git a/alembic/versions/4255158a6913_create_private_column_in_project_table.py b/alembic/versions/4255158a6913_create_private_column_in_project_table.py index dbeb1f3..289e6af 100644 --- a/alembic/versions/4255158a6913_create_private_column_in_project_table.py +++ b/alembic/versions/4255158a6913_create_private_column_in_project_table.py @@ -1,14 +1,14 @@ """Create private column in project table Revision ID: 4255158a6913 -Revises: 208b0cd232ab +Revises: 3ffec872dfdf Create Date: 2016-06-06 14:33:47.039207 """ # revision identifiers, used by Alembic. revision = '4255158a6913' -down_revision = '38581a8fbae2' +down_revision = '3ffec872dfdf' from alembic import op import sqlalchemy as sa diff --git a/tests/test_pagure_flask_api_issue.py b/tests/test_pagure_flask_api_issue.py index 46b1d16..df93ee3 100644 --- a/tests/test_pagure_flask_api_issue.py +++ b/tests/test_pagure_flask_api_issue.py @@ -2025,7 +2025,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): tests.create_tokens_acl(self.session) # Set some milestones to the project - repo = pagure.lib.get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') repo.milestones = {'v1.0': None, 'v2.0': 'Soon'} self.session.add(repo) self.session.commit() @@ -2065,7 +2065,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, @@ -2079,7 +2079,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): self.assertEqual(msg.title, 'Test issue #1') # Check milestone 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.milestone, None) @@ -2098,7 +2098,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.milestone, None) @@ -2162,7 +2162,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): ) # Change recorded - 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.milestone, None) @@ -2202,7 +2202,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): ) # Change recorded - 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.milestone, None) diff --git a/tests/test_pagure_flask_api_ui_private_repo.py b/tests/test_pagure_flask_api_ui_private_repo.py index 42754f9..af6def7 100644 --- a/tests/test_pagure_flask_api_ui_private_repo.py +++ b/tests/test_pagure_flask_api_ui_private_repo.py @@ -940,6 +940,7 @@ class PagurePrivateRepotest(tests.Modeltests): "id": 1, "milestones": {}, "name": "test4", + "fullname": "test4", "namespace": None, "parent": None, "priorities": {}, @@ -976,6 +977,7 @@ class PagurePrivateRepotest(tests.Modeltests): "id": 1, "milestones": {}, "name": "test4", + "fullname": "test4", "namespace": None, "parent": None, "priorities": {}, @@ -1079,6 +1081,7 @@ class PagurePrivateRepotest(tests.Modeltests): "id": 1, "milestones": {}, "name": "test4", + "fullname": "test4", "namespace": None, "parent": None, "priorities": {}, @@ -1096,6 +1099,7 @@ class PagurePrivateRepotest(tests.Modeltests): "description": "test project description", "id": 1, "milestones": {}, + "fullname": "test4", "name": "test4", "namespace": None, "parent": None, @@ -1167,6 +1171,7 @@ class PagurePrivateRepotest(tests.Modeltests): "id": 1, "milestones": {}, "name": "test4", + "fullname": "test4", "namespace": None, "parent": None, "priorities": {}, @@ -1185,6 +1190,7 @@ class PagurePrivateRepotest(tests.Modeltests): "id": 1, "milestones": {}, "name": "test4", + "fullname": "test4", "namespace": None, "parent": None, "priorities": {}, diff --git a/tests/test_pagure_flask_docs.py b/tests/test_pagure_flask_docs.py index bae1c3d..8930885 100644 --- a/tests/test_pagure_flask_docs.py +++ b/tests/test_pagure_flask_docs.py @@ -141,7 +141,7 @@ class PagureFlaskDocstests(tests.Modeltests): docs. """ tests.create_projects(self.session) - repo = pagure.lib._get_project(self.session, 'test') + repo = pagure.get_authorized_project(self.session, 'test') tests.create_projects_git(os.path.join(self.path, 'docs')) output = self.app.get('/test/docs') @@ -164,51 +164,6 @@ 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_lib.py b/tests/test_pagure_lib.py index 9f6ff82..f537206 100644 --- a/tests/test_pagure_lib.py +++ b/tests/test_pagure_lib.py @@ -336,11 +336,11 @@ 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) # Set some priorities to the repo - 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() diff --git a/tests/test_pagure_lib_git.py b/tests/test_pagure_lib_git.py index 3b25d5e..8ce5000 100644 --- a/tests/test_pagure_lib_git.py +++ b/tests/test_pagure_lib_git.py @@ -1776,7 +1776,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') # Before self.assertEqual(len(repo.issues), 0)