Merge "Fixed Style/HashSyntax RuboCop offense"

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 97ef233..5b8c965 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -5,12 +5,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 8
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/HashSyntax:
-  Enabled: false
-
 # Offense count: 81
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.

diff --git a/maintenance/jsduck/custom_tags.rb b/maintenance/jsduck/custom_tags.rb
index a1f37e4..c326704 100644 (file)
--- a/maintenance/jsduck/custom_tags.rb
+++ b/maintenance/jsduck/custom_tags.rb
@@ -13,10 +13,10 @@ class CommonTag < JsDuck::Tag::Tag
 
   def parse_doc(scanner, _position)
     if @multiline
-      return { :tagname => @tagname, :doc => :multiline }
+      return { tagname: @tagname, doc: :multiline }
     else
       text = scanner.match(/.*$/)
-      return { :tagname => @tagname, :doc => text }
+      return { tagname: @tagname, doc: text }
     end
   end
 

diff --git a/tests/browser/features/step_definitions/create_account_steps.rb b/tests/browser/features/step_definitions/create_account_steps.rb
index 406a67e..03bff66 100644 (file)
--- a/tests/browser/features/step_definitions/create_account_steps.rb
+++ b/tests/browser/features/step_definitions/create_account_steps.rb
@@ -10,7 +10,7 @@
 # https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/CREDITS
 #
 Given(/^I go to Create account page at (.+)$/) do |path|
-  visit(CreateAccountPage, :using_params => { :page_title => path })
+  visit(CreateAccountPage, using_params: { page_title: path })
 end
 
 Then(/^form has Create account button$/) do

diff --git a/tests/browser/features/step_definitions/create_and_follow_wiki_link_steps.rb b/tests/browser/features/step_definitions/create_and_follow_wiki_link_steps.rb
index 065ee26..504d345 100644 (file)
--- a/tests/browser/features/step_definitions/create_and_follow_wiki_link_steps.rb
+++ b/tests/browser/features/step_definitions/create_and_follow_wiki_link_steps.rb
@@ -6,7 +6,7 @@ end
 
 Given(/^I am on the (.+) page$/) do |article|
   article = article.gsub(/ /, '_')
-  visit(ZtargetPage, :using_params => { :article_name => article })
+  visit(ZtargetPage, using_params: { article_name: article })
 end
 
 Given(/^I create page "(.*?)" with content "(.*?)"$/) do |page_title, page_content|