Fix Style/ExplicitBlockArgument warnings

.rubocop_todo.yml

@@ -189,15 +189,6 @@ Rails/OutputSafety:
 Rails/TimeZone:
   Enabled: false
 
-# Offense count: 6
-# Cop supports --auto-correct.
-Style/ExplicitBlockArgument:
-  Exclude:
-    - 'app/controllers/api/amf_controller.rb'
-    - 'app/controllers/application_controller.rb'
-    - 'app/mailers/notifier.rb'
-    - 'test/integration/client_applications_test.rb'
-
 # Offense count: 572
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.

app/controllers/api/amf_controller.rb

@@ -128,11 +128,9 @@ module Api
       [-2, "An unusual error happened (in #{call}). The server said: #{e}"]
     end
 
-    def amf_handle_error_with_timeout(call, rootobj, rootid)
+    def amf_handle_error_with_timeout(call, rootobj, rootid, &block)
       amf_handle_error(call, rootobj, rootid) do
-        OSM::Timer.timeout(Settings.api_timeout, OSM::APITimeoutError) do
+        OSM::Timer.timeout(Settings.api_timeout, OSM::APITimeoutError, &block)
-          yield
-        end
       end
     end
 

app/controllers/application_controller.rb

@@ -222,20 +222,16 @@ class ApplicationController < ActionController::Base
 
   ##
   # wrap an api call in a timeout
-  def api_call_timeout
+  def api_call_timeout(&block)
-    OSM::Timer.timeout(Settings.api_timeout, Timeout::Error) do
+    OSM::Timer.timeout(Settings.api_timeout, Timeout::Error, &block)
-      yield
-    end
   rescue Timeout::Error
     raise OSM::APITimeoutError
   end
 
   ##
   # wrap a web page in a timeout
-  def web_timeout
+  def web_timeout(&block)
-    OSM::Timer.timeout(Settings.web_timeout, Timeout::Error) do
+    OSM::Timer.timeout(Settings.web_timeout, Timeout::Error, &block)
-      yield
-    end
   rescue ActionView::Template::Error => e
     e = e.cause
 

app/mailers/notifier.rb

@@ -202,10 +202,8 @@ class Notifier < ApplicationMailer
     end
   end
 
-  def with_recipient_locale(recipient)
+  def with_recipient_locale(recipient, &block)
-    I18n.with_locale Locale.available.preferred(recipient.preferred_languages) do
+    I18n.with_locale(Locale.available.preferred(recipient.preferred_languages), &block)
-      yield
-    end
   end
 
   def from_address(name, type, id, digest, user_id = nil)

test/integration/client_applications_test.rb

@@ -78,17 +78,13 @@ class ClientApplicationsTest < ActionDispatch::IntegrationTest
 
   ##
   # utility method to make the HTML screening easier to read.
-  def assert_in_heading
+  def assert_in_heading(&block)
-    assert_select "div.content-heading" do
+    assert_select("div.content-heading", &block)
-      yield
-    end
   end
 
   ##
   # utility method to make the HTML screening easier to read.
-  def assert_in_body
+  def assert_in_body(&block)
-    assert_select "div#content" do
+    assert_select("div#content", &block)
-      yield
-    end
   end
 end