From: Andy Allan Date: Thu, 1 Jun 2017 09:58:34 +0000 (+0100) Subject: Rubocop fixes. X-Git-Tag: live~3409 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/162949817d512347b874f9b4db2113b10708da6d Rubocop fixes. --- diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 72913d43e..c8788ad66 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -64,7 +64,7 @@ Metrics/BlockNesting: # Offense count: 62 # Configuration parameters: CountComments. Metrics/ClassLength: - Max: 1766 + Max: 1781 # Offense count: 69 Metrics/CyclomaticComplexity: diff --git a/test/controllers/user_controller_test.rb b/test/controllers/user_controller_test.rb index 636ef3450..0812ec786 100644 --- a/test/controllers/user_controller_test.rb +++ b/test/controllers/user_controller_test.rb @@ -1349,8 +1349,8 @@ class UserControllerTest < ActionController::TestCase user = create(:user) moderator_user = create(:moderator_user) administrator_user = create(:administrator_user) - suspended_user = create(:user, :suspended) - ip_user = create(:user, :creation_ip => "1.2.3.4") + _suspended_user = create(:user, :suspended) + _ip_user = create(:user, :creation_ip => "1.2.3.4") # There are now 7 users - the five above, plus two extra "granters" for the # moderator_user and administrator_user