Skip to content

test(functional): fix GitLab configuration to support pagination #1881

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Feb 5, 2022
Merged

test(functional): fix GitLab configuration to support pagination #1881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 tests/functional/api/test_gitlab.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@ def test_template_dockerfile(gl):


def test_template_gitignore(gl):
assert gl.gitignores.list()
assert gl.gitignores.list(all=True)
gitignore = gl.gitignores.get("Node")
assert gitignore.content is not None


def test_template_gitlabciyml(gl):
assert gl.gitlabciymls.list()
assert gl.gitlabciymls.list(all=True)
gitlabciyml = gl.gitlabciymls.get("Nodejs")
assert gitlabciyml.content is not None

Expand Down
2 changes: 1 addition & 1 deletion tests/functional/api/test_projects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ def test_project_protected_branches(project):


def test_project_remote_mirrors(project):
mirror_url = "http://gitlab.test/root/mirror.git"
mirror_url = "https://gitlab.example.com/root/mirror.git"

mirror = project.remote_mirrors.create({"url": mirror_url})
assert mirror.url == mirror_url
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/fixtures/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
GITLAB_ROOT_PASSWORD: 5iveL!fe
GITLAB_SHARED_RUNNERS_REGISTRATION_TOKEN: registration-token
GITLAB_OMNIBUS_CONFIG: |
external_url 'http://gitlab.test'
external_url 'http://127.0.0.1:8080'
registry['enable'] = false
nginx['redirect_http_to_https'] = false
nginx['listen_port'] = 80
Expand Down