Repository navigation
Commit 57bb67a
test(groups): enable group transfer tests
1 parent 868f243 commit 57bb67a
3 files changed
Lines changed: 11 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -233,17 +233,19 @@ def test_group_hooks(group): | |||
| 233 | 233 | hook.delete() | |
| 234 | 234 | ||
| 235 | 235 | ||
| 236 | - @pytest.mark.skip(reason="Pending #1807") | ||
| 237 | 236 | def test_group_transfer(gl, group): | |
| 238 | - transfer_group = gl.groups.create({"name": "transfer-test-group"}) | ||
| 239 | - assert group.namespace["path"] != group.full_path | ||
| 237 | + transfer_group = gl.groups.create( | ||
| 238 | + {"name": "transfer-test-group", "path": "transfer-test-group"} | ||
| 239 | + ) | ||
| 240 | + transfer_group = gl.groups.get(transfer_group.id) | ||
| 241 | + assert transfer_group.parent_id != group.id | ||
| 240 | 242 | ||
| 241 | 243 | transfer_group.transfer(group.id) | |
| 242 | 244 | ||
| 243 | - transferred_group = gl.projects.get(transfer_group.id) | ||
| 244 | - assert transferred_group.namespace["path"] == group.full_path | ||
| 245 | + transferred_group = gl.groups.get(transfer_group.id) | ||
| 246 | + assert transferred_group.parent_id == group.id | ||
| 245 | 247 | ||
| 246 | 248 | transfer_group.transfer() | |
| 247 | 249 | ||
| 248 | - transferred_group = gl.projects.get(transfer_group.id) | ||
| 250 | + transferred_group = gl.groups.get(transfer_group.id) | ||
| 249 | 251 | assert transferred_group.path == transferred_group.full_path | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,2 +1,2 @@ | |||
| 1 | 1 | GITLAB_IMAGE=gitlab/gitlab-ce | |
| 2 | - GITLAB_TAG=14.5.2-ce.0 | ||
| 2 | + GITLAB_TAG=14.6.2-ce.0 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -99,13 +99,13 @@ def resp_create_import(accepted_content): | |||
| 99 | 99 | def resp_transfer_group(): | |
| 100 | 100 | with responses.RequestsMock() as rsps: | |
| 101 | 101 | rsps.add( | |
| 102 | - method=responses.PUT, | ||
| 102 | + method=responses.POST, | ||
| 103 | 103 | url="http://localhost/api/v4/groups/1/transfer", | |
| 104 | 104 | json=content, | |
| 105 | 105 | content_type="application/json", | |
| 106 | 106 | status=200, | |
| 107 | 107 | match=[ | |
| 108 | - responses.matchers.json_params_matcher({"namespace": "test-namespace"}) | ||
| 108 | + responses.matchers.json_params_matcher({"group_id": "test-namespace"}) | ||
| 109 | 109 | ], | |
| 110 | 110 | ) | |
| 111 | 111 | yield rsps | |
@@ -170,7 +170,6 @@ def test_refresh_group_import_status(group, resp_groups): | |||
| 170 | 170 | assert group_import.import_status == "finished" | |
| 171 | 171 | ||
| 172 | 172 | ||
| 173 | - @pytest.mark.skip("Pending #1807") | ||
| 174 | 173 | def test_transfer_group(gl, resp_transfer_group): | |
| 175 | 174 | group = gl.groups.get(1, lazy=True) | |
| 176 | 175 | group.transfer("test-namespace") | |
0 commit comments