diff options
| author | Nejc Habjan <hab.nejc@gmail.com> | 2021-10-09 15:35:32 +0200 |
|---|---|---|
| committer | Nejc Habjan <hab.nejc@gmail.com> | 2021-10-11 22:49:46 +0200 |
| commit | 545f8ed24124837bf4e55aa34e185270a4b7aeff (patch) | |
| tree | adad76b598b917d9ca77ed600dcd62c63af67950 /tests/functional/cli | |
| parent | 5a1678f43184bd459132102cc13cf8426fe0449d (diff) | |
| download | gitlab-545f8ed24124837bf4e55aa34e185270a4b7aeff.tar.gz | |
chore: rename `master` branch to `main`chore/master-to-main
BREAKING CHANGE: As of python-gitlab 3.0.0, the default branch for development
has changed from `master` to `main`.
Diffstat (limited to 'tests/functional/cli')
| -rw-r--r-- | tests/functional/cli/test_cli_artifacts.py | 2 | ||||
| -rw-r--r-- | tests/functional/cli/test_cli_v4.py | 8 |
2 files changed, 5 insertions, 5 deletions
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) |