Fix gitlab merge request by supporting the edit option. Fixes #131

Author: Michael Russell

git_repo/services/ext/gitlab.py

@@ -257,19 +257,19 @@ def gist_delete(self, snippet):
 
         return snippet.delete()
 
-    def request_create(self, user, repo, local_branch, remote_branch, title, description=None, auto_slug=False):
+    def request_create(self, user, repo, local_branch, remote_branch, title, description=None, auto_slug=False, edit=None):
         try:
             repository = self.gl.projects.get('/'.join([user, repo]))
             if not repository:
                 raise ResourceNotFoundError('Could not find repository `{}/{}`!'.format(user, repo))
             if not title and not description and edit:
-                title, description = edit(repository, from_branch)
+                title, description = edit(repository, local_branch)
                 if not title and not description:
                     raise ArgumentError('Missing message for request creation')
             if not local_branch:
-                remote_branch = self.repository.active_branch.name or self.repository.active_branch.name
+                local_branch = self.repository.active_branch.name
             if not remote_branch:
-                local_branch = repository.master_branch or 'master'
+                remote_branch = repository.default_branch or 'master'
             request = self.gl.project_mergerequests.create(
                     project_id=repository.id,
                     data= {

tests/helpers.py

@@ -750,6 +750,10 @@ def prepare_project_for_test():
                 self.service.delete(create_repository)
 
         #self.service.repository = self.repository
+
+        def edit_stub(repository, branch):
+            return 'title', 'description'
+
         with prepare_project_for_test():
             with self.recorder.use_cassette(cassette_name):
                 self.service.connect()
@@ -759,7 +763,8 @@ def prepare_project_for_test():
                         source_branch,
                         target_branch,
                         title,
-                        description
+                        description,
+                        edit=edit_stub
                 )
                 return request
 

tests/integration/cassettes/test_gitlab_test_20_request_create_with_edit_and_no_title.json

@@ -0,0 +1,127 @@
+{
+  "http_interactions": [
+    {
+      "recorded_at": "2017-03-04T23:36:28",
+      "request": {
+        "body": {
+          "encoding": "utf-8",
+          "string": ""
+        },
+        "headers": {
+          "Accept": "*/*",
+          "Accept-Encoding": "identity",
+          "Connection": "keep-alive",
+          "PRIVATE-TOKEN": "<PRIVATE_KEY_GITLAB>",
+          "User-Agent": "python-requests/2.13.0"
+        },
+        "method": "GET",
+        "uri": "https://gitlab.com/api/v3/user"
+      },
+      "response": {
+        "body": {
+          "encoding": null,
+          "string": "{\"name\":\"Michael Russell\",\"username\":\"<BITBUCKET_NAMESPACE>\",\"id\":922189,\"state\":\"active\",\"avatar_url\":\"https://secure.gravatar.com/avatar/fbff0e16b2d2c737d36575686375c203?s=80&d=identicon\",\"web_url\":\"https://gitlab.com/<BITBUCKET_NAMESPACE>\",\"created_at\":\"2017-01-02T21:31:34.426Z\",\"is_admin\":false,\"bio\":null,\"location\":null,\"skype\":\"\",\"linkedin\":\"\",\"twitter\":\"\",\"website_url\":\"\",\"organization\":null,\"last_sign_in_at\":\"2017-02-28T18:43:00.076Z\",\"confirmed_at\":\"2017-01-02T21:31:34.289Z\",\"email\":\"<BITBUCKET_NAMESPACE>[email protected]\",\"theme_id\":2,\"color_scheme_id\":4,\"projects_limit\":100000,\"current_sign_in_at\":\"2017-03-04T16:30:18.407Z\",\"identities\":[{\"provider\":\"google_oauth2\",\"extern_uid\":\"118342393548148958779\"}],\"can_create_group\":true,\"can_create_project\":true,\"two_factor_enabled\":true,\"external\":false}"
+        },
+        "headers": {
+          "Cache-Control": "max-age=0, private, must-revalidate",
+          "Content-Length": "773",
+          "Content-Type": "application/json",
+          "Date": "Sat, 04 Mar 2017 23:36:28 GMT",
+          "Etag": "W/\"8e35e69f3641436a588171181b0de9c3\"",
+          "Server": "nginx",
+          "Vary": "Origin",
+          "X-Request-Id": "2c8f4f01-777d-48d9-b3da-a00c5e0a9e26",
+          "X-Runtime": "0.067689"
+        },
+        "status": {
+          "code": 200,
+          "message": "OK"
+        },
+        "url": "https://gitlab.com/api/v3/user"
+      }
+    },
+    {
+      "recorded_at": "2017-03-04T23:36:29",
+      "request": {
+        "body": {
+          "encoding": "utf-8",
+          "string": ""
+        },
+        "headers": {
+          "Accept": "*/*",
+          "Accept-Encoding": "identity",
+          "Connection": "keep-alive",
+          "PRIVATE-TOKEN": "<PRIVATE_KEY_GITLAB>",
+          "User-Agent": "python-requests/2.13.0"
+        },
+        "method": "GET",
+        "uri": "https://gitlab.com/api/v3/projects/<BITBUCKET_NAMESPACE>%2Ftest_create_requests"
+      },
+      "response": {
+        "body": {
+          "encoding": null,
+          "string": "{\"id\":2830817,\"description\":null,\"default_branch\":\"master\",\"tag_list\":[],\"public\":false,\"archived\":false,\"visibility_level\":0,\"ssh_url_to_repo\":\"[email protected]:<BITBUCKET_NAMESPACE>/test_create_requests.git\",\"http_url_to_repo\":\"https://gitlab.com/<BITBUCKET_NAMESPACE>/test_create_requests.git\",\"web_url\":\"https://gitlab.com/<BITBUCKET_NAMESPACE>/test_create_requests\",\"owner\":{\"name\":\"Michael Russell\",\"username\":\"<BITBUCKET_NAMESPACE>\",\"id\":922189,\"state\":\"active\",\"avatar_url\":\"https://secure.gravatar.com/avatar/fbff0e16b2d2c737d36575686375c203?s=80&d=identicon\",\"web_url\":\"https://gitlab.com/<BITBUCKET_NAMESPACE>\"},\"name\":\"test_create_requests\",\"name_with_namespace\":\"Michael Russell / test_create_requests\",\"path\":\"test_create_requests\",\"path_with_namespace\":\"<BITBUCKET_NAMESPACE>/test_create_requests\",\"container_registry_enabled\":true,\"issues_enabled\":true,\"merge_requests_enabled\":true,\"wiki_enabled\":true,\"builds_enabled\":true,\"snippets_enabled\":false,\"created_at\":\"2017-03-04T23:36:16.987Z\",\"last_activity_at\":\"2017-03-04T23:36:16.987Z\",\"shared_runners_enabled\":true,\"lfs_enabled\":true,\"creator_id\":922189,\"namespace\":{\"id\":1107131,\"name\":\"<BITBUCKET_NAMESPACE>\",\"path\":\"<BITBUCKET_NAMESPACE>\",\"kind\":\"user\"},\"avatar_url\":null,\"star_count\":0,\"forks_count\":0,\"open_issues_count\":0,\"runners_token\":\"mRkZBd-_9Pohkns84y_K\",\"public_builds\":true,\"shared_with_groups\":[],\"only_allow_merge_if_build_succeeds\":false,\"request_access_enabled\":false,\"only_allow_merge_if_all_discussions_are_resolved\":false,\"approvals_before_merge\":0,\"permissions\":{\"project_access\":{\"access_level\":40,\"notification_level\":3},\"group_access\":null}}"
+        },
+        "headers": {
+          "Cache-Control": "max-age=0, private, must-revalidate",
+          "Content-Length": "1527",
+          "Content-Type": "application/json",
+          "Date": "Sat, 04 Mar 2017 23:36:28 GMT",
+          "Etag": "W/\"e03c6b6653e6a6a4c1f252f937f8592b\"",
+          "Server": "nginx",
+          "Vary": "Origin",
+          "X-Request-Id": "9a1c6b67-6ac8-42c2-afa5-fdbbaa66636a",
+          "X-Runtime": "0.249491"
+        },
+        "status": {
+          "code": 200,
+          "message": "OK"
+        },
+        "url": "https://gitlab.com/api/v3/projects/<BITBUCKET_NAMESPACE>%2Ftest_create_requests"
+      }
+    },
+    {
+      "recorded_at": "2017-03-04T23:36:31",
+      "request": {
+        "body": {
+          "encoding": "utf-8",
+          "string": "{\"source_branch\": \"pr-test\", \"target_branch\": \"master\", \"title\": \"title\", \"description\": \"description\"}"
+        },
+        "headers": {
+          "Accept": "*/*",
+          "Accept-Encoding": "identity",
+          "Connection": "keep-alive",
+          "Content-Length": "103",
+          "Content-type": "application/json",
+          "PRIVATE-TOKEN": "<PRIVATE_KEY_GITLAB>",
+          "User-Agent": "python-requests/2.13.0"
+        },
+        "method": "POST",
+        "uri": "https://gitlab.com/api/v3/projects/2830817/merge_requests"
+      },
+      "response": {
+        "body": {
+          "encoding": null,
+          "string": "{\"id\":2605518,\"iid\":1,\"project_id\":2830817,\"title\":\"title\",\"description\":\"description\",\"state\":\"opened\",\"created_at\":\"2017-03-04T23:36:28.616Z\",\"updated_at\":\"2017-03-04T23:36:28.616Z\",\"target_branch\":\"master\",\"source_branch\":\"pr-test\",\"upvotes\":0,\"downvotes\":0,\"author\":{\"name\":\"Michael Russell\",\"username\":\"<BITBUCKET_NAMESPACE>\",\"id\":922189,\"state\":\"active\",\"avatar_url\":\"https://secure.gravatar.com/avatar/fbff0e16b2d2c737d36575686375c203?s=80&d=identicon\",\"web_url\":\"https://gitlab.com/<BITBUCKET_NAMESPACE>\"},\"assignee\":null,\"source_project_id\":2830817,\"target_project_id\":2830817,\"labels\":[],\"work_in_progress\":false,\"milestone\":null,\"merge_when_build_succeeds\":false,\"merge_status\":\"unchecked\",\"sha\":\"f16c0d4a371caa606e951b157dc5709a87996cb4\",\"merge_commit_sha\":null,\"subscribed\":true,\"user_notes_count\":0,\"approvals_before_merge\":null,\"should_remove_source_branch\":null,\"force_remove_source_branch\":null,\"squash\":false,\"web_url\":\"https://gitlab.com/<BITBUCKET_NAMESPACE>/test_create_requests/merge_requests/1\"}"
+        },
+        "headers": {
+          "Cache-Control": "max-age=0, private, must-revalidate",
+          "Content-Length": "979",
+          "Content-Type": "application/json",
+          "Date": "Sat, 04 Mar 2017 23:36:30 GMT",
+          "Etag": "W/\"da575f32647af69c59092ddc47bd44cf\"",
+          "Server": "nginx",
+          "Vary": "Origin",
+          "X-Request-Id": "ddd03590-53f9-458f-9bc7-23b301cc9be3",
+          "X-Runtime": "1.789859"
+        },
+        "status": {
+          "code": 201,
+          "message": "Created"
+        },
+        "url": "https://gitlab.com/api/v3/projects/2830817/merge_requests"
+      }
+    }
+  ],
+  "recorded_with": "betamax/0.5.1"
+}

tests/integration/test_gitlab.py

@@ -262,6 +262,15 @@ def test_20_request_create(self):
                 description='PR description')
         assert r == {'local': 'pr-test', 'ref': 1, 'remote': 'master'}
 
+    def test_20_request_create_with_edit_and_no_title(self):
+        r = self.action_request_create(namespace='crazybus',
+                repository='test_create_requests',
+                branch='pr-test',
+                service='gitlab',
+                title=None,
+                description=None)
+        assert r == {'local': 'pr-test', 'ref': 1, 'remote': 'master'}
+
     # TODO lookup why this is not raising the expected error !
     # def test_20_request_create__bad_branch(self):
     #     with pytest.raises(ResourceError):