Fix new rubocop warnings

diff --git a/app/controllers/preferences_controller.rb b/app/controllers/preferences_controller.rb
index e098a8acc49a989a58b390e1cfb3a27570e23d95..dcf0d8b64e2682364b7c5b489ad1c9c72662bd19 100644 (file)
--- a/app/controllers/preferences_controller.rb
+++ b/app/controllers/preferences_controller.rb
@@ -26,7 +26,7 @@ class PreferencesController < ApplicationController
       flash[:notice] = { :partial => "preferences/update_success_flash" }
       redirect_to preferences_path
     else
       flash[:notice] = { :partial => "preferences/update_success_flash" }
       redirect_to preferences_path
     else

-      flash[:error] = t ".failure"
+      flash.now[:error] = t ".failure"

       render :edit
     end
   end
       render :edit
     end
   end

diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
index b48d08ad2ebece1d3fb14ed1ffaa18fbe6d18968..4005176ce192c529d8f4f535e57ada04569f1622 100644 (file)
--- a/app/controllers/profiles_controller.rb
+++ b/app/controllers/profiles_controller.rb
@@ -36,7 +36,7 @@ class ProfilesController < ApplicationController
       flash[:notice] = t ".success"
       redirect_to user_path(current_user)
     else
       flash[:notice] = t ".success"
       redirect_to user_path(current_user)
     else

-      flash[:error] = t ".failure"
+      flash.now[:error] = t ".failure"

       render :edit
     end
   end
       render :edit
     end
   end

diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index 30cb9da7cc18c526ab9b93eabbb338cf72fbf2a8..6d05e6a57b7f24042ffcb781e8952cbeb7f52bd5 100644 (file)
--- a/app/controllers/reports_controller.rb
+++ b/app/controllers/reports_controller.rb
@@ -28,7 +28,7 @@ class ReportsController < ApplicationController
 
       redirect_to helpers.reportable_url(@report.issue.reportable), :notice => t(".successful_report")
     else
 
       redirect_to helpers.reportable_url(@report.issue.reportable), :notice => t(".successful_report")
     else

-      flash[:notice] = t(".provide_details")
+      flash.now[:notice] = t(".provide_details")

       render :action => "new"
     end
   end
       render :action => "new"
     end
   end

diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 7bbe65ec591d471ccf297878dffdd5b0a027a0c6..33fcc7465a6fb8a056448032556dbf7c577b0b7c 100644 (file)
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -183,7 +183,7 @@ class UserMailer < ApplicationMailer
   end
 
   def attach_project_logo
   end
 
   def attach_project_logo

-    attachments.inline["logo.png"] = File.read(Rails.root.join("app/assets/images/osm_logo_30.png"))
+    attachments.inline["logo.png"] = Rails.root.join("app/assets/images/osm_logo_30.png").read

   end
 
   def attach_user_avatar(user)
   end
 
   def attach_user_avatar(user)


@@ -199,7 +199,7 @@ class UserMailer < ApplicationMailer
         avatar.blob.download
       end
     else
         avatar.blob.download
       end
     else

-      File.read(Rails.root.join("app/assets/images/avatar_small.png"))
+      Rails.root.join("app/assets/images/avatar_small.png").read

     end
   end
 
     end
   end
 

diff --git a/config/initializers/config.rb b/config/initializers/config.rb
index e51281e11e034499b26e9ccba6b2bb795ee3456d..7fc48863567b022fe8ac31d726b9ca47e811d9f9 100644 (file)
--- a/config/initializers/config.rb
+++ b/config/initializers/config.rb
@@ -2,7 +2,7 @@
 # Otherwise, admins might not be aware that they are now silently ignored
 # and major problems could occur
 # rubocop:disable Rails/Output, Rails/Exit
 # Otherwise, admins might not be aware that they are now silently ignored
 # and major problems could occur
 # rubocop:disable Rails/Output, Rails/Exit

-if File.exist?(Rails.root.join("config/application.yml"))
+if Rails.root.join("config/application.yml").exist?

   puts "The config/application.yml file is no longer supported."
   puts ""
   puts "Default settings are now found in config/settings.yml and you"
   puts "The config/application.yml file is no longer supported."
   puts ""
   puts "Default settings are now found in config/settings.yml and you"

diff --git a/lib/country.rb b/lib/country.rb
index f6f6791252524e4e1e739d923de3aec138859f75..ca547a972d7df72ccb9bd9c6dc03823b648ee50e 100644 (file)
--- a/lib/country.rb
+++ b/lib/country.rb
@@ -19,7 +19,7 @@ class Country
 
   def self.load_countries
     countries = {}
 
   def self.load_countries
     countries = {}

-    xml = REXML::Document.new(File.read(Rails.root.join("config/countries.xml")))
+    xml = REXML::Document.new(Rails.root.join("config/countries.xml").read)

 
     xml.elements.each("geonames/country") do |ele|
       code = ele.get_text("countryCode").to_s
 
     xml.elements.each("geonames/country") do |ele|
       code = ele.get_text("countryCode").to_s

diff --git a/test/models/trace_test.rb b/test/models/trace_test.rb
index 8fa09f4d7233c77858b1bf3a0c90a9ae88e24651..762df66484d185c82bc52f305e739a989421a1cc 100644 (file)
--- a/test/models/trace_test.rb
+++ b/test/models/trace_test.rb
@@ -166,14 +166,14 @@ class TraceTest < ActiveSupport::TestCase
   end
 
   def test_large_picture
   end
 
   def test_large_picture

-    picture = File.read(Rails.root.join("test/gpx/fixtures/a.gif"), :mode => "rb")
+    picture = Rails.root.join("test/gpx/fixtures/a.gif").read(:mode => "rb")

     trace = create(:trace, :fixture => "a")
 
     assert_equal picture, trace.large_picture
   end
 
   def test_icon_picture
     trace = create(:trace, :fixture => "a")
 
     assert_equal picture, trace.large_picture
   end
 
   def test_icon_picture

-    picture = File.read(Rails.root.join("test/gpx/fixtures/a_icon.gif"), :mode => "rb")
+    picture = Rails.root.join("test/gpx/fixtures/a_icon.gif").read(:mode => "rb")

     trace = create(:trace, :fixture => "a")
 
     assert_equal picture, trace.icon_picture
     trace = create(:trace, :fixture => "a")
 
     assert_equal picture, trace.icon_picture