Merge remote-tracking branch 'upstream/pull/2955' into master

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index cfff8c43e2cd9459cb02f157d9bf5adf2f633db6..67ef880c53df49370c59b1298929f162ce58a027 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -176,18 +176,12 @@ Style/NumericLiterals:
 # Offense count: 20
 Style/OptionalBooleanParameter:
   Exclude:
-    - 'app/controllers/api/notes_controller.rb'
-    - 'app/controllers/application_controller.rb'
-    - 'app/helpers/browse_helper.rb'
     - 'app/models/changeset.rb'
     - 'app/models/node.rb'
     - 'app/models/relation.rb'
     - 'app/models/trace.rb'
     - 'app/models/tracepoint.rb'
     - 'app/models/way.rb'
-    - 'test/models/diary_entry_test.rb'
-    - 'test/models/trace_test.rb'
-    - 'test/models/tracetag_test.rb'
 
 # Offense count: 28
 # Cop supports --auto-correct.

diff --git a/app/controllers/api/notes_controller.rb b/app/controllers/api/notes_controller.rb
index f4d1d0dac957511b16033d1425199c8356cf86e8..f480b9706102c9a549bc770b5c7064b6fdaa7253 100644 (file)
--- a/app/controllers/api/notes_controller.rb
+++ b/app/controllers/api/notes_controller.rb
@@ -240,7 +240,7 @@ module Api
         @note.status = "hidden"
         @note.save
 
-        add_comment(@note, comment, "hidden", false)
+        add_comment(@note, comment, "hidden", :notify => false)
       end
 
       # Return a copy of the updated note
@@ -369,7 +369,7 @@ module Api
 
     ##
     # Add a comment to a note
-    def add_comment(note, text, event, notify = true)
+    def add_comment(note, text, event, notify: true)
       attributes = { :visible => true, :event => event, :body => text }
 
       if current_user

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 052858932c26ff11233a75fb8b81d329d2e81631..9f2d79eaa7bf5845b4c1cb78332e11b9798170b9 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -84,7 +84,7 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  def check_database_readable(need_api = false)
+  def check_database_readable(need_api: false)
     if Settings.status == "database_offline" || (need_api && Settings.status == "api_offline")
       if request.xhr?
         report_error "Database offline for maintenance", :service_unavailable
@@ -94,7 +94,7 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  def check_database_writable(need_api = false)
+  def check_database_writable(need_api: false)
     if Settings.status == "database_offline" || Settings.status == "database_readonly" ||
        (need_api && (Settings.status == "api_offline" || Settings.status == "api_readonly"))
       if request.xhr?
@@ -171,7 +171,7 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  def preferred_languages(reset = false)
+  def preferred_languages(reset: false)
     @preferred_languages = nil if reset
     @preferred_languages ||= if params[:locale]
                                Locale.list(params[:locale])
@@ -184,13 +184,13 @@ class ApplicationController < ActionController::Base
 
   helper_method :preferred_languages
 
-  def set_locale(reset = false)
+  def set_locale(reset: false)
     if current_user&.languages&.empty? && !http_accept_language.user_preferred_languages.empty?
       current_user.languages = http_accept_language.user_preferred_languages
       current_user.save
     end
 
-    I18n.locale = Locale.available.preferred(preferred_languages(reset))
+    I18n.locale = Locale.available.preferred(preferred_languages(:reset => reset))
 
     response.headers["Vary"] = "Accept-Language"
     response.headers["Content-Language"] = I18n.locale.to_s

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index 1bbf85adce4d8d619bd0fcd19ee586e518f45585..50d0ae0a545e60b130331aabbbeb5764331a540c 100644 (file)
--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -3,7 +3,7 @@ class BrowseController < ApplicationController
 
   before_action :authorize_web
   before_action :set_locale
-  before_action -> { check_database_readable(true) }
+  before_action -> { check_database_readable(:need_api => true) }
   before_action :require_oauth
   around_action :web_timeout
   authorize_resource :class => false

diff --git a/app/controllers/changeset_comments_controller.rb b/app/controllers/changeset_comments_controller.rb
index 4abffb90efafac72a7a1d662c5b06fd1d97eb78a..0b5f6059a62ea425acf568206aab76d246d0e940 100644 (file)
--- a/app/controllers/changeset_comments_controller.rb
+++ b/app/controllers/changeset_comments_controller.rb
@@ -4,7 +4,7 @@ class ChangesetCommentsController < ApplicationController
 
   authorize_resource
 
-  before_action -> { check_database_readable(true) }
+  before_action -> { check_database_readable(:need_api => true) }
   around_action :web_timeout
 
   ##

diff --git a/app/controllers/changesets_controller.rb b/app/controllers/changesets_controller.rb
index 5b6d3e010db0e5ea89d290eb71e28856a70af3bb..7796dfeb27fe04d9e2875f451a73a13e25711c78 100644 (file)
--- a/app/controllers/changesets_controller.rb
+++ b/app/controllers/changesets_controller.rb
@@ -6,7 +6,7 @@ class ChangesetsController < ApplicationController
 
   before_action :authorize_web
   before_action :set_locale
-  before_action -> { check_database_readable(true) }, :only => [:index, :feed]
+  before_action -> { check_database_readable(:need_api => true) }, :only => [:index, :feed]
 
   authorize_resource
 

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 288fb2d5ca547ce08d29de3dbe4db0739def7863..7f12720a6efeb8c3110f3bbde92be78efb03f0bf 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -652,7 +652,7 @@ class UsersController < ApplicationController
     if user.save
       session[:fingerprint] = user.fingerprint
 
-      set_locale(true)
+      set_locale(:reset => true)
 
       if user.new_email.blank? || user.new_email == user.email
         flash.now[:notice] = t "users.account.flash update success"

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 1e9465f8035d179a1b6592a6a0bbf820f86d4eab..0f533770b8042165245e0d036b066626c4b97a30 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -1,5 +1,5 @@
 module BrowseHelper
-  def printable_name(object, version = false)
+  def printable_name(object, version: false)
     id = if object.id.is_a?(Array)
            object.id[0]
          else

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 35cd4477b61286173ff4d9ea806325a0ddae6eb1..f58c465a74e170927cd47d2938b7887389f7d688 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -90,7 +90,7 @@
     </h4>
     <ul class="list-unstyled">
       <% @ways.each do |way| %>
-        <li><%= link_to printable_name(way, true), { :action => "way", :id => way.way_id.to_s }, { :class => link_class("way", way), :title => link_title(way) } %></li>
+        <li><%= link_to printable_name(way, :version => true), { :action => "way", :id => way.way_id.to_s }, { :class => link_class("way", way), :title => link_title(way) } %></li>
       <% end %>
     </ul>
   <% end %>
@@ -102,7 +102,7 @@
     </h4>
     <ul class="list-unstyled">
       <% @relations.each do |relation| %>
-        <li><%= link_to printable_name(relation, true), { :action => "relation", :id => relation.relation_id.to_s }, { :class => link_class("relation", relation), :title => link_title(relation) } %></li>
+        <li><%= link_to printable_name(relation, :version => true), { :action => "relation", :id => relation.relation_id.to_s }, { :class => link_class("relation", relation), :title => link_title(relation) } %></li>
       <% end %>
     </ul>
   <% end %>
@@ -114,7 +114,7 @@
     </h4>
     <ul class="list-unstyled">
       <% @nodes.each do |node| %>
-        <li><%= link_to printable_name(node, true), { :action => "node", :id => node.node_id.to_s }, { :class => link_class("node", node), :title => link_title(node), :rel => link_follow(node) } %></li>
+        <li><%= link_to printable_name(node, :version => true), { :action => "node", :id => node.node_id.to_s }, { :class => link_class("node", node), :title => link_title(node), :rel => link_follow(node) } %></li>
       <% end %>
     </ul>
   <% end %>

diff --git a/test/helpers/browse_helper_test.rb b/test/helpers/browse_helper_test.rb
index bc597596f5e46e532e48fb77ceb688ce59d63d6c..076975b098f26a06eae70bacc17dde6d7cc3b481 100644 (file)
--- a/test/helpers/browse_helper_test.rb
+++ b/test/helpers/browse_helper_test.rb
@@ -31,8 +31,8 @@ class BrowseHelperTest < ActionView::TestCase
     assert_dom_equal "<bdi>Test Node</bdi> (<bdi>#{node.id}</bdi>)", printable_name(node)
     assert_dom_equal "<bdi>Test Node</bdi> (<bdi>#{node.id}</bdi>)", printable_name(node_v2)
     assert_dom_equal node.id.to_s, printable_name(node_v1)
-    assert_dom_equal "<bdi>Test Node</bdi> (<bdi>#{node.id}, v2</bdi>)", printable_name(node_v2, true)
-    assert_dom_equal "#{node.id}, v1", printable_name(node_v1, true)
+    assert_dom_equal "<bdi>Test Node</bdi> (<bdi>#{node.id}, v2</bdi>)", printable_name(node_v2, :version => true)
+    assert_dom_equal "#{node.id}, v1", printable_name(node_v1, :version => true)
     assert_dom_equal "<bdi>3.1415926</bdi> (<bdi>#{node_with_ref_without_name.id}</bdi>)", printable_name(node_with_ref_without_name)
 
     I18n.locale = "pt"
@@ -41,8 +41,8 @@ class BrowseHelperTest < ActionView::TestCase
     assert_dom_equal "<bdi>Nó teste</bdi> (<bdi>#{node.id}</bdi>)", printable_name(node)
     assert_dom_equal "<bdi>Nó teste</bdi> (<bdi>#{node.id}</bdi>)", printable_name(node_v2)
     assert_dom_equal node.id.to_s, printable_name(node_v1)
-    assert_dom_equal "<bdi>Nó teste</bdi> (<bdi>#{node.id}, v2</bdi>)", printable_name(node_v2, true)
-    assert_dom_equal "#{node.id}, v1", printable_name(node_v1, true)
+    assert_dom_equal "<bdi>Nó teste</bdi> (<bdi>#{node.id}, v2</bdi>)", printable_name(node_v2, :version => true)
+    assert_dom_equal "#{node.id}, v1", printable_name(node_v1, :version => true)
     assert_dom_equal "<bdi>3.1415926</bdi> (<bdi>#{node_with_ref_without_name.id}</bdi>)", printable_name(node_with_ref_without_name)
 
     I18n.locale = "pt-BR"
@@ -51,8 +51,8 @@ class BrowseHelperTest < ActionView::TestCase
     assert_dom_equal "<bdi>Nó teste</bdi> (<bdi>#{node.id}</bdi>)", printable_name(node)
     assert_dom_equal "<bdi>Nó teste</bdi> (<bdi>#{node.id}</bdi>)", printable_name(node_v2)
     assert_dom_equal node.id.to_s, printable_name(node_v1)
-    assert_dom_equal "<bdi>Nó teste</bdi> (<bdi>#{node.id}, v2</bdi>)", printable_name(node_v2, true)
-    assert_dom_equal "#{node.id}, v1", printable_name(node_v1, true)
+    assert_dom_equal "<bdi>Nó teste</bdi> (<bdi>#{node.id}, v2</bdi>)", printable_name(node_v2, :version => true)
+    assert_dom_equal "#{node.id}, v1", printable_name(node_v1, :version => true)
     assert_dom_equal "<bdi>3.1415926</bdi> (<bdi>#{node_with_ref_without_name.id}</bdi>)", printable_name(node_with_ref_without_name)
 
     I18n.locale = "de"
@@ -61,8 +61,8 @@ class BrowseHelperTest < ActionView::TestCase
     assert_dom_equal "<bdi>Test Node</bdi> (<bdi>#{node.id}</bdi>)", printable_name(node)
     assert_dom_equal "<bdi>Test Node</bdi> (<bdi>#{node.id}</bdi>)", printable_name(node_v2)
     assert_dom_equal node.id.to_s, printable_name(node_v1)
-    assert_dom_equal "<bdi>Test Node</bdi> (<bdi>#{node.id}, v2</bdi>)", printable_name(node_v2, true)
-    assert_dom_equal "#{node.id}, v1", printable_name(node_v1, true)
+    assert_dom_equal "<bdi>Test Node</bdi> (<bdi>#{node.id}, v2</bdi>)", printable_name(node_v2, :version => true)
+    assert_dom_equal "#{node.id}, v1", printable_name(node_v1, :version => true)
     assert_dom_equal "<bdi>3.1415926</bdi> (<bdi>#{node_with_ref_without_name.id}</bdi>)", printable_name(node_with_ref_without_name)
   end
 

diff --git a/test/models/diary_entry_test.rb b/test/models/diary_entry_test.rb
index 76e8bbbe02d04432e0b8ad202dd0823a361029fb..2b94d04dd76f3598c0f127a7d345837c9a600a94 100644 (file)
--- a/test/models/diary_entry_test.rb
+++ b/test/models/diary_entry_test.rb
@@ -8,18 +8,18 @@ class DiaryEntryTest < ActiveSupport::TestCase
 
   def test_diary_entry_validations
     diary_entry_valid({})
-    diary_entry_valid({ :title => "" }, false)
+    diary_entry_valid({ :title => "" }, :valid => false)
     diary_entry_valid(:title => "a" * 255)
-    diary_entry_valid({ :title => "a" * 256 }, false)
-    diary_entry_valid({ :body => "" }, false)
+    diary_entry_valid({ :title => "a" * 256 }, :valid => false)
+    diary_entry_valid({ :body => "" }, :valid => false)
     diary_entry_valid(:latitude => 90)
-    diary_entry_valid({ :latitude => 90.00001 }, false)
+    diary_entry_valid({ :latitude => 90.00001 }, :valid => false)
     diary_entry_valid(:latitude => -90)
-    diary_entry_valid({ :latitude => -90.00001 }, false)
+    diary_entry_valid({ :latitude => -90.00001 }, :valid => false)
     diary_entry_valid(:longitude => 180)
-    diary_entry_valid({ :longitude => 180.00001 }, false)
+    diary_entry_valid({ :longitude => 180.00001 }, :valid => false)
     diary_entry_valid(:longitude => -180)
-    diary_entry_valid({ :longitude => -180.00001 }, false)
+    diary_entry_valid({ :longitude => -180.00001 }, :valid => false)
   end
 
   def test_diary_entry_visible
@@ -48,8 +48,8 @@ class DiaryEntryTest < ActiveSupport::TestCase
 
   private
 
-  def diary_entry_valid(attrs, result = true)
+  def diary_entry_valid(attrs, valid: true)
     entry = build(:diary_entry, attrs)
-    assert_equal result, entry.valid?, "Expected #{attrs.inspect} to be #{result}"
+    assert_equal valid, entry.valid?, "Expected #{attrs.inspect} to be #{valid}"
   end
 end

diff --git a/test/models/trace_test.rb b/test/models/trace_test.rb
index 8b38b7f0e285700dc83c983e54da37f509da0552..fc5064ad7d9805443b9a4db11c9ac53a54bd04d6 100644 (file)
--- a/test/models/trace_test.rb
+++ b/test/models/trace_test.rb
@@ -76,17 +76,17 @@ class TraceTest < ActiveSupport::TestCase
 
   def test_validations
     trace_valid({})
-    trace_valid({ :user_id => nil }, false)
+    trace_valid({ :user_id => nil }, :valid => false)
     trace_valid(:name => "a" * 255)
-    trace_valid({ :name => "a" * 256 }, false)
-    trace_valid({ :description => nil }, false)
+    trace_valid({ :name => "a" * 256 }, :valid => false)
+    trace_valid({ :description => nil }, :valid => false)
     trace_valid(:description => "a" * 255)
-    trace_valid({ :description => "a" * 256 }, false)
+    trace_valid({ :description => "a" * 256 }, :valid => false)
     trace_valid(:visibility => "private")
     trace_valid(:visibility => "public")
     trace_valid(:visibility => "trackable")
     trace_valid(:visibility => "identifiable")
-    trace_valid({ :visibility => "foo" }, false)
+    trace_valid({ :visibility => "foo" }, :valid => false)
   end
 
   def test_tagstring
@@ -319,9 +319,9 @@ class TraceTest < ActiveSupport::TestCase
     assert_equal md5sum, md5sum(create(:trace, :fixture => id).xml_file)
   end
 
-  def trace_valid(attrs, result = true)
+  def trace_valid(attrs, valid: true)
     entry = build(:trace, attrs)
-    assert_equal result, entry.valid?, "Expected #{attrs.inspect} to be #{result}"
+    assert_equal valid, entry.valid?, "Expected #{attrs.inspect} to be #{valid}"
   end
 
   def md5sum(io)

diff --git a/test/models/tracetag_test.rb b/test/models/tracetag_test.rb
index 04263dbb74e905e3a65128fdb01409aaf3493564..1aaa596d2d5412aa2cd7131ca1a1731cf24c03e0 100644 (file)
--- a/test/models/tracetag_test.rb
+++ b/test/models/tracetag_test.rb
@@ -3,23 +3,23 @@ require "test_helper"
 class TracetagTest < ActiveSupport::TestCase
   def test_validations
     tracetag_valid({})
-    tracetag_valid({ :tag => nil }, false)
-    tracetag_valid({ :tag => "" }, false)
+    tracetag_valid({ :tag => nil }, :valid => false)
+    tracetag_valid({ :tag => "" }, :valid => false)
     tracetag_valid(:tag => "a")
     tracetag_valid(:tag => "a" * 255)
-    tracetag_valid({ :tag => "a" * 256 }, false)
-    tracetag_valid({ :tag => "a/b" }, false)
-    tracetag_valid({ :tag => "a;b" }, false)
-    tracetag_valid({ :tag => "a.b" }, false)
-    tracetag_valid({ :tag => "a,b" }, false)
-    tracetag_valid({ :tag => "a?b" }, false)
+    tracetag_valid({ :tag => "a" * 256 }, :valid => false)
+    tracetag_valid({ :tag => "a/b" }, :valid => false)
+    tracetag_valid({ :tag => "a;b" }, :valid => false)
+    tracetag_valid({ :tag => "a.b" }, :valid => false)
+    tracetag_valid({ :tag => "a,b" }, :valid => false)
+    tracetag_valid({ :tag => "a?b" }, :valid => false)
   end
 
   private
 
-  def tracetag_valid(attrs, result = true)
+  def tracetag_valid(attrs, valid: true)
     entry = build(:tracetag)
     entry.assign_attributes(attrs)
-    assert_equal result, entry.valid?, "Expected #{attrs.inspect} to be #{result}"
+    assert_equal valid, entry.valid?, "Expected #{attrs.inspect} to be #{valid}"
   end
 end