From: Simon Poole <simon@poole.ch>
Date: Wed, 30 Jan 2019 13:39:05 +0000 (+0100)
Subject: Rubocop fixes and increase per method complexity limit from 23 to 25
X-Git-Tag: live~2569^2~7
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e30813bbb1fce58f29285140bfea2d52d1dc555f

Rubocop fixes and increase per method complexity limit from 23 to 25
---

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index b2cc901b0..f989d393d 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -73,7 +73,7 @@ Metrics/ParameterLists:
 
 # Offense count: 72
 Metrics/PerceivedComplexity:
-  Max: 23
+  Max: 25
 
 # Offense count: 6
 Naming/AccessorMethodName:
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index bbe60e39c..925d8752f 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -36,7 +36,7 @@ class UsersController < ApplicationController
   def save
     @title = t "users.new.title"
 
-    if params[:decline] || !params[:read_tou] || params[:read_tou] == 0
+    if params[:decline] || !params[:read_tou] || params[:read_tou] == "0"
       if current_user
         current_user.terms_seen = true
 
diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb
index e344b5879..3a8f4b552 100644
--- a/test/integration/user_creation_test.rb
+++ b/test/integration/user_creation_test.rb
@@ -7,9 +7,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     OmniAuth.config.test_mode = true
 
     stub_request(:get, /.*gravatar.com.*d=404/).to_return(:status => 404)
-    stub_request(:get, "https://api.hostip.info/country.php?ip=127.0.0.1").
-      to_return(status: 200, body: "", headers: {})
-
+    stub_hostip_requests
   end
 
   def teardown
@@ -143,7 +141,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     end
   end
 
-
   # Check that the user can successfully recover their password
   def lost_password_recovery_success
     # Open the lost password form
@@ -221,7 +218,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
           assert_response :redirect
           assert_redirected_to "/user/terms"
           post "/user/save",
-               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "openid", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => password, :pass_crypt_confirmation => password }, :read_tou => 1}
+               :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "openid", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => password, :pass_crypt_confirmation => password }, :read_tou => 1 }
           assert_response :redirect
           follow_redirect!
         end