gitlabUserUsername variable is not set for Note (comments) trigger

jenkinsci · May 9, 2023 · 8c8d0da · 8c8d0da
1 parent 17ccfee
commit 8c8d0da
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 10 deletions.
diff --git a/...in/java/com/dabsquared/gitlabjenkins/trigger/handler/note/NoteHookTriggerHandlerImpl.java b/...in/java/com/dabsquared/gitlabjenkins/trigger/handler/note/NoteHookTriggerHandlerImpl.java
@@ -71,9 +71,9 @@ protected CauseData retrieveCauseData(NoteHook hook) {
                 .withTargetProjectId(hook.getMergeRequest().getTargetProjectId())
                 .withBranch(hook.getMergeRequest().getSourceBranch())
                 .withSourceBranch(hook.getMergeRequest().getSourceBranch())
-                .withUserName(hook.getMergeRequest().getLastCommit().getAuthor().getName())
-                .withUserEmail(
-                        hook.getMergeRequest().getLastCommit().getAuthor().getEmail())
+                .withUserName(hook.getUser().getName())
+                .withUserUsername(hook.getUser().getUsername())
+                .withUserEmail(hook.getUser().getEmail())
                 .withSourceRepoHomepage(hook.getMergeRequest().getSource().getHomepage())
                 .withSourceRepoName(hook.getMergeRequest().getSource().getName())
                 .withSourceNamespace(hook.getMergeRequest().getSource().getNamespace())

diff --git a/...ava/com/dabsquared/gitlabjenkins/trigger/handler/note/NoteHookTriggerHandlerImplTest.java b/...ava/com/dabsquared/gitlabjenkins/trigger/handler/note/NoteHookTriggerHandlerImplTest.java
@@ -159,6 +159,13 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
                                         .withWebUrl("https://gitlab.org/test.git")
                                         .build())
                                 .build())
+                        .withUser(user().withId(1)
+                                .withName("User")
+                                .withUsername("user")
+                                .withEmail("user@gitlab.com")
+                                .withAvatarUrl(
+                                        "https://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon")
+                                .build())
                         .build(),
                 true,
                 BranchFilterFactory.newBranchFilter(branchFilterConfig().build(BranchFilterType.All)),

diff --git a/src/test/java/com/dabsquared/gitlabjenkins/webhook/build/NoteBuildActionTest.java b/src/test/java/com/dabsquared/gitlabjenkins/webhook/build/NoteBuildActionTest.java
@@ -1,6 +1,10 @@
 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;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
 
@@ -28,6 +32,7 @@
 import org.jvnet.hudson.test.JenkinsRule;
 import org.kohsuke.stapler.HttpResponses;
 import org.kohsuke.stapler.StaplerResponse;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
@@ -68,13 +73,19 @@ public void setup() throws Exception {
 
     @Test
     public void build() throws IOException {
-        FreeStyleProject testProject = jenkins.createFreeStyleProject();
-        testProject.addTrigger(trigger);
-
-        exception.expect(HttpResponses.HttpResponseException.class);
-        new NoteBuildAction(testProject, getJson("NoteEvent.json"), null).execute(response);
-
-        verify(trigger).onPost(any(NoteHook.class));
+        try {
+            FreeStyleProject testProject = jenkins.createFreeStyleProject();
+            testProject.addTrigger(trigger);
+
+            exception.expect(HttpResponses.HttpResponseException.class);
+            new NoteBuildAction(testProject, getJson("NoteEvent.json"), null).execute(response);
+        } finally {
+            ArgumentCaptor<NoteHook> noteHookArgumentCaptor = ArgumentCaptor.forClass(NoteHook.class);
+            verify(trigger).onPost(noteHookArgumentCaptor.capture());
+            assertThat(noteHookArgumentCaptor.getValue().getUser(), is(notNullValue()));
+            assertThat(noteHookArgumentCaptor.getValue().getUser().getName(), containsString("Administrator"));
+            assertThat(noteHookArgumentCaptor.getValue().getUser().getUsername(), containsString("root"));
+        }
     }
 
     @Test