Fix some ruby 3 compatibility issues

diff --git a/test/models/diary_entry_test.rb b/test/models/diary_entry_test.rb
index 2b94d04dd76f3598c0f127a7d345837c9a600a94..eb794acec2d858495427a5d79e3404ebc87579cd 100644 (file)
--- a/test/models/diary_entry_test.rb
+++ b/test/models/diary_entry_test.rb
@@ -9,16 +9,16 @@ class DiaryEntryTest < ActiveSupport::TestCase
   def test_diary_entry_validations
     diary_entry_valid({})
     diary_entry_valid({ :title => "" }, :valid => false)
   def test_diary_entry_validations
     diary_entry_valid({})
     diary_entry_valid({ :title => "" }, :valid => false)

-    diary_entry_valid(:title => "a" * 255)
+    diary_entry_valid({ :title => "a" * 255 })

     diary_entry_valid({ :title => "a" * 256 }, :valid => false)
     diary_entry_valid({ :body => "" }, :valid => 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 })

     diary_entry_valid({ :latitude => 90.00001 }, :valid => false)
     diary_entry_valid({ :latitude => 90.00001 }, :valid => false)

-    diary_entry_valid(:latitude => -90)
+    diary_entry_valid({ :latitude => -90 })

     diary_entry_valid({ :latitude => -90.00001 }, :valid => false)
     diary_entry_valid({ :latitude => -90.00001 }, :valid => false)

-    diary_entry_valid(:longitude => 180)
+    diary_entry_valid({ :longitude => 180 })

     diary_entry_valid({ :longitude => 180.00001 }, :valid => false)
     diary_entry_valid({ :longitude => 180.00001 }, :valid => false)

-    diary_entry_valid(:longitude => -180)
+    diary_entry_valid({ :longitude => -180 })

     diary_entry_valid({ :longitude => -180.00001 }, :valid => false)
   end
 
     diary_entry_valid({ :longitude => -180.00001 }, :valid => false)
   end
 

diff --git a/test/models/trace_test.rb b/test/models/trace_test.rb
index fc5064ad7d9805443b9a4db11c9ac53a54bd04d6..9682d6b288a0a3958f5bfa15e0daab3c68dd12c7 100644 (file)
--- a/test/models/trace_test.rb
+++ b/test/models/trace_test.rb
@@ -77,15 +77,15 @@ class TraceTest < ActiveSupport::TestCase
   def test_validations
     trace_valid({})
     trace_valid({ :user_id => nil }, :valid => false)
   def test_validations
     trace_valid({})
     trace_valid({ :user_id => nil }, :valid => false)

-    trace_valid(:name => "a" * 255)
+    trace_valid({ :name => "a" * 255 })

     trace_valid({ :name => "a" * 256 }, :valid => false)
     trace_valid({ :description => nil }, :valid => false)
     trace_valid({ :name => "a" * 256 }, :valid => false)
     trace_valid({ :description => nil }, :valid => false)

-    trace_valid(:description => "a" * 255)
+    trace_valid({ :description => "a" * 255 })

     trace_valid({ :description => "a" * 256 }, :valid => 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 => "private" })
+    trace_valid({ :visibility => "public" })
+    trace_valid({ :visibility => "trackable" })
+    trace_valid({ :visibility => "identifiable" })

     trace_valid({ :visibility => "foo" }, :valid => false)
   end
 
     trace_valid({ :visibility => "foo" }, :valid => false)
   end
 

diff --git a/test/models/tracetag_test.rb b/test/models/tracetag_test.rb
index 1aaa596d2d5412aa2cd7131ca1a1731cf24c03e0..0d2b17953a6c0e888796f3abee97aa05985f51cc 100644 (file)
--- a/test/models/tracetag_test.rb
+++ b/test/models/tracetag_test.rb
@@ -5,8 +5,8 @@ class TracetagTest < ActiveSupport::TestCase
     tracetag_valid({})
     tracetag_valid({ :tag => nil }, :valid => false)
     tracetag_valid({ :tag => "" }, :valid => false)
     tracetag_valid({})
     tracetag_valid({ :tag => nil }, :valid => false)
     tracetag_valid({ :tag => "" }, :valid => false)

-    tracetag_valid(:tag => "a")
-    tracetag_valid(:tag => "a" * 255)
+    tracetag_valid({ :tag => "a" })
+    tracetag_valid({ :tag => "a" * 255 })

     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" * 256 }, :valid => false)
     tracetag_valid({ :tag => "a/b" }, :valid => false)
     tracetag_valid({ :tag => "a;b" }, :valid => false)

diff --git a/test/test_helper.rb b/test/test_helper.rb
index da36be28b7f10bff08912e68b2252e740747a82f..a6147ef29054e817dbe27d7cd9b3c5a146dcf6a6 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -160,7 +160,7 @@ module ActiveSupport
 
       request.sign!(oauth)
 
 
       request.sign!(oauth)
 

-      method(method).call(request.signed_uri, options)
+      method(method).call(request.signed_uri, **options)

     end
 
     ##
     end
 
     ##