Apply rubocop corrections

spencertransier · spencertransier · commit a5e7cecc4983 · 2023-04-21T21:39:38.000-07:00
diff --git a/Dangerfile b/Dangerfile
@@ -32,7 +32,7 @@ end
 
 # Lint with Rubocop and report violations inline in GitHub
 github.dismiss_out_of_range_messages # This way, fixed violations should go
-renaming_map = (git.renamed_files || []).map { |e| [e[:before], e[:after]] }.to_h # when files are renamed, git.modified_files contains old name, not new one, so we need to do the convertion
+renaming_map = (git.renamed_files || []).to_h { |e| [e[:before], e[:after]] } # when files are renamed, git.modified_files contains old name, not new one, so we need to do the convertion
 rubocop.lint(
   files: git.added_files + (git.modified_files.map { |f| renaming_map[f] || f }) - git.deleted_files,
   inline_comment: true,
diff --git a/Rakefile b/Rakefile
@@ -42,7 +42,7 @@ task :new_release do
 
   ## Print current info
   Console.header "Current version is: #{Fastlane::Wpmreleasetoolkit::VERSION}"
-  Console.warning "Warning: Latest version number does not match latest version title in CHANGELOG (#{latest_version})!" unless Fastlane::Wpmreleasetoolkit::VERSION == latest_version
+  Console.warning "Warning: Latest version number does not match latest version title in CHANGELOG (#{latest_version})!" unless latest_version == Fastlane::Wpmreleasetoolkit::VERSION
 
   Console.header 'Pending CHANGELOG:'
   Console.print_indented_lines(parser.cleaned_pending_changelog_lines)
@@ -72,11 +72,11 @@ task :new_release do
     >>> WHAT'S NEXT
 
     1. Create a PR against `trunk`.
-    2. Once the PR is merged, publish a GitHub release for \`#{new_version}\`, targeting \`trunk\`,
-       creating a new \`#{new_version} tag in the process.
+    2. Once the PR is merged, publish a GitHub release for `#{new_version}`, targeting `trunk`,
+       creating a new `#{new_version} tag in the process.
 
     The creation of the new tag will trigger a CI workflow that will take care of doing the
-    \`gem push\` of the new version to RubyGems.
+    `gem push` of the new version to RubyGems.
 
   INSTRUCTIONS
 end
diff --git a/fastlane-plugin-wpmreleasetoolkit.gemspec b/fastlane-plugin-wpmreleasetoolkit.gemspec
@@ -14,8 +14,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.7'
 
-  spec.files         = Dir['lib/**/*'] + %w[README.md LICENSE]
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files = Dir['lib/**/*'] + %w[README.md LICENSE]
 
   # Bring in any generated executables
   spec.bindir = 'bin'
@@ -61,4 +60,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop-require_tools', '~> 0.1.2'
   spec.add_development_dependency 'rubocop-rspec', '2.3.0'
   spec.add_development_dependency 'simplecov', '~> 0.16.1'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end
diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/an_update_metadata_source_action.rb b/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/an_update_metadata_source_action.rb
@@ -37,7 +37,7 @@ def self.create_temp_po(params)
         target = self.create_target_file_path(orig)
 
         # Clear if older exists
-        File.delete(target) if File.exist? target
+        FileUtils.rm_f(target)
 
         # Create the new one
         begin
@@ -47,7 +47,7 @@ def self.create_temp_po(params)
             end
           end
         rescue
-          File.delete(target) if File.exist? target
+          FileUtils.rm_f(target)
           raise
         end
 
@@ -57,7 +57,7 @@ def self.create_temp_po(params)
       # Deletes the old po and moves the temp one
       # to the final location
       def self.swap_po(orig_file_path, temp_file_path)
-        File.delete(orig_file_path) if File.exist? orig_file_path
+        FileUtils.rm_f(orig_file_path)
         File.rename(temp_file_path, orig_file_path)
       end
 
diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_create_xml_release_notes.rb b/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_create_xml_release_notes.rb
@@ -11,7 +11,7 @@ def self.run(params)
             complete_path = "#{params[:download_path]}/#{loc[1]}/changelogs/#{params[:build_number]}.txt"
             if File.exist?(complete_path)
               f.puts("<#{loc[1]}>")
-              f.puts(File.open(complete_path).read)
+              f.puts(File.read(complete_path))
               f.puts("</#{loc[1]}>\n")
             else
               UI.message("File #{complete_path} not found. Skipping language #{loc[1]}")
diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_download_translations_action.rb b/lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_download_translations_action.rb
@@ -48,7 +48,7 @@ def self.available_options
             env_name: 'FL_DOWNLOAD_TRANSLATIONS_RES_DIR',
             description: "The path to the Android project's `res` dir (typically the `<project name>/src/main/res` directory) containing the `values-*` subdirs",
             type: String,
-            default_value: "#{ENV['PROJECT_NAME']}/src/main/res"
+            default_value: "#{ENV.fetch('PROJECT_NAME', nil)}/src/main/res"
           ),
           FastlaneCore::ConfigItem.new(
             key: :glotpress_url,
diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/actions/common/check_for_toolkit_updates_action.rb b/lib/fastlane/plugin/wpmreleasetoolkit/actions/common/check_for_toolkit_updates_action.rb
@@ -44,12 +44,12 @@ def self.warn_on_breaking_update(current_version, latest_version)
         UI.important <<~BREAKING_CHANGE_MESSAGE
           The latest version available (#{latest_version}) introduces breaking changes compared to the #{current_version} you are currently using.
 
-           - To update to #{latest_version}, first edit your \`Pluginfile\` to use '#{new_semver_requirement}', run \`bundle update\`,
-             then be sure to make all the necessary changes to your \`Fastfile\` (see the toolkit's CHANGELOG)
+           - To update to #{latest_version}, first edit your `Pluginfile` to use '#{new_semver_requirement}', run `bundle update`,
+             then be sure to make all the necessary changes to your `Fastfile` (see the toolkit's CHANGELOG)
              to take those breaking changes into account.
 
            - If you are not ready to make the major version bump, you can still try to update to the latest compatible,
-             non-breaking version by running \`bundle update\` now. This will not update to the latest #{latest_version}, but
+             non-breaking version by running `bundle update` now. This will not update to the latest #{latest_version}, but
              might still update to a newer version compatible with '#{current_semver_requirement}' if one exists; which is still valuable
              to at least get bugfixes, until you are ready to jump to the next major version later.
         BREAKING_CHANGE_MESSAGE
diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/actions/common/gp_downloadmetadata_action.rb b/lib/fastlane/plugin/wpmreleasetoolkit/actions/common/gp_downloadmetadata_action.rb
@@ -12,7 +12,7 @@ def self.run(params)
         UI.message "Path: #{params[:download_path]}"
 
         # Check download path
-        Dir.mkdir(params[:download_path]) unless File.exist?(params[:download_path])
+        FileUtils.mkdir_p(params[:download_path])
 
         # Download
         downloader = Fastlane::Helper::MetadataDownloader.new(params[:download_path], params[:target_files])
diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/actions/common/gp_update_metadata_source.rb b/lib/fastlane/plugin/wpmreleasetoolkit/actions/common/gp_update_metadata_source.rb
@@ -36,7 +36,7 @@ def self.create_temp_po(params)
         target = self.create_target_file_path(orig)
 
         # Clear if older exists
-        File.delete(target) if File.exist? target
+        FileUtils.rm_f(target)
 
         # Create the new one
         begin
@@ -46,7 +46,7 @@ def self.create_temp_po(params)
             end
           end
         rescue
-          File.delete(target) if File.exist? target
+          FileUtils.rm_f(target)
           raise
         end
 
@@ -56,7 +56,7 @@ def self.create_temp_po(params)
       # Deletes the old po and moves the temp one
       # to the final location
       def self.swap_po(orig_file_path, temp_file_path)
-        File.delete(orig_file_path) if File.exist? orig_file_path
+        FileUtils.rm_f(orig_file_path)
         File.rename(temp_file_path, orig_file_path)
       end
 
diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/actions/common/prototype_build_details_comment_action.rb b/lib/fastlane/plugin/wpmreleasetoolkit/actions/common/prototype_build_details_comment_action.rb
@@ -87,7 +87,7 @@ def self.build_install_links(app_center_info, download_url)
         end
         if app_center_info.org_name && app_center_info.app_name
           install_url = "https://install.appcenter.ms/orgs/#{app_center_info.org_name}/apps/#{app_center_info.app_name}/releases/#{app_center_info.release_id}"
-          extra_metadata['App Center Build'] = "<a href='#{install_url}'>#{app_center_info.display_name} \##{app_center_info.release_id}</a>"
+          extra_metadata['App Center Build'] = "<a href='#{install_url}'>#{app_center_info.display_name} ##{app_center_info.release_id}</a>"
         end
         UI.user_error!(NO_INSTALL_URL_ERROR_MESSAGE) if install_url.nil?
         qr_code_url = "https://chart.googleapis.com/chart?chs=500x500&cht=qr&chl=#{CGI.escape(install_url)}&choe=UTF-8"
diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_download_strings_files_from_glotpress.rb b/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_download_strings_files_from_glotpress.rb
@@ -13,7 +13,7 @@ def self.run(params)
           UI.message "Downloading translations for '#{lproj_name}' from GlotPress (#{glotpress_locale}) [#{params[:filters]}]..."
           lproj_dir = File.join(download_dir, "#{lproj_name}.lproj")
           destination = File.join(lproj_dir, "#{params[:table_basename]}.strings")
-          FileUtils.mkdir(lproj_dir) unless Dir.exist?(lproj_dir)
+          FileUtils.mkdir_p(lproj_dir)
 
           Fastlane::Helper::Ios::L10nHelper.download_glotpress_export_file(
             project_url: params[:project_url],
diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_extract_keys_from_strings_files.rb b/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_extract_keys_from_strings_files.rb
@@ -45,10 +45,10 @@ def self.run(params)
       # @return [Hash<String, Array<String>>] The hash listing the keys to extract for each target file
       #
       def self.keys_list_per_target_file(original_files)
-        original_files.map do |original_file|
+        original_files.to_h do |original_file|
           keys = Fastlane::Helper::Ios::L10nHelper.read_strings_file_as_hash(path: original_file).keys
           [original_file, keys]
-        end.to_h
+        end
       rescue StandardError => e
         UI.user_error!("Failed to read the keys to extract from originals file: #{e.message}")
       end
diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/helper/an_metadata_update_helper.rb b/lib/fastlane/plugin/wpmreleasetoolkit/helper/an_metadata_update_helper.rb
@@ -50,7 +50,7 @@ def generate_block(fw)
 
         if line_count <= 1
           # Single line output
-          fw.puts("msgid \"#{File.open(@content_file_path, 'r').read.rstrip}\"")
+          fw.puts("msgid \"#{File.read(@content_file_path).rstrip}\"")
         else
           # Multiple line output
           fw.puts('msgid ""')
@@ -145,7 +145,7 @@ def is_handler_for(key)
       end
 
       def generate_block(fw)
-        super(fw) unless File.zero?(@content_file_path)
+        super(fw) unless File.empty?(@content_file_path)
       end
     end
   end
diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/helper/android/android_git_helper.rb b/lib/fastlane/plugin/wpmreleasetoolkit/helper/android/android_git_helper.rb
@@ -16,13 +16,13 @@ def self.commit_version_bump
           if File.exist?(Fastlane::Helper::Android::VersionHelper.version_properties_file)
             Fastlane::Helper::GitHelper.commit(
               message: 'Bump version number',
-              files: File.join(ENV['PROJECT_ROOT_FOLDER'], 'version.properties'),
+              files: File.join(ENV.fetch('PROJECT_ROOT_FOLDER', nil), 'version.properties'),
               push: true
             )
           else
             Fastlane::Helper::GitHelper.commit(
               message: 'Bump version number',
-              files: File.join(ENV['PROJECT_ROOT_FOLDER'], ENV['PROJECT_NAME'], 'build.gradle'),
+              files: File.join(ENV.fetch('PROJECT_ROOT_FOLDER', nil), ENV.fetch('PROJECT_NAME', nil), 'build.gradle'),
               push: true
             )
           end
diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/helper/android/android_localize_helper.rb b/lib/fastlane/plugin/wpmreleasetoolkit/helper/android/android_localize_helper.rb
@@ -240,7 +240,7 @@ def self.download_from_glotpress(res_dir:, glotpress_project_url:, glotpress_fil
           attributes_to_copy = %w[formatted] # Attributes that we want to replicate into translated `string.xml` files
           orig_file = File.join(res_dir, 'values', 'strings.xml')
           orig_xml = File.open(orig_file) { |f| Nokogiri::XML(f, nil, Encoding::UTF_8.to_s) }
-          orig_attributes = orig_xml.xpath('//string').map { |tag| [tag['name'], tag.attributes.select { |k, _| attributes_to_copy.include?(k) }] }.to_h
+          orig_attributes = orig_xml.xpath('//string').to_h { |tag| [tag['name'], tag.attributes.select { |k, _| attributes_to_copy.include?(k) }] }
 
           locales_map.each do |lang_codes|
             all_xml_documents = glotpress_filters.map do |filters|
@@ -262,7 +262,7 @@ def self.download_from_glotpress(res_dir:, glotpress_project_url:, glotpress_fil
 
             # Save
             lang_dir = File.join(res_dir, "values-#{lang_codes[:android]}")
-            FileUtils.mkdir(lang_dir) unless Dir.exist?(lang_dir)
+            FileUtils.mkdir_p(lang_dir)
             lang_file = File.join(lang_dir, 'strings.xml')
             File.open(lang_file, 'w') { |f| merged_xml.write_to(f, encoding: Encoding::UTF_8.to_s, indent: 4) }
           end
diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/helper/android/android_tools_path_helper.rb b/lib/fastlane/plugin/wpmreleasetoolkit/helper/android/android_tools_path_helper.rb
@@ -10,7 +10,7 @@ class ToolsPathHelper
         attr_reader :android_home
 
         def initialize(sdk_root: nil)
-          @android_home = sdk_root || ENV['ANDROID_HOME'] || ENV['ANDROID_SDK_ROOT'] || ENV['ANDROID_SDK']
+          @android_home = sdk_root || ENV['ANDROID_HOME'] || ENV['ANDROID_SDK_ROOT'] || ENV.fetch('ANDROID_SDK', nil)
         end
 
         # @param [String] binary The name of the binary to search for
diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/helper/android/android_version_helper.rb b/lib/fastlane/plugin/wpmreleasetoolkit/helper/android/android_version_helper.rb
@@ -465,9 +465,9 @@ def self.get_keyword_from_gradle_file(file_path, section, keyword)
         # @return [String] The path of the `build.gradle` file inside the project subfolder in the project's repo
         #
         def self.gradle_path
-          UI.user_error!("You need to set the \`PROJECT_ROOT_FOLDER\` environment variable to the path to the project's root") if ENV['PROJECT_ROOT_FOLDER'].nil?
-          UI.user_error!("You need to set the \`PROJECT_NAME\` environment variable to the relative path to the project subfolder name") if ENV['PROJECT_NAME'].nil?
-          File.join(ENV['PROJECT_ROOT_FOLDER'], ENV['PROJECT_NAME'], 'build.gradle')
+          UI.user_error!("You need to set the `PROJECT_ROOT_FOLDER` environment variable to the path to the project's root") if ENV['PROJECT_ROOT_FOLDER'].nil?
+          UI.user_error!('You need to set the `PROJECT_NAME` environment variable to the relative path to the project subfolder name') if ENV['PROJECT_NAME'].nil?
+          File.join(ENV.fetch('PROJECT_ROOT_FOLDER', nil), ENV.fetch('PROJECT_NAME', nil), 'build.gradle')
         end
 
         # Update both the versionName and versionCode of the build.gradle file to the specified version.
diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/helper/glotpress_helper.rb b/lib/fastlane/plugin/wpmreleasetoolkit/helper/glotpress_helper.rb
@@ -66,7 +66,7 @@ def self.get_translation_status(data:, language_code:)
       # @return [Integer] The percentage of the translated strings.
       #
       def self.extract_value_from_translation_info_data(data:, language_code:, status:)
-        regex = "\/#{language_code}\/.*#{status}.*>([0-9,]+)"
+        regex = "/#{language_code}/.*#{status}.*>([0-9,]+)"
 
         # 1. Grep the line with contains the required info.
         # 2. Match the info and extract the value in group 1.
diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/helper/interactive_prompt_reminder.rb b/lib/fastlane/plugin/wpmreleasetoolkit/helper/interactive_prompt_reminder.rb
@@ -84,7 +84,7 @@ def self.monkey_patch_interactive_prompts_with_reminder(after: DEFAULT_PROMPT_RE
 
 # Apply Monkey patch
 unless ENV['FASTLANE_PROMPT_REMINDER_DISABLE_AUTO_PATCH']
-  message = ENV['FASTLANE_PROMPT_REMINDER_MESSAGE']
+  message = ENV.fetch('FASTLANE_PROMPT_REMINDER_MESSAGE', nil)
   message = FastlaneCore::Shell::DEFAULT_PROMPT_REMINDER_MESSAGE if %w[default true yes 1].include?(message&.downcase)
   delays = ENV['FASTLANE_PROMPT_REMINDER_DELAYS']&.split(',')&.map(&:to_i) || FastlaneCore::Shell::DEFAULT_PROMPT_REMINDER_DELAYS
 
diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/helper/ios/ios_git_helper.rb b/lib/fastlane/plugin/wpmreleasetoolkit/helper/ios/ios_git_helper.rb
@@ -18,11 +18,11 @@ module GitHelper
         # @param [Bool] include_metadata If true (the default), includes the `fastlane/download_metadata.swift` file and the `.pot` file (which typically contains an entry or release notes for the new version)
         #
         def self.commit_version_bump(include_deliverfile: true, include_metadata: true)
-          files_list = [File.join(ENV['PROJECT_ROOT_FOLDER'], 'config', '.')]
+          files_list = [File.join(ENV.fetch('PROJECT_ROOT_FOLDER', nil), 'config', '.')]
           files_list.append File.join('fastlane', 'Deliverfile') if include_deliverfile
           if include_metadata
             files_list.append File.join('fastlane', 'download_metadata.swift')
-            files_list.append File.join(ENV['PROJECT_ROOT_FOLDER'], ENV['PROJECT_NAME'], 'Resources', ENV['APP_STORE_STRINGS_FILE_NAME'])
+            files_list.append File.join(ENV.fetch('PROJECT_ROOT_FOLDER', nil), ENV.fetch('PROJECT_NAME', nil), 'Resources', ENV.fetch('APP_STORE_STRINGS_FILE_NAME', nil))
           end
 
           Fastlane::Helper::GitHelper.commit(message: 'Bump version number', files: files_list, push: true)
diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/helper/ios/ios_l10n_linter_helper.rb b/lib/fastlane/plugin/wpmreleasetoolkit/helper/ios/ios_l10n_linter_helper.rb
@@ -48,7 +48,7 @@ def install_swiftgen!
             extracted_dir = File.join(tmpdir, "swiftgen-#{version}")
             Action.sh('unzip', zipfile, '-d', extracted_dir)
 
-            FileUtils.rm_rf(install_path) if File.exist?(install_path)
+            FileUtils.rm_rf(install_path)
             FileUtils.mkdir_p(install_path)
             FileUtils.cp_r("#{extracted_dir}/.", install_path)
           end
diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/helper/ios/ios_version_helper.rb b/lib/fastlane/plugin/wpmreleasetoolkit/helper/ios/ios_version_helper.rb
@@ -219,7 +219,7 @@ def self.update_fastlane_deliver(new_version)
         # @param [String] internal_version The new version number to use as `VERSION_LONG` for the interrnal xcconfig file, if it exists
         #
         def self.update_xc_configs(new_version, new_version_short, internal_version)
-          update_xc_config(ENV['PUBLIC_CONFIG_FILE'], new_version, new_version_short)
+          update_xc_config(ENV.fetch('PUBLIC_CONFIG_FILE', nil), new_version, new_version_short)
           update_xc_config(ENV['INTERNAL_CONFIG_FILE'], internal_version, new_version_short) unless ENV['INTERNAL_CONFIG_FILE'].nil?
         end
 
@@ -311,7 +311,7 @@ def self.read_from_config_file(key, filePath)
         #         The second element is the version extracted from the internal config file, only present if one was provided.
         def self.get_version_strings
           version_strings = []
-          version_strings << read_long_version_from_config_file(ENV['PUBLIC_CONFIG_FILE'])
+          version_strings << read_long_version_from_config_file(ENV.fetch('PUBLIC_CONFIG_FILE', nil))
           version_strings << read_long_version_from_config_file(ENV['INTERNAL_CONFIG_FILE']) unless ENV['INTERNAL_CONFIG_FILE'].nil?
 
           return version_strings
diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/helper/metadata_download_helper.rb b/lib/fastlane/plugin/wpmreleasetoolkit/helper/metadata_download_helper.rb
@@ -79,7 +79,7 @@ def save_metadata(locale, file_name, content)
         file_path = get_target_file_path(locale, file_name)
 
         dir_path = File.dirname(file_path)
-        FileUtils.mkdir_p(dir_path) unless File.exist?(dir_path)
+        FileUtils.mkdir_p(dir_path)
 
         File.open(file_path, 'w') { |file| file.puts(content) }
       end
@@ -88,7 +88,7 @@ def save_metadata(locale, file_name, content)
       def delete_existing_metadata(target_locale)
         @target_files.each do |file|
           file_path = get_target_file_path(target_locale, file[1][:desc])
-          File.delete(file_path) if File.exist? file_path
+          FileUtils.rm_f(file_path)
         end
       end
 
diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/helper/metadata_update_helper.rb b/lib/fastlane/plugin/wpmreleasetoolkit/helper/metadata_update_helper.rb
@@ -50,7 +50,7 @@ def generate_block(fw)
 
         if line_count <= 1
           # Single line output
-          fw.puts("msgid \"#{File.open(@content_file_path, 'r').read}\"")
+          fw.puts("msgid \"#{File.read(@content_file_path)}\"")
         else
           # Multiple line output
           fw.puts('msgid ""')
diff --git a/lib/fastlane/plugin/wpmreleasetoolkit/helper/promo_screenshots_helper.rb b/lib/fastlane/plugin/wpmreleasetoolkit/helper/promo_screenshots_helper.rb
@@ -24,7 +24,7 @@ def initialize
         if $skip_magick
           message = "PromoScreenshots feature is currently disabled.\n"
           message << "Please, install RMagick if you aim to generate the PromoScreenshots.\n"
-          message << "\'bundle install --with screenshots\' should do it if your project is configured for PromoScreenshots.\n"
+          message << "'bundle install --with screenshots' should do it if your project is configured for PromoScreenshots.\n"
           message << 'Aborting.'
           UI.user_error!(message)
         end
diff --git a/rakelib/changelog_parser.rake b/rakelib/changelog_parser.rake
@@ -30,7 +30,7 @@ class ChangelogParser
   def cleaned_pending_changelog_lines
     lines = []
     @pending_section[:subsections].map do |s|
-      lines.append "\#\#\# #{s[:title]}\n" unless s[:title].nil? # subsection title is nil for lines between h2 and first h3
+      lines.append "### #{s[:title]}\n" unless s[:title].nil? # subsection title is nil for lines between h2 and first h3
       lines += s[:lines]
     end
     lines
@@ -52,9 +52,9 @@ class ChangelogParser
       # Empty placeholder section for next version after this one
       f.puts placeholder_section
       # Section for new version, with the non-empty subsections found while parsing first section
-      f.puts "\#\# #{new_version}\n\n"
+      f.puts "## #{new_version}\n\n"
       f.puts cleaned_pending_changelog_lines
-      f.puts "\#\# #{@pending_section[:next_title]}"
+      f.puts "## #{@pending_section[:next_title]}"
       f.puts read_up_to_end
     end
   end
@@ -81,8 +81,8 @@ class ChangelogParser
   end
 
   def placeholder_section
-    lines = ["\#\# #{PENDING_SECTION_TITLE}\n\n"]
-    lines += SUBSECTIONS_SEMVER_MAP.keys.map { |s| "\#\#\# #{s}\n\n#{EMPTY_PLACEHOLDER}\n\n" }
+    lines = ["## #{PENDING_SECTION_TITLE}\n\n"]
+    lines += SUBSECTIONS_SEMVER_MAP.keys.map { |s| "### #{s}\n\n#{EMPTY_PLACEHOLDER}\n\n" }
     lines.join
   end
 
diff --git a/spec/ios_l10n_helper_spec.rb b/spec/ios_l10n_helper_spec.rb
diff --git a/spec/prototype_build_details_comment_action_spec.rb b/spec/prototype_build_details_comment_action_spec.rb
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
