From 545f8ed24124837bf4e55aa34e185270a4b7aeff Mon Sep 17 00:00:00 2001 From: Nejc Habjan Date: Sat, 9 Oct 2021 15:35:32 +0200 Subject: chore: rename `master` branch to `main` BREAKING CHANGE: As of python-gitlab 3.0.0, the default branch for development has changed from `master` to `main`. --- tests/functional/cli/test_cli_artifacts.py | 2 +- tests/functional/cli/test_cli_v4.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/functional/cli') diff --git a/tests/functional/cli/test_cli_artifacts.py b/tests/functional/cli/test_cli_artifacts.py index aab0546..76eb9f2 100644 --- a/tests/functional/cli/test_cli_artifacts.py +++ b/tests/functional/cli/test_cli_artifacts.py @@ -14,7 +14,7 @@ content = textwrap.dedent( ) data = { "file_path": ".gitlab-ci.yml", - "branch": "master", + "branch": "main", "content": content, "commit_message": "Initial commit", } diff --git a/tests/functional/cli/test_cli_v4.py b/tests/functional/cli/test_cli_v4.py index a63c1b1..91c0afa 100644 --- a/tests/functional/cli/test_cli_v4.py +++ b/tests/functional/cli/test_cli_v4.py @@ -125,7 +125,7 @@ def test_list_user_memberships(gitlab_cli, user): def test_project_create_file(gitlab_cli, project): file_path = "README" - branch = "master" + branch = "main" content = "CONTENT" commit_message = "Initial commit" @@ -197,7 +197,7 @@ def test_create_branch(gitlab_cli, project): "--branch", branch, "--ref", - "master", + "main", ] ret = gitlab_cli(cmd) @@ -215,7 +215,7 @@ def test_create_merge_request(gitlab_cli, project): "--source-branch", branch, "--target-branch", - "master", + "main", "--title", "Update README", ] @@ -260,7 +260,7 @@ def test_revert_commit(gitlab_cli, project): "--id", commit.id, "--branch", - "master", + "main", ] ret = gitlab_cli(cmd) -- cgit v1.2.1