Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix accessing projects in GitLab subgroups #884

Merged
merged 2 commits into from
Jan 13, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions anitya/lib/backends/gitlab.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ def get_version_url(cls, project):
elif project.homepage:
tokens = project.homepage.split("/")

if len(tokens) == 5:
if len(tokens) >= 5:
url = url_template % {
"hostname": tokens[0] + "//" + tokens[2],
"owner": tokens[3],
"repo": tokens[4],
"repo": "%2F".join(tokens[4:]), # any subgroups & repo
}

return url
Expand Down
39 changes: 39 additions & 0 deletions anitya/tests/lib/backends/test_gitlab.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,45 @@ def test_get_version_url_project_homepage_only(self):

self.assertEqual(obs, exp)

def test_get_version_url_project_version_url_subgroup(self):
"""
Assert that the correct URL is returned when
a project version url is specified for a
subgrouped project.
"""
project = models.Project(
name="test",
homepage="http://example.org",
version_url="https://gitlab.com/group/subgroup/test",
backend=BACKEND,
)
exp = (
"https://gitlab.com/api/v4/projects/group%2Fsubgroup%2Ftest/repository/tags"
)

obs = backend.GitlabBackend.get_version_url(project)

self.assertEqual(obs, exp)

def test_get_version_url_project_homepage_only_subgroup(self):
"""
Assert that the correct url is returned when
only a project homepage is specified for a
subgrouped project.
"""
project = models.Project(
name="test",
homepage="https://gitlab.com/group/subgroup/test",
backend=BACKEND,
)
exp = (
"https://gitlab.com/api/v4/projects/group%2Fsubgroup%2Ftest/repository/tags"
)

obs = backend.GitlabBackend.get_version_url(project)

self.assertEqual(obs, exp)

def test_get_version_url_project_wrong_homepage(self):
"""
Assert that empty url is returned when
Expand Down
1 change: 1 addition & 0 deletions news/PR884.bug
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix accessing projects in GitLab subgroups