Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit c8fed5a

Browse filesBrowse files
committed
chore(api): make class names consistent in MR resources
1 parent dba828b commit c8fed5a
Copy full SHA for c8fed5a

File tree

Expand file treeCollapse file tree

3 files changed

+11
-11
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

3 files changed

+11
-11
lines changed
Open diff view settings
Collapse file

‎gitlab/tests/objects/test_merge_request_pipelines.py‎

Copy file name to clipboardExpand all lines: gitlab/tests/objects/test_merge_request_pipelines.py
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import pytest
77
import responses
88

9-
from gitlab.v4.objects import MergeRequestPipeline
9+
from gitlab.v4.objects import ProjectMergeRequestPipeline
1010

1111
pipeline_content = {
1212
"id": 1,
@@ -49,18 +49,18 @@ def test_merge_requests_pipelines_deprecated_raises_warning(
4949
pipelines = project.mergerequests.get(1, lazy=True).pipelines()
5050

5151
assert len(pipelines) == 1
52-
assert isinstance(pipelines[0], MergeRequestPipeline)
52+
assert isinstance(pipelines[0], ProjectMergeRequestPipeline)
5353
assert pipelines[0].sha == pipeline_content["sha"]
5454

5555

5656
def test_list_merge_requests_pipelines(project, resp_list_merge_request_pipelines):
5757
pipelines = project.mergerequests.get(1, lazy=True).pipelines.list()
5858
assert len(pipelines) == 1
59-
assert isinstance(pipelines[0], MergeRequestPipeline)
59+
assert isinstance(pipelines[0], ProjectMergeRequestPipeline)
6060
assert pipelines[0].sha == pipeline_content["sha"]
6161

6262

6363
def test_create_merge_requests_pipelines(project, resp_create_merge_request_pipeline):
6464
pipeline = project.mergerequests.get(1, lazy=True).pipelines.create()
65-
assert isinstance(pipeline, MergeRequestPipeline)
65+
assert isinstance(pipeline, ProjectMergeRequestPipeline)
6666
assert pipeline.sha == pipeline_content["sha"]
Collapse file

‎gitlab/v4/objects/merge_requests.py‎

Copy file name to clipboardExpand all lines: gitlab/v4/objects/merge_requests.py
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
ProjectMergeRequestResourceLabelEventManager,
2626
ProjectMergeRequestResourceMilestoneEventManager,
2727
)
28-
from .pipelines import MergeRequestPipelineManager
28+
from .pipelines import ProjectMergeRequestPipelineManager
2929

3030

3131
__all__ = [
@@ -120,7 +120,7 @@ class ProjectMergeRequest(
120120
("diffs", "ProjectMergeRequestDiffManager"),
121121
("discussions", "ProjectMergeRequestDiscussionManager"),
122122
("notes", "ProjectMergeRequestNoteManager"),
123-
("pipelines", "MergeRequestPipelineManager"),
123+
("pipelines", "ProjectMergeRequestPipelineManager"),
124124
("resourcelabelevents", "ProjectMergeRequestResourceLabelEventManager"),
125125
("resourcemilestoneevents", "ProjectMergeRequestResourceMilestoneEventManager"),
126126
)
Collapse file

‎gitlab/v4/objects/pipelines.py‎

Copy file name to clipboardExpand all lines: gitlab/v4/objects/pipelines.py
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818

1919
__all__ = [
20-
"MergeRequestPipeline",
21-
"MergeRequestPipelineManager",
20+
"ProjectMergeRequestPipeline",
21+
"ProjectMergeRequestPipelineManager",
2222
"ProjectPipeline",
2323
"ProjectPipelineManager",
2424
"ProjectPipelineJob",
@@ -34,13 +34,13 @@
3434
]
3535

3636

37-
class MergeRequestPipeline(RESTObject):
37+
class ProjectMergeRequestPipeline(RESTObject):
3838
pass
3939

4040

41-
class MergeRequestPipelineManager(CreateMixin, ListMixin, RESTManager):
41+
class ProjectMergeRequestPipelineManager(CreateMixin, ListMixin, RESTManager):
4242
_path = "/projects/%(project_id)s/merge_requests/%(mr_iid)s/pipelines"
43-
_obj_cls = MergeRequestPipeline
43+
_obj_cls = ProjectMergeRequestPipeline
4444
_from_parent_attrs = {"project_id": "project_id", "mr_iid": "iid"}
4545
_create_attrs = (tuple(), tuple())
4646

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.