danger 9.5.3 → 9.6.0

data/lib/danger/danger_core/plugins/dangerfile_bitbucket_server_plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "danger/plugin_support/plugin"
 
 module Danger
@@ -194,14 +196,14 @@ module Danger
         path, line = path.split("#")
         url_path = path.start_with?("/") ? path : "/#{path}"
         text = full_path ? path : File.basename(path)
-        url_path.gsub!(" ", "%20")
+        url_path = url_path.gsub(" ", "%20")
         line_ref = line ? "##{line}" : ""
         yield("#{repo}#{url_path}?at=#{commit}#{line_ref}", text)
       end
 
       return paths.first if paths.count < 2
 
-      paths.first(paths.count - 1).join(", ") + " & " + paths.last
+      "#{paths.first(paths.count - 1).join(', ')} & #{paths.last}"
     end
 
     def create_markdown_link(href, text)

data/lib/danger/danger_core/plugins/dangerfile_danger_plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "danger/plugin_support/plugin"
 
 module Danger

data/lib/danger/danger_core/plugins/dangerfile_git_plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "danger/plugin_support/plugin"
 require "danger/core_ext/file_list"
 

data/lib/danger/danger_core/plugins/dangerfile_github_plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "danger/plugin_support/plugin"
 
 module Danger
@@ -231,7 +233,7 @@ module Danger
 
       return paths.first if paths.count < 2
 
-      paths.first(paths.count - 1).join(", ") + " & " + paths.last
+      "#{paths.first(paths.count - 1).join(', ')} & #{paths.last}"
     end
 
     # @!group GitHub Misc

data/lib/danger/danger_core/plugins/dangerfile_gitlab_plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "danger/plugin_support/plugin"
 
 module Danger
@@ -242,7 +244,7 @@ module Danger
 
       return paths.first if paths.count < 2
 
-      paths.first(paths.count - 1).join(", ") + " & " + paths.last
+      "#{paths.first(paths.count - 1).join(', ')} & #{paths.last}"
     end
 
     # @!group Gitlab Misc

data/lib/danger/danger_core/plugins/dangerfile_local_only_plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "danger/plugin_support/plugin"
 
 # Danger

data/lib/danger/danger_core/plugins/dangerfile_messaging_plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "danger/danger_core/messages/violation"
 require "danger/danger_core/messages/markdown"
 require "danger/plugin_support/plugin"
@@ -95,14 +97,30 @@ module Danger
     #           Optional. Path to the file that the message is for.
     # @option   [String] line
     #           Optional. The line in the file to present the message in.
+    # @option   [Integer] start_line
+    #           Optional. The first line of an inline markdown range.
+    # @option   [String] side
+    #           Optional. The side for `line`. Valid values are "LEFT" and "RIGHT".
+    # @option   [String] start_side
+    #           Optional. The side for `start_line`. Valid values are "LEFT" and "RIGHT".
     # @return   [void]
     #
     def markdown(*markdowns, **options)
       file = options.fetch(:file, nil)
       line = options.fetch(:line, nil)
+      start_line = options.fetch(:start_line, nil)
+      side = options.fetch(:side, nil)
+      start_side = options.fetch(:start_side, nil)
 
       markdowns.flatten.each do |markdown|
-        @markdowns << Markdown.new(markdown, file, line)
+        @markdowns << Markdown.new(
+          markdown,
+          file,
+          line,
+          start_line: start_line,
+          side: side,
+          start_side: start_side
+        )
       end
     end
 

data/lib/danger/danger_core/plugins/dangerfile_vsts_plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "danger/plugin_support/plugin"
 
 module Danger
@@ -167,14 +169,14 @@ module Danger
         path, line = path.split("#L")
         url_path = path.start_with?("/") ? path : "/#{path}"
         text = full_path ? path : File.basename(path)
-        url_path.gsub!(" ", "%20")
+        url_path = url_path.gsub(" ", "%20")
         line_ref = line ? "&line=#{line}" : ""
         create_markdown_link("#{repo}/commit/#{commit}?path=#{url_path}&_a=contents#{line_ref}", text)
       end
 
       return paths.first if paths.count < 2
 
-      paths.first(paths.count - 1).join(", ") + " & " + paths.last
+      "#{paths.first(paths.count - 1).join(', ')} & #{paths.last}"
     end
 
     private

data/lib/danger/danger_core/standard_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "claide"
 require "claide/informative_error"
 
@@ -79,7 +81,7 @@ module Danger
         # Escape markdown brackets
         description = description.gsub(/<|>/) { |bracket| "\\#{bracket}" }
 
-        md = "## Danger has errored"
+        md = +"## Danger has errored"
         md << "#{description}\n"
         md << "```#{stacktrace}```" if stacktrace
 
@@ -95,7 +97,7 @@ module Danger
       trace_line, description = parse_line_number_from_description
       latest_version = Danger.danger_outdated?
 
-      result[:description] = "\n[!] #{description}"
+      result[:description] = +"\n[!] #{description}"
       result[:description] << upgrade_message(latest_version) if latest_version
 
       return result unless backtrace && dsl_path && contents
@@ -112,7 +114,7 @@ module Danger
       first_line = line_numer.zero?
       last_line  = (line_numer == (lines.count - 1))
 
-      result[:stacktrace] = "\n"
+      result[:stacktrace] = +"\n"
       result[:stacktrace] << "#{indent}from #{trace_line.gsub(/:in.*$/, '')}\n"
       result[:stacktrace] << "#{indent}-------------------------------------------\n"
       result[:stacktrace] << "#{indent}#{lines[line_numer - 1]}" unless first_line

data/lib/danger/helpers/array_subclass.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Danger
   module Helpers
     module ArraySubclass

data/lib/danger/helpers/comment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Danger
   class Comment
     attr_reader :id, :body

data/lib/danger/helpers/comments_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "kramdown"
 require "danger/helpers/comments_parsing_helper"
 require "danger/helpers/emoji_mapper"

data/lib/danger/helpers/comments_parsing_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Danger
   module Helpers
     module CommentsParsingHelper
@@ -43,11 +45,12 @@ module Danger
       end
 
       def table_kind_from_title(title)
-        if title =~ /error/i
+        case title
+        when /error/i
           :error
-        elsif title =~ /warning/i
+        when /warning/i
           :warning
-        elsif title =~ /message/i
+        when /message/i
           :message
         end
       end

data/lib/danger/helpers/emoji_mapper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Danger
   class EmojiMapper
     DATA = {
@@ -22,12 +24,12 @@ module Danger
     }.freeze
 
     def initialize(template)
-      @template = DATA.has_key?(template) ? template : "github"
+      @template = DATA.key?(template) ? template : "github"
     end
 
     def map(emoji)
-      emoji&.delete! ":"
-      DATA[template][emoji]
+      cleaned_emoji = emoji&.delete(":") || emoji
+      DATA[template][cleaned_emoji]
     end
 
     def from_type(type)

data/lib/danger/helpers/find_max_num_violations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Find max_num_violations in lib/danger/comment_generators/github.md.erb.
 class FindMaxNumViolations
   # Save ~ 5000 for contents other than violations to avoid exceeded 65536 max comment length limit.

data/lib/danger/helpers/message_groups_array_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Danger
   module Helpers
     module MessageGroupsArrayHelper

data/lib/danger/plugin_support/gems_resolver.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler"
 
 module Danger

data/lib/danger/plugin_support/plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Danger
   class Plugin
     def initialize(dangerfile)

data/lib/danger/plugin_support/plugin_file_resolver.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "danger/plugin_support/gems_resolver"
 
 module Danger
@@ -14,7 +16,7 @@ module Danger
     def resolve
       if !refs.nil? and refs.select { |ref| File.file? ref }.any?
         paths = refs.select { |ref| File.file? ref }.map { |path| File.expand_path(path) }
-      elsif refs and refs.kind_of? Array
+      elsif refs.kind_of? Array
         paths, gems = GemsResolver.new(refs).call
       else
         paths = Dir.glob(File.join(".", "lib/**/*.rb")).map { |path| File.expand_path(path) }

data/lib/danger/plugin_support/plugin_linter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Danger
   class PluginLinter
     # An internal class that is used to represent a rule for the linter.
@@ -13,7 +15,7 @@ module Danger
       end
 
       def object_applied_to
-        metadata[:name].to_s.bold + " (" + type + ")"
+        "#{metadata[:name].to_s.bold} (#{type})"
       end
     end
 
@@ -115,10 +117,10 @@ module Danger
           json[:body_md] && json[:body_md].empty?
         end),
         Rule.new(:warning, 43..45, "Params", "You should give a 'type' for the param, yes, ruby is duck-typey but it's useful for newbies to the language, use `@param [Type] name`.", proc do |json|
-          json[:param_couplets] && json[:param_couplets].flat_map(&:values).include?(nil)
+          json[:param_couplets]&.flat_map(&:values)&.include?(nil)
         end),
         Rule.new(:warning, 43..45, "Unknown Param", "You should give a 'type' for the param, yes, ruby is duck-typey but it's useful for newbies to the language, use `@param [Type] name`.", proc do |json|
-          json[:param_couplets] && json[:param_couplets].flat_map(&:values).include?("Unknown")
+          json[:param_couplets]&.flat_map(&:values)&.include?("Unknown")
         end),
         Rule.new(:warning, 46, "Return Type", "If the function has no useful return value, use ` @return  [void]` - this will be ignored by documentation generators.", proc do |json|
           return_hash = json[:tags].find { |tag| tag[:name] == "return" }
@@ -131,11 +133,11 @@ module Danger
     #
     def link(ref)
       if ref.kind_of?(Range)
-        "@see - " + "https://github.com/dbgrandi/danger-prose/blob/v2.0.0/lib/danger_plugin.rb#L#{ref.min}#-L#{ref.max}".blue
+        "@see - #{"https://github.com/dbgrandi/danger-prose/blob/v2.0.0/lib/danger_plugin.rb#L#{ref.min}#-L#{ref.max}".blue}"
       elsif ref.kind_of?(Integer)
-        "@see - " + "https://github.com/dbgrandi/danger-prose/blob/v2.0.0/lib/danger_plugin.rb#L#{ref}".blue
+        "@see - #{"https://github.com/dbgrandi/danger-prose/blob/v2.0.0/lib/danger_plugin.rb#L#{ref}".blue}"
       else
-        "@see - " + "https://github.com/dbgrandi/danger-prose/blob/v2.0.0/lib/danger_plugin.rb".blue
+        "@see - #{'https://github.com/dbgrandi/danger-prose/blob/v2.0.0/lib/danger_plugin.rb'.blue}"
       end
     end
 

data/lib/danger/request_sources/bitbucket_cloud.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "danger/helpers/comments_helper"
 require "danger/request_sources/bitbucket_cloud_api"
 require "danger/danger_core/message_group"

data/lib/danger/request_sources/bitbucket_cloud_api.rb

@@ -32,8 +32,8 @@ module Danger
       def inspect
         inspected = super
 
-        inspected.gsub!(@password, "********") if @password
-        inspected.gsub!(@access_token, "********") if @access_token
+        inspected = inspected.gsub(@password, "********") if @password
+        inspected = inspected.gsub(@access_token, "********") if @access_token
 
         inspected
       end

data/lib/danger/request_sources/bitbucket_server.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "danger/helpers/comments_helper"
 require "danger/request_sources/bitbucket_server_api"
 require "danger/request_sources/code_insights_api"
@@ -179,7 +181,7 @@ module Danger
         changeset = self.pr_json[:fromRef][:latestCommit]
         # Support for older versions of Bitbucket Server
         changeset = self.pr_json[:fromRef][:latestChangeset] if self.pr_json[:fromRef].key? :latestChangeset
-        puts "Changeset: " + changeset
+        puts "Changeset: #{changeset}"
         puts self.pr_json.to_json
         @api.update_pr_build_status(status, changeset, build_job_link, description)
       end

data/lib/danger/request_sources/bitbucket_server_api.rb

@@ -14,7 +14,7 @@ module Danger
         self.host = environment["DANGER_BITBUCKETSERVER_HOST"]
         self.verify_ssl = environment["DANGER_BITBUCKETSERVER_VERIFY_SSL"] != "false"
         if self.host && !(self.host.include? "http://") && !(self.host.include? "https://")
-          self.host = "https://" + self.host
+          self.host = "https://#{self.host}"
         end
         self.key = slug
         self.project = project
@@ -24,7 +24,7 @@ module Danger
       def inspect
         inspected = super
 
-        inspected.gsub!(@password, "********") if @password
+        inspected = inspected.gsub(@password, "********") if @password
 
         inspected
       end

data/lib/danger/request_sources/code_insights_api.rb

@@ -26,7 +26,7 @@ module Danger
       def inspect
         inspected = super
 
-        inspected.gsub!(@password, "********") if @password
+        inspected = inspected.gsub(@password, "********") if @password
 
         inspected
       end
@@ -131,7 +131,7 @@ module Danger
       end
 
       def annotation_endpoint_at_commit(commit)
-        report_endpoint_at_commit(commit) + "/annotations"
+        "#{report_endpoint_at_commit(commit)}/annotations"
       end
 
       def use_ssl

data/lib/danger/request_sources/github/github.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # rubocop:disable Metrics/ClassLength
 
 require "octokit"
@@ -12,6 +14,8 @@ module Danger
     class GitHub < RequestSource
       include Danger::Helpers::CommentsHelper
 
+      DiffLineReference = Struct.new(:file, :line)
+
       attr_accessor :pr_json, :issue_json, :use_local_git, :support_tokenless_auth, :dismiss_out_of_range_messages, :host, :api_url, :verify_ssl
 
       def self.env_vars
@@ -32,9 +36,7 @@ module Danger
         # backwards compatibility. `DANGER_GITHUB_API_BASE_URL` is the new
         # correctly named variable.
         self.api_url = environment.fetch("DANGER_GITHUB_API_HOST") do
-          environment.fetch("DANGER_GITHUB_API_BASE_URL") do
-            "https://api.github.com/".freeze
-          end
+          environment.fetch("DANGER_GITHUB_API_BASE_URL", "https://api.github.com/")
         end
         self.verify_ssl = environment["DANGER_OCTOKIT_VERIFY_SSL"] != "false"
 
@@ -333,9 +335,10 @@ module Danger
           next false unless m.file && m.line
 
           position = find_position_in_diff diff_lines, m, kind
+          start_position = start_position_in_diff(diff_lines, m, kind)
 
           # Keep the change if it's line is not in the diff and not in dismiss mode
-          next dismiss_out_of_range_messages_for(kind) if position.nil?
+          next dismiss_out_of_range_messages_for(kind) if position.nil? || start_position == :out_of_range
 
           # Once we know we're gonna submit it, we format it
           if is_markdown_content
@@ -350,7 +353,7 @@ module Danger
           end
 
           matching_comments = danger_comments.select do |comment_data|
-            if comment_data["path"] == m.file && comment_data["position"] == position
+            if inline_comment_matches?(comment_data, m, position)
               # Parse it to avoid problems with strikethrough
               violation = violations_from_table(comment_data["body"]).first
               if violation
@@ -366,10 +369,7 @@ module Danger
 
           if matching_comments.empty?
             begin
-              # Since Octokit v8, the signature of create_pull_request_comment has been changed.
-              # See https://github.com/danger/danger/issues/1475 for detailed information.
-              client.create_pull_request_comment(ci_source.repo_slug, ci_source.pull_request_id,
-                                                 body, head_ref, m.file, (Octokit::MAJOR >= 8 ? m.line : position))
+              create_inline_comment(body, head_ref, m, position)
             rescue Octokit::UnprocessableEntity => e
               # Show more detail for UnprocessableEntity error
               message = [e, "body: #{body}", "head_ref: #{head_ref}", "filename: #{m.file}", "position: #{position}"].join("\n")
@@ -392,16 +392,76 @@ module Danger
         end
       end
 
+      def start_position_in_diff(diff_lines, message, kind)
+        return nil unless ranged_inline_comment?(message)
+
+        start_message = DiffLineReference.new(message.file, message.start_line)
+        find_position_in_diff(diff_lines, start_message, kind) || :out_of_range
+      end
+
+      def inline_comment_matches?(comment_data, message, position)
+        return false unless comment_data["path"] == message.file
+
+        if ranged_inline_comment?(message)
+          ranged_inline_comment_lines_match?(comment_data, message)
+        else
+          comment_data["position"] == position
+        end
+      end
+
+      def create_inline_comment(body, head_ref, message, position)
+        # Since Octokit v8, the signature of create_pull_request_comment has been changed.
+        # See https://github.com/danger/danger/issues/1475 for detailed information.
+        if ranged_inline_comment?(message) && Octokit::MAJOR >= 8
+          # GitHub ranges are required for multi-line suggestion blocks that
+          # replace an existing added translator comment plus the added string.
+          client.create_pull_request_comment(
+            ci_source.repo_slug,
+            ci_source.pull_request_id,
+            body,
+            head_ref,
+            message.file,
+            message.line,
+            start_line: message.start_line,
+            side: message.side || "RIGHT",
+            start_side: message.start_side || "RIGHT"
+          )
+        else
+          # Octokit v7 only supports diff positions, so ranged metadata is ignored.
+          client.create_pull_request_comment(
+            ci_source.repo_slug,
+            ci_source.pull_request_id,
+            body,
+            head_ref,
+            message.file,
+            (Octokit::MAJOR >= 8 ? message.line : position)
+          )
+        end
+      end
+
+      def ranged_inline_comment?(message)
+        !message.start_line.nil?
+      end
+
+      def ranged_inline_comment_lines_match?(comment_data, message)
+        comment_line = comment_data["line"]
+        comment_start_line = comment_data["start_line"]
+        return false if comment_line.nil? || comment_start_line.nil?
+
+        comment_line.to_i == message.line &&
+          comment_start_line.to_i == message.start_line
+      end
+
       def find_position_in_diff(diff_lines, message, kind)
         range_header_regexp = /@@ -([0-9]+)(,([0-9]+))? \+(?<start>[0-9]+)(,(?<end>[0-9]+))? @@.*/
         file_header_regexp = %r{^diff --git a/.*}
 
-        pattern = "+++ b/" + message.file + "\n"
+        pattern = "+++ b/#{message.file}\n"
         file_start = diff_lines.index(pattern)
 
         # Files containing spaces sometimes have a trailing tab
         if file_start.nil?
-          pattern = "+++ b/" + message.file + "\t\n"
+          pattern = "+++ b/#{message.file}\t\n"
           file_start = diff_lines.index(pattern)
         end
 

data/lib/danger/request_sources/github/github_review.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "octokit"
 require "danger/ci_source/ci_source"
 require "danger/request_sources/github/github_review_resolver"
@@ -13,15 +15,15 @@ module Danger
         include Danger::Helpers::CommentsHelper
 
         # @see https://developer.github.com/v3/pulls/reviews/ for all possible events
-        EVENT_APPROVE = "APPROVE".freeze
-        EVENT_REQUEST_CHANGES = "REQUEST_CHANGES".freeze
-        EVENT_COMMENT = "COMMENT".freeze
+        EVENT_APPROVE = "APPROVE"
+        EVENT_REQUEST_CHANGES = "REQUEST_CHANGES"
+        EVENT_COMMENT = "COMMENT"
 
         # Current review status, if the review has not been submitted yet -> STATUS_PENDING
-        STATUS_APPROVED = "APPROVED".freeze
-        STATUS_REQUESTED_CHANGES = "CHANGES_REQUESTED".freeze
-        STATUS_COMMENTED = "COMMENTED".freeze
-        STATUS_PENDING = "PENDING".freeze
+        STATUS_APPROVED = "APPROVED"
+        STATUS_REQUESTED_CHANGES = "CHANGES_REQUESTED"
+        STATUS_COMMENTED = "COMMENTED"
+        STATUS_PENDING = "PENDING"
 
         attr_reader :id, :body, :status, :review_json
 

data/lib/danger/request_sources/github/github_review_resolver.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "danger/request_sources/github/github_review"
 
 module Danger

data/lib/danger/request_sources/github/github_review_unsupported.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Danger
   module RequestSources
     module GitHubSource

data/lib/danger/request_sources/gitlab.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "uri"
 require "danger/helpers/comments_helper"
 require "danger/helpers/comment"
@@ -71,18 +73,16 @@ module Danger
       def mr_comments
         # @raw_comments contains what we got back from the server.
         # @comments contains Comment objects (that have less information)
-        @comments ||= if supports_inline_comments
-                        @raw_comments = mr_discussions
-                          .auto_paginate
-                          .flat_map { |discussion| discussion.notes.map { |note| note.to_h.merge({ "discussion_id" => discussion.id }) } }
-                        @raw_comments
-                          .map { |comment| Comment.from_gitlab(comment) }
-                      else
-                        @raw_comments = client.merge_request_comments(ci_source.repo_slug, ci_source.pull_request_id, per_page: 100)
-                          .auto_paginate
-                        @raw_comments
-                          .map { |comment| Comment.from_gitlab(comment) }
-                      end
+        if supports_inline_comments
+          @raw_comments = mr_discussions
+            .auto_paginate
+            .flat_map { |discussion| discussion.notes.map { |note| note.to_h.merge({ "discussion_id" => discussion.id }) } }
+        else
+          @raw_comments = client.merge_request_comments(ci_source.repo_slug, ci_source.pull_request_id, per_page: 100)
+            .auto_paginate
+        end
+        @comments ||= @raw_comments
+          .map { |comment| Comment.from_gitlab(comment) }
       end
 
       def mr_discussions
@@ -216,12 +216,11 @@ module Danger
             previous_violations: previous_violations
           }.merge(main_violations))
 
-          comment_result =
-            if should_create_new_comment
-              client.create_merge_request_note(ci_source.repo_slug, ci_source.pull_request_id, body)
-            else
-              client.edit_merge_request_note(ci_source.repo_slug, ci_source.pull_request_id, last_comment.id, body)
-            end
+          if should_create_new_comment
+            client.create_merge_request_note(ci_source.repo_slug, ci_source.pull_request_id, body)
+          else
+            client.edit_merge_request_note(ci_source.repo_slug, ci_source.pull_request_id, last_comment.id, body)
+          end
         end
       end
 

data/lib/danger/request_sources/local_only.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "danger/helpers/comments_helper"
 require "danger/helpers/comment"
 

data/lib/danger/request_sources/request_source.rb

@@ -41,9 +41,9 @@ module Danger
       def inspect
         inspected = super
 
-        inspected.gsub!(@token, "********") if @token
-        inspected.gsub!(@access_token, "********") if @access_token
-        inspected.gsub!(@bearer_token, "********") if @bearer_token
+        inspected = inspected.gsub(@token, "********") if @token
+        inspected = inspected.gsub(@access_token, "********") if @access_token
+        inspected = inspected.gsub(@bearer_token, "********") if @bearer_token
 
         inspected
       end