refined the warning and error message

fixed specs
dependabot · Aug 15, 2024 · a9af4de · a9af4de
1 parent c5fd850
commit a9af4de
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 42 deletions.
diff --git a/common/lib/dependabot/notices.rb b/common/lib/dependabot/notices.rb
@@ -106,12 +106,12 @@ def self.generate_pm_deprecation_notice(package_manager)
       ## Create a warning markdown message
       markdown = "> [!WARNING]\n"
       ## Add the deprecation warning to the message
-      markdown += "> #{message}\n\n"
+      markdown += "> #{message}\n>\n"
 
       ## Add the supported versions to the message
       unless supported_versions_message.empty?
         message += "\n#{supported_versions_message}\n"
-        markdown += "> #{supported_versions_message}\n\n"
+        markdown += "> #{supported_versions_message}\n>\n"
       end
 
       Notice.new(
@@ -144,12 +144,12 @@ def self.generate_pm_unsupported_notice(package_manager)
       ## Create an error markdown message
       markdown = "> [!IMPORTANT]\n"
       ## Add the error message to the message
-      markdown += "> #{message}\n\n"
+      markdown += "> #{message}\n>\n"
 
       ## Add the supported versions to the message
       unless supported_versions_message.empty?
         message += "\n#{supported_versions_message}\n"
-        markdown += "> #{supported_versions_message}\n\n"
+        markdown += "> #{supported_versions_message}\n>\n"
       end
 
       Notice.new(

diff --git a/common/lib/dependabot/pull_request_creator/message_builder.rb b/common/lib/dependabot/pull_request_creator/message_builder.rb
@@ -134,6 +134,7 @@ def pr_message
               "#{prefixed_pr_message_footer}"
 
         truncate_pr_message(msg)
+        puts "\n#{msg}\n"
       rescue StandardError => e
         suppress_error("PR message", e)
         suffixed_pr_message_header + prefixed_pr_message_footer

diff --git a/common/spec/dependabot/notices_spec.rb b/common/spec/dependabot/notices_spec.rb
@@ -126,8 +126,8 @@ def initialize(name:, version:, deprecated_versions: [], unsupported_versions: [
             package_manager_name: "bundler",
             message: "Dependabot will stop supporting `bundler` `v1`!\n" \
                      "Please upgrade to one of the following versions: v2, v3.\n",
-            markdown: "> [!WARNING]\n> Dependabot will stop supporting `bundler` `v1`!\n\n" \
-                      "> Please upgrade to one of the following versions: v2, v3.\n\n"
+            markdown: "> [!WARNING]\n> Dependabot will stop supporting `bundler` `v1`!\n>\n" \
+                      "> Please upgrade to one of the following versions: v2, v3.\n>\n"
           })
       end
     end
@@ -144,8 +144,8 @@ def initialize(name:, version:, deprecated_versions: [], unsupported_versions: [
             package_manager_name: "bundler",
             message: "Dependabot no longer supports `bundler` `v1`!\n" \
                      "Please upgrade to one of the following versions: v2, v3.\n",
-            markdown: "> [!IMPORTANT]\n> Dependabot no longer supports `bundler` `v1`!\n\n" \
-                      "> Please upgrade to one of the following versions: v2, v3.\n\n"
+            markdown: "> [!IMPORTANT]\n> Dependabot no longer supports `bundler` `v1`!\n>\n" \
+                      "> Please upgrade to one of the following versions: v2, v3.\n>\n"
           })
       end
     end
@@ -196,8 +196,8 @@ def initialize(name:, version:, deprecated_versions: [], unsupported_versions: [
           package_manager_name: "bundler",
           message: "Dependabot will stop supporting `bundler` `v1`!\n" \
                    "Please upgrade to one of the following versions: v2, v3.\n",
-          markdown: "> [!WARNING]\n> Dependabot will stop supporting `bundler` `v1`!\n\n" \
-                    "> Please upgrade to one of the following versions: v2, v3.\n\n"
+          markdown: "> [!WARNING]\n> Dependabot will stop supporting `bundler` `v1`!\n>\n" \
+                    "> Please upgrade to one of the following versions: v2, v3.\n>\n"
         })
     end
   end
@@ -224,8 +224,8 @@ def initialize(name:, version:, deprecated_versions: [], unsupported_versions: [
           package_manager_name: "bundler",
           message: "Dependabot no longer supports `bundler` `v1`!\n" \
                    "Please upgrade to one of the following versions: v2, v3.\n",
-          markdown: "> [!IMPORTANT]\n> Dependabot no longer supports `bundler` `v1`!\n\n" \
-                    "> Please upgrade to one of the following versions: v2, v3.\n\n"
+          markdown: "> [!IMPORTANT]\n> Dependabot no longer supports `bundler` `v1`!\n>\n" \
+                    "> Please upgrade to one of the following versions: v2, v3.\n>\n"
         })
     end
   end

diff --git a/common/spec/dependabot/pull_request_creator/message_builder_spec.rb b/common/spec/dependabot/pull_request_creator/message_builder_spec.rb
@@ -3325,9 +3325,9 @@ def commits_details(base:, head:)
           type: "bundler_deprecated_warn",
           package_manager_name: "bundler",
           message: "Dependabot will stop supporting `bundler` `v1`!\n" \
-                   "Please upgrade to one of the following versions: v2, v3.",
-          markdown: "> [!WARNING]\n> Dependabot will stop supporting `bundler` `v1`!\n\n" \
-                    "> Please upgrade to one of the following versions: v2, v3."
+                   "Please upgrade to one of the following versions: v2, v3.\n",
+          markdown: "> [!WARNING]\n> Dependabot will stop supporting `bundler` `v1`!\n>\n" \
+                    "> Please upgrade to one of the following versions: v2, v3.\n>\n"
         )]
       end
 
@@ -3343,17 +3343,17 @@ def commits_details(base:, head:)
           type: "bundler_deprecated_warn",
           package_manager_name: "bundler",
           message: "Dependabot will stop supporting `bundler` `v1`!\n" \
-                   "Please upgrade to one of the following versions: v2, v3.",
-          markdown: "> [!WARNING]\n> Dependabot will stop supporting `bundler` `v1`!\n\n" \
-                    "> Please upgrade to one of the following versions: v2, v3."
+                   "Please upgrade to one of the following versions: v2, v3.\n",
+          markdown: "> [!WARNING]\n> Dependabot will stop supporting `bundler` `v1`!\n>\n" \
+                    "> Please upgrade to one of the following versions: v2, v3.\n>\n"
         ), Dependabot::Notice.new(
-          mode: "INFO",
-          type: "bundler_nosupport_due_info",
+          mode: "ERROR",
+          type: "bundler_unsupported_error",
           package_manager_name: "bundler",
-          message: "The support for bundler v1 is due 30th of August!" \
-                   "Please upgrade the bundler to one of the following versions soon!: v2, v3.",
-          markdown: "> [!INFO]\n> The support for bundler v1 is due 30th of August!\n\n" \
-                    "> Please upgrade the bundler to one of the following versions soon!: v2, v3."
+          message: "Dependabot no longer supports `bundler` `v1`!\n" \
+                   "Please upgrade to one of the following versions: v2, v3.\n",
+          markdown: "> [!IMPORTANT]\n> Dependabot no longer supports `bundler` `v1`!\n>\n" \
+                    "> Please upgrade to one of the following versions: v2, v3.\n>\n"
         )]
       end
 
@@ -3371,17 +3371,17 @@ def commits_details(base:, head:)
           type: "bundler_deprecated_warn",
           package_manager_name: "bundler",
           message: "Dependabot will stop supporting `bundler` `v1`!\n" \
-                   "Please upgrade to one of the following versions: v2, v3.",
-          markdown: "> [!WARNING]\n> Dependabot will stop supporting `bundler` `v1`!\n\n" \
-                    "> Please upgrade to one of the following versions: v2, v3."
+                   "Please upgrade to one of the following versions: v2, v3.\n",
+          markdown: "> [!WARNING]\n> Dependabot will stop supporting `bundler` `v1`!\n>\n" \
+                    "> Please upgrade to one of the following versions: v2, v3.\n>\n"
         ), Dependabot::Notice.new(
           mode: "WARN",
           type: "bundler_deprecated_warn",
           package_manager_name: "bundler",
           message: "Dependabot will stop supporting `bundler` `v1`!\n" \
-                   "Please upgrade to one of the following versions: v2, v3.",
-          markdown: "> [!WARNING]\n> Dependabot will stop supporting `bundler` `v1`!\n\n" \
-                    "> Please upgrade to one of the following versions: v2, v3."
+                   "Please upgrade to one of the following versions: v2, v3.\n",
+          markdown: "> [!WARNING]\n> Dependabot will stop supporting `bundler` `v1`!\n>\n" \
+                    "> Please upgrade to one of the following versions: v2, v3.\n>\n"
         )]
       end
 

diff --git a/updater/spec/dependabot/updater/operations/create_group_update_pull_request_spec.rb b/updater/spec/dependabot/updater/operations/create_group_update_pull_request_spec.rb
@@ -123,9 +123,9 @@
           type: "bundler_deprecated_warn",
           package_manager_name: "bundler",
           message: "Dependabot will stop supporting `bundler` `v1`!\n" \
-                   "Please upgrade to one of the following versions: v2, v3.",
-          markdown: "> [!WARNING]\n> Dependabot will stop supporting `bundler` `v1`!\n\n" \
-                    "> Please upgrade to one of the following versions: v2, v3."
+                   "Please upgrade to one of the following versions: v2, v3.\n",
+          markdown: "> [!WARNING]\n> Dependabot will stop supporting `bundler` `v1`!\n>\n" \
+                    "> Please upgrade to one of the following versions: v2, v3.\n>\n"
         ).to_hash
       ]
     )
@@ -163,9 +163,9 @@
               type: "bundler_deprecated_warn",
               package_manager_name: "bundler",
               message: "Dependabot will stop supporting `bundler` `v1`!\n" \
-                       "Please upgrade to one of the following versions: v2, v3.",
-              markdown: "> [!WARNING]\n> Dependabot will stop supporting `bundler` `v1`!\n\n" \
-                        "> Please upgrade to one of the following versions: v2, v3."
+                       "Please upgrade to one of the following versions: v2, v3.\n",
+              markdown: "> [!WARNING]\n> Dependabot will stop supporting `bundler` `v1`!\n>\n" \
+                        "> Please upgrade to one of the following versions: v2, v3.\n>\n"
             }
           )
           create_group_update_pull_request.perform

diff --git a/updater/spec/dependabot/updater/operations/create_security_update_pull_request_spec.rb b/updater/spec/dependabot/updater/operations/create_security_update_pull_request_spec.rb
@@ -370,9 +370,9 @@ def support_later_versions?
                 type: "bundler_deprecated_warn",
                 package_manager_name: "bundler",
                 message: "Dependabot will stop supporting `bundler` `v1`!\n" \
-                         "Please upgrade to one of the following versions: v2, v3.",
-                markdown: "> [!WARNING]\n> Dependabot will stop supporting `bundler` `v1`!\n\n" \
-                          "> Please upgrade to one of the following versions: v2, v3."
+                         "Please upgrade to one of the following versions: v2, v3.\n",
+                markdown: "> [!WARNING]\n> Dependabot will stop supporting `bundler` `v1`!\n>\n" \
+                          "> Please upgrade to one of the following versions: v2, v3.\n>\n"
               )
             )
 

diff --git a/updater/spec/dependabot/updater/operations/refresh_security_update_pull_request_spec.rb b/updater/spec/dependabot/updater/operations/refresh_security_update_pull_request_spec.rb
@@ -208,10 +208,10 @@
             package_manager_name: "bundler",
             details: {
               message: "Dependabot will stop supporting `bundler` `v1`!\n" \
-                       "Please upgrade to one of the following versions: v2, v3.",
+                       "Please upgrade to one of the following versions: v2, v3.\n",
               current_version: "v1",
-              markdown: "> [!WARNING]\n> Dependabot will stop supporting `bundler` `v1`!\n\n" \
-                        "> Please upgrade to one of the following versions: v2, v3."
+              markdown: "> [!WARNING]\n> Dependabot will stop supporting `bundler` `v1`!\n>\n" \
+                        "> Please upgrade to one of the following versions: v2, v3.\n>\n"
             }
           }])
           expect(refresh_security_update_pull_request).to receive(:create_pull_request)