chore(api): make class names consistent in MR resources

nejch · nejch · commit f12841fd5bd8 · 2021-02-26T20:34:59.000+01:00
diff --git a/docs/gl_objects/mrs.rst b/docs/gl_objects/mrs.rst
@@ -190,8 +190,8 @@ Reference
 
 * v4 API:
 
-  + :class:`gitlab.v4.objects.MergeRequestPipeline`
-  + :class:`gitlab.v4.objects.MergeRequestPipelineManager`
+  + :class:`gitlab.v4.objects.ProjectMergeRequestPipeline`
+  + :class:`gitlab.v4.objects.ProjectMergeRequestPipelineManager`
   + :attr:`gitlab.v4.objects.ProjectMergeRequest.pipelines`
 
 * GitLab API: https://docs.gitlab.com/ee/api/merge_requests.html#list-mr-pipelines
diff --git a/gitlab/tests/objects/test_merge_request_pipelines.py b/gitlab/tests/objects/test_merge_request_pipelines.py
@@ -6,7 +6,7 @@
 import pytest
 import responses
 
-from gitlab.v4.objects import MergeRequestPipeline
+from gitlab.v4.objects import ProjectMergeRequestPipeline
 
 pipeline_content = {
     "id": 1,
@@ -49,18 +49,18 @@ def test_merge_requests_pipelines_deprecated_raises_warning(
         pipelines = project.mergerequests.get(1, lazy=True).pipelines()
 
     assert len(pipelines) == 1
-    assert isinstance(pipelines[0], MergeRequestPipeline)
+    assert isinstance(pipelines[0], ProjectMergeRequestPipeline)
     assert pipelines[0].sha == pipeline_content["sha"]
 
 
 def test_list_merge_requests_pipelines(project, resp_list_merge_request_pipelines):
     pipelines = project.mergerequests.get(1, lazy=True).pipelines.list()
     assert len(pipelines) == 1
-    assert isinstance(pipelines[0], MergeRequestPipeline)
+    assert isinstance(pipelines[0], ProjectMergeRequestPipeline)
     assert pipelines[0].sha == pipeline_content["sha"]
 
 
 def test_create_merge_requests_pipelines(project, resp_create_merge_request_pipeline):
     pipeline = project.mergerequests.get(1, lazy=True).pipelines.create()
-    assert isinstance(pipeline, MergeRequestPipeline)
+    assert isinstance(pipeline, ProjectMergeRequestPipeline)
     assert pipeline.sha == pipeline_content["sha"]
diff --git a/gitlab/v4/objects/merge_requests.py b/gitlab/v4/objects/merge_requests.py
@@ -25,7 +25,7 @@
     ProjectMergeRequestResourceLabelEventManager,
     ProjectMergeRequestResourceMilestoneEventManager,
 )
-from .pipelines import MergeRequestPipelineManager
+from .pipelines import ProjectMergeRequestPipelineManager
 
 
 __all__ = [
@@ -120,7 +120,7 @@ class ProjectMergeRequest(
         ("diffs", "ProjectMergeRequestDiffManager"),
         ("discussions", "ProjectMergeRequestDiscussionManager"),
         ("notes", "ProjectMergeRequestNoteManager"),
-        ("pipelines", "MergeRequestPipelineManager"),
+        ("pipelines", "ProjectMergeRequestPipelineManager"),
         ("resourcelabelevents", "ProjectMergeRequestResourceLabelEventManager"),
         ("resourcemilestoneevents", "ProjectMergeRequestResourceMilestoneEventManager"),
     )
diff --git a/gitlab/v4/objects/pipelines.py b/gitlab/v4/objects/pipelines.py
@@ -17,8 +17,8 @@
 
 
 __all__ = [
-    "MergeRequestPipeline",
-    "MergeRequestPipelineManager",
+    "ProjectMergeRequestPipeline",
+    "ProjectMergeRequestPipelineManager",
     "ProjectPipeline",
     "ProjectPipelineManager",
     "ProjectPipelineJob",
@@ -34,13 +34,13 @@
 ]
 
 
-class MergeRequestPipeline(RESTObject):
+class ProjectMergeRequestPipeline(RESTObject):
     pass
 
 
-class MergeRequestPipelineManager(CreateMixin, ListMixin, RESTManager):
+class ProjectMergeRequestPipelineManager(CreateMixin, ListMixin, RESTManager):
     _path = "/projects/%(project_id)s/merge_requests/%(mr_iid)s/pipelines"
-    _obj_cls = MergeRequestPipeline
+    _obj_cls = ProjectMergeRequestPipeline
     _from_parent_attrs = {"project_id": "project_id", "mr_iid": "iid"}
     _create_attrs = (tuple(), tuple())
 
