@@ -104,22 +104,23 @@ public void build() throws IOException {
104104 testProject .addTrigger (mockTrigger );
105105 executeMergeRequestAction (testProject , getJson ("MergeRequestEvent.json" ));
106106 } finally {
107- ArgumentCaptor <MergeRequestHook > pushHookArgumentCaptor = ArgumentCaptor .forClass (MergeRequestHook .class );
108- verify (mockTrigger ).onPost (pushHookArgumentCaptor .capture ());
109- assertThat (pushHookArgumentCaptor .getValue ().getProject (), is (notNullValue ()));
110- assertThat (pushHookArgumentCaptor .getValue ().getProject ().getWebUrl (), is (notNullValue ()));
111- assertThat (pushHookArgumentCaptor .getValue ().getUser (), is (notNullValue ()));
112- assertThat (pushHookArgumentCaptor .getValue ().getUser ().getName (), containsString ("Administrator" ));
113- assertThat (pushHookArgumentCaptor .getValue ().getUser ().getUsername (), containsString ("root" ));
107+ ArgumentCaptor <MergeRequestHook > mergeRequestHookArgumentCaptor =
108+ ArgumentCaptor .forClass (MergeRequestHook .class );
109+ verify (mockTrigger ).onPost (mergeRequestHookArgumentCaptor .capture ());
110+ assertThat (mergeRequestHookArgumentCaptor .getValue ().getProject (), is (notNullValue ()));
111+ assertThat (mergeRequestHookArgumentCaptor .getValue ().getProject ().getWebUrl (), is (notNullValue ()));
112+ assertThat (mergeRequestHookArgumentCaptor .getValue ().getUser (), is (notNullValue ()));
113+ assertThat (mergeRequestHookArgumentCaptor .getValue ().getUser ().getName (), containsString ("Administrator" ));
114+ assertThat (mergeRequestHookArgumentCaptor .getValue ().getUser ().getUsername (), containsString ("root" ));
114115 assertThat (
115- pushHookArgumentCaptor
116+ mergeRequestHookArgumentCaptor
116117 .getValue ()
117118 .getObjectAttributes ()
118119 .getLastCommit ()
119120 .getAuthor (),
120121 is (notNullValue ()));
121122 assertThat (
122- pushHookArgumentCaptor
123+ mergeRequestHookArgumentCaptor
123124 .getValue ()
124125 .getObjectAttributes ()
125126 .getLastCommit ()
0 commit comments