gitlabUserUsername variable is not set for MR trigger

Author: ljackiewicz

src/main/java/com/dabsquared/gitlabjenkins/trigger/handler/merge/MergeRequestHookTriggerHandlerImpl.java

@@ -196,10 +196,9 @@ protected CauseData retrieveCauseData(MergeRequestHook hook) {
                 .withTargetProjectId(hook.getObjectAttributes().getTargetProjectId())
                 .withBranch(hook.getObjectAttributes().getSourceBranch())
                 .withSourceBranch(hook.getObjectAttributes().getSourceBranch())
-                .withUserName(
-                        hook.getObjectAttributes().getLastCommit().getAuthor().getName())
-                .withUserEmail(
-                        hook.getObjectAttributes().getLastCommit().getAuthor().getEmail())
+                .withUserName(hook.getUser().getName())
+                .withUserUsername(hook.getUser().getUsername())
+                .withUserEmail(hook.getUser().getEmail())
                 .withSourceRepoHomepage(hook.getObjectAttributes().getSource().getHomepage())
                 .withSourceRepoName(hook.getObjectAttributes().getSource().getName())
                 .withSourceNamespace(hook.getObjectAttributes().getSource().getNamespace())

src/test/java/com/dabsquared/gitlabjenkins/trigger/handler/PendingBuildsHandlerTest.java

@@ -212,6 +212,13 @@ private MergeRequestHook mergeRequestHook(int projectId, String branch, String c
                 .withProject(ProjectBuilder.project()
                         .withWebUrl("https://gitlab.org/test.git")
                         .build())
+                .withUser(user().withId(1)
+                        .withName("User")
+                        .withUsername("user")
+                        .withEmail("[email protected]")
+                        .withAvatarUrl(
+                                "https://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon")
+                        .build())
                 .build();
     }
 

src/test/java/com/dabsquared/gitlabjenkins/trigger/handler/merge/MergeRequestHookTriggerHandlerImplTest.java

@@ -429,6 +429,13 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
                         .withProject(project()
                                 .withWebUrl("https://gitlab.org/test.git")
                                 .build())
+                        .withUser(user().withId(1)
+                                .withName("User")
+                                .withUsername("user")
+                                .withEmail("[email protected]")
+                                .withAvatarUrl(
+                                        "https://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon")
+                                .build())
                         .build(),
                 true,
                 BranchFilterFactory.newBranchFilter(branchFilterConfig().build(BranchFilterType.All)),
@@ -452,6 +459,13 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
                         .withProject(project()
                                 .withWebUrl("https://gitlab.org/test.git")
                                 .build())
+                        .withUser(user().withId(1)
+                                .withName("User")
+                                .withUsername("user")
+                                .withEmail("[email protected]")
+                                .withAvatarUrl(
+                                        "https://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon")
+                                .build())
                         .build(),
                 true,
                 BranchFilterFactory.newBranchFilter(branchFilterConfig().build(BranchFilterType.All)),
@@ -541,6 +555,13 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
                         .withProject(project()
                                 .withWebUrl("https://gitlab.org/test.git")
                                 .build())
+                        .withUser(user().withId(1)
+                                .withName("User")
+                                .withUsername("user")
+                                .withEmail("[email protected]")
+                                .withAvatarUrl(
+                                        "https://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon")
+                                .build())
                         .build(),
                 true,
                 BranchFilterFactory.newBranchFilter(branchFilterConfig().build(BranchFilterType.All)),
@@ -575,6 +596,13 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
                                         .withId("testid")
                                         .build())
                                 .build())
+                        .withUser(user().withId(1)
+                                .withName("User")
+                                .withUsername("user")
+                                .withEmail("[email protected]")
+                                .withAvatarUrl(
+                                        "https://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon")
+                                .build())
                         .build(),
                 true,
                 BranchFilterFactory.newBranchFilter(branchFilterConfig().build(BranchFilterType.All)),

src/test/java/com/dabsquared/gitlabjenkins/webhook/build/MergeRequestBuildActionTest.java

@@ -1,6 +1,7 @@
 package com.dabsquared.gitlabjenkins.webhook.build;
 
 import static com.dabsquared.gitlabjenkins.cause.CauseDataBuilder.causeData;
+import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
@@ -107,6 +108,9 @@ public void build() throws IOException {
             verify(mockTrigger).onPost(pushHookArgumentCaptor.capture());
             assertThat(pushHookArgumentCaptor.getValue().getProject(), is(notNullValue()));
             assertThat(pushHookArgumentCaptor.getValue().getProject().getWebUrl(), is(notNullValue()));
+            assertThat(pushHookArgumentCaptor.getValue().getUser(), is(notNullValue()));
+            assertThat(pushHookArgumentCaptor.getValue().getUser().getName(), containsString("Administrator"));
+            assertThat(pushHookArgumentCaptor.getValue().getUser().getUsername(), containsString("root"));
         }
     }