feat: adjusting response when no jobs found

jenkinsci · Apr 14, 2024 · 0bdad7f · 0bdad7f
1 parent 771cdb5
commit 0bdad7f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/gwt/GenericWebHookRequestReceiver.java b/src/main/java/org/jenkinsci/plugins/gwt/GenericWebHookRequestReceiver.java
@@ -222,11 +222,11 @@ static String construct404Message(final String givenToken) {
     final boolean noTokenGiven = Strings.isNullOrEmpty(givenToken);
     if (noTokenGiven) {
       msg += NO_JOBS_MSG_NO_TOKEN;
+      msg += NO_JOBS_HOW_TO_USE_TOKEN;
+      msg += NO_JOBS_HOW_TO_AUTH;
     } else {
       msg += NO_JOBS_MSG_TOKEN;
     }
-    msg += NO_JOBS_HOW_TO_USE_TOKEN;
-    msg += NO_JOBS_HOW_TO_AUTH;
     return msg;
   }
 

diff --git a/src/test/java/org/jenkinsci/plugins/gwt/GenericWebHookRequestReceiverTest.java b/src/test/java/org/jenkinsci/plugins/gwt/GenericWebHookRequestReceiverTest.java
@@ -260,9 +260,6 @@ public void test404MessageNoToken_given() {
 
     assertThat(actual)
         .isEqualToIgnoringWhitespace(
-            "Did not find any jobs with GenericTrigger configured!\n"
-                + "A token was supplied.\n"
-                + "If you are using a token, you need to pass it like ...trigger/invoke?token=TOKENHERE\n"
-                + "If you are not using a token, you need to authenticate like http://user:passsword@example.org/generic-webhook...\n");
+            "Did not find any jobs with GenericTrigger configured!\n" + "A token was supplied.");
   }
 }