modernizes hash syntax in activerecord

1 files changed, 53 insertions, 53 deletions

diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 96de9fe8d5..e26b2445b8 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -295,7 +295,7 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_create_after_initialize_without_block
-    cb = CustomBulb.create(:name => "Dude")
+    cb = CustomBulb.create(name: "Dude")
     assert_equal("Dude", cb.name)
     assert_equal(true, cb.frickinawesome)
   end
@@ -315,13 +315,13 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_load
-    topics = Topic.all.merge!(:order => "id").to_a
+    topics = Topic.all.merge!(order: "id").to_a
     assert_equal(5, topics.size)
     assert_equal(topics(:first).title, topics.first.title)
   end
 
   def test_load_with_condition
-    topics = Topic.all.merge!(:where => "author_name = 'Mary'").to_a
+    topics = Topic.all.merge!(where: "author_name = 'Mary'").to_a
 
     assert_equal(1, topics.size)
     assert_equal(topics(:second).title, topics.first.title)
@@ -443,7 +443,7 @@ class BasicsTest < ActiveRecord::TestCase
 
   if current_adapter?(:Mysql2Adapter)
     def test_update_all_with_order_and_limit
-      assert_equal 1, Topic.limit(1).order("id DESC").update_all(:content => "bulk updated!")
+      assert_equal 1, Topic.limit(1).order("id DESC").update_all(content: "bulk updated!")
     end
   end
 
@@ -536,7 +536,7 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_equality_of_destroyed_records
-    topic_1 = Topic.new(:title => "test_1")
+    topic_1 = Topic.new(title: "test_1")
     topic_1.save
     topic_2 = Topic.find(topic_1.id)
     topic_1.destroy
@@ -545,8 +545,8 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_equality_with_blank_ids
-    one = Subscriber.new(:id => "")
-    two = Subscriber.new(:id => "")
+    one = Subscriber.new(id: "")
+    two = Subscriber.new(id: "")
     assert_equal one, two
   end
 
@@ -604,7 +604,7 @@ class BasicsTest < ActiveRecord::TestCase
 
   def test_create_without_prepared_statement
     topic = Topic.connection.unprepared_statement do
-      Topic.create(:title => "foo")
+      Topic.create(title: "foo")
     end
 
     assert_equal topic, Topic.find(topic.id)
@@ -621,7 +621,7 @@ class BasicsTest < ActiveRecord::TestCase
 
   def test_comparison_with_different_objects
     topic = Topic.create
-    category = Category.create(:name => "comparison")
+    category = Category.create(name: "comparison")
     assert_nil topic <=> category
   end
 
@@ -635,7 +635,7 @@ class BasicsTest < ActiveRecord::TestCase
   def test_readonly_attributes
     assert_equal Set.new([ "title" , "comments_count" ]), ReadonlyTitlePost.readonly_attributes
 
-    post = ReadonlyTitlePost.create(:title => "cannot change this", :body => "changeable")
+    post = ReadonlyTitlePost.create(title: "cannot change this", body: "changeable")
     post.reload
     assert_equal "cannot change this", post.title
 
@@ -647,7 +647,7 @@ class BasicsTest < ActiveRecord::TestCase
 
   def test_unicode_column_name
     Weird.reset_column_information
-    weird = Weird.create(:なまえ => "たこ焼き仮面")
+    weird = Weird.create(なまえ: "たこ焼き仮面")
     assert_equal "たこ焼き仮面", weird.なまえ
   end
 
@@ -790,7 +790,7 @@ class BasicsTest < ActiveRecord::TestCase
   def test_dup_with_aggregate_of_same_name_as_attribute
     developer_with_aggregate = Class.new(ActiveRecord::Base) do
       self.table_name = "developers"
-      composed_of :salary, :class_name => "BasicsTest::DeveloperSalary", :mapping => [%w(salary amount)]
+      composed_of :salary, class_name: "BasicsTest::DeveloperSalary", mapping: [%w(salary amount)]
     end
 
     dev = developer_with_aggregate.find(1)
@@ -837,7 +837,7 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_clone_of_new_object_marks_attributes_as_dirty
-    developer = Developer.new :name => "Bjorn", :salary => 100000
+    developer = Developer.new name: "Bjorn", salary: 100000
     assert developer.name_changed?
     assert developer.salary_changed?
 
@@ -847,7 +847,7 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_clone_of_new_object_marks_as_dirty_only_changed_attributes
-    developer = Developer.new :name => "Bjorn"
+    developer = Developer.new name: "Bjorn"
     assert developer.name_changed?            # obviously
     assert !developer.salary_changed?         # attribute has non-nil default value, so treated as not changed
 
@@ -857,7 +857,7 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_dup_of_saved_object_marks_attributes_as_dirty
-    developer = Developer.create! :name => "Bjorn", :salary => 100000
+    developer = Developer.create! name: "Bjorn", salary: 100000
     assert !developer.name_changed?
     assert !developer.salary_changed?
 
@@ -867,7 +867,7 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_dup_of_saved_object_marks_as_dirty_only_changed_attributes
-    developer = Developer.create! :name => "Bjorn"
+    developer = Developer.create! name: "Bjorn"
     assert !developer.name_changed?           # both attributes of saved object should be treated as not changed
     assert !developer.salary_changed?
 
@@ -911,10 +911,10 @@ class BasicsTest < ActiveRecord::TestCase
 
   def test_big_decimal_conditions
     m = NumericData.new(
-      :bank_balance => 1586.43,
-      :big_bank_balance => BigDecimal("1000234000567.95"),
-      :world_population => 6000000000,
-      :my_house_population => 3
+      bank_balance: 1586.43,
+      big_bank_balance: BigDecimal("1000234000567.95"),
+      world_population: 6000000000,
+      my_house_population: 3
     )
     assert m.save
     assert_equal 0, NumericData.where("bank_balance > ?", 2000.0).count
@@ -922,10 +922,10 @@ class BasicsTest < ActiveRecord::TestCase
 
   def test_numeric_fields
     m = NumericData.new(
-      :bank_balance => 1586.43,
-      :big_bank_balance => BigDecimal("1000234000567.95"),
-      :world_population => 6000000000,
-      :my_house_population => 3
+      bank_balance: 1586.43,
+      big_bank_balance: BigDecimal("1000234000567.95"),
+      world_population: 6000000000,
+      my_house_population: 3
     )
     assert m.save
 
@@ -950,10 +950,10 @@ class BasicsTest < ActiveRecord::TestCase
 
   def test_numeric_fields_with_scale
     m = NumericData.new(
-      :bank_balance => 1586.43122334,
-      :big_bank_balance => BigDecimal("234000567.952344"),
-      :world_population => 6000000000,
-      :my_house_population => 3
+      bank_balance: 1586.43122334,
+      big_bank_balance: BigDecimal("234000567.952344"),
+      world_population: 6000000000,
+      my_house_population: 3
     )
     assert m.save
 
@@ -999,10 +999,10 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_quoting_arrays
-    replies = Reply.all.merge!(:where => [ "id IN (?)", topics(:first).replies.collect(&:id) ]).to_a
+    replies = Reply.all.merge!(where: [ "id IN (?)", topics(:first).replies.collect(&:id) ]).to_a
     assert_equal topics(:first).replies.size, replies.size
 
-    replies = Reply.all.merge!(:where => [ "id IN (?)", [] ]).to_a
+    replies = Reply.all.merge!(where: [ "id IN (?)", [] ]).to_a
     assert_equal 0, replies.size
   end
 
@@ -1149,17 +1149,17 @@ class BasicsTest < ActiveRecord::TestCase
 
   def test_no_limit_offset
     assert_nothing_raised do
-      Developer.all.merge!(:offset => 2).to_a
+      Developer.all.merge!(offset: 2).to_a
     end
   end
 
   def test_find_last
     last  = Developer.last
-    assert_equal last, Developer.all.merge!(:order => "id desc").first
+    assert_equal last, Developer.all.merge!(order: "id desc").first
   end
 
   def test_last
-    assert_equal Developer.all.merge!(:order => "id desc").first, Developer.last
+    assert_equal Developer.all.merge!(order: "id desc").first, Developer.last
   end
 
   def test_all
@@ -1169,37 +1169,37 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_all_with_conditions
-    assert_equal Developer.all.merge!(:order => "id desc").to_a, Developer.order("id desc").to_a
+    assert_equal Developer.all.merge!(order: "id desc").to_a, Developer.order("id desc").to_a
   end
 
   def test_find_ordered_last
-    last  = Developer.all.merge!(:order => "developers.salary ASC").last
-    assert_equal last, Developer.all.merge!(:order => "developers.salary ASC").to_a.last
+    last  = Developer.all.merge!(order: "developers.salary ASC").last
+    assert_equal last, Developer.all.merge!(order: "developers.salary ASC").to_a.last
   end
 
   def test_find_reverse_ordered_last
-    last  = Developer.all.merge!(:order => "developers.salary DESC").last
-    assert_equal last, Developer.all.merge!(:order => "developers.salary DESC").to_a.last
+    last  = Developer.all.merge!(order: "developers.salary DESC").last
+    assert_equal last, Developer.all.merge!(order: "developers.salary DESC").to_a.last
   end
 
   def test_find_multiple_ordered_last
-    last  = Developer.all.merge!(:order => "developers.name, developers.salary DESC").last
-    assert_equal last, Developer.all.merge!(:order => "developers.name, developers.salary DESC").to_a.last
+    last  = Developer.all.merge!(order: "developers.name, developers.salary DESC").last
+    assert_equal last, Developer.all.merge!(order: "developers.name, developers.salary DESC").to_a.last
   end
 
   def test_find_keeps_multiple_order_values
-    combined = Developer.all.merge!(:order => "developers.name, developers.salary").to_a
-    assert_equal combined, Developer.all.merge!(:order => ["developers.name", "developers.salary"]).to_a
+    combined = Developer.all.merge!(order: "developers.name, developers.salary").to_a
+    assert_equal combined, Developer.all.merge!(order: ["developers.name", "developers.salary"]).to_a
   end
 
   def test_find_keeps_multiple_group_values
-    combined = Developer.all.merge!(:group => "developers.name, developers.salary, developers.id, developers.created_at, developers.updated_at, developers.created_on, developers.updated_on").to_a
-    assert_equal combined, Developer.all.merge!(:group => ["developers.name", "developers.salary", "developers.id", "developers.created_at", "developers.updated_at", "developers.created_on", "developers.updated_on"]).to_a
+    combined = Developer.all.merge!(group: "developers.name, developers.salary, developers.id, developers.created_at, developers.updated_at, developers.created_on, developers.updated_on").to_a
+    assert_equal combined, Developer.all.merge!(group: ["developers.name", "developers.salary", "developers.id", "developers.created_at", "developers.updated_at", "developers.created_on", "developers.updated_on"]).to_a
   end
 
   def test_find_symbol_ordered_last
-    last  = Developer.all.merge!(:order => :salary).last
-    assert_equal last, Developer.all.merge!(:order => :salary).to_a.last
+    last  = Developer.all.merge!(order: :salary).last
+    assert_equal last, Developer.all.merge!(order: :salary).to_a.last
   end
 
   def test_abstract_class_table_name
@@ -1210,7 +1210,7 @@ class BasicsTest < ActiveRecord::TestCase
     old_class = LooseDescendant
     Object.send :remove_const, :LooseDescendant
 
-    descendant = old_class.create! :first_name => "bob"
+    descendant = old_class.create! first_name: "bob"
     assert_not_nil LoosePerson.find(descendant.id), "Should have found instance of LooseDescendant when finding abstract LoosePerson: #{descendant.inspect}"
   ensure
     unless Object.const_defined?(:LooseDescendant)
@@ -1230,9 +1230,9 @@ class BasicsTest < ActiveRecord::TestCase
     log = StringIO.new
     ActiveRecord::Base.logger = ActiveSupport::Logger.new(log)
     ActiveRecord::Base.logger.level = Logger::WARN
-    ActiveRecord::Base.benchmark("Debug Topic Count", :level => :debug) { Topic.count }
-    ActiveRecord::Base.benchmark("Warn Topic Count",  :level => :warn)  { Topic.count }
-    ActiveRecord::Base.benchmark("Error Topic Count", :level => :error) { Topic.count }
+    ActiveRecord::Base.benchmark("Debug Topic Count", level: :debug) { Topic.count }
+    ActiveRecord::Base.benchmark("Warn Topic Count",  level: :warn)  { Topic.count }
+    ActiveRecord::Base.benchmark("Error Topic Count", level: :error) { Topic.count }
     assert_no_match(/Debug Topic Count/, log.string)
     assert_match(/Warn Topic Count/, log.string)
     assert_match(/Error Topic Count/, log.string)
@@ -1245,7 +1245,7 @@ class BasicsTest < ActiveRecord::TestCase
     log = StringIO.new
     ActiveRecord::Base.logger = ActiveSupport::Logger.new(log)
     ActiveRecord::Base.logger.level = Logger::DEBUG
-    ActiveRecord::Base.benchmark("Logging", :level => :debug, :silence => false)  { ActiveRecord::Base.logger.debug "Quiet" }
+    ActiveRecord::Base.benchmark("Logging", level: :debug, silence: false)  { ActiveRecord::Base.logger.debug "Quiet" }
     assert_match(/Quiet/, log.string)
   ensure
     ActiveRecord::Base.logger = original_logger
@@ -1367,7 +1367,7 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_touch_should_raise_error_on_a_new_object
-    company = Company.new(:rating => 1, :name => "37signals", :firm_name => "37signals")
+    company = Company.new(rating: 1, name: "37signals", firm_name: "37signals")
     assert_raises(ActiveRecord::ActiveRecordError) do
       company.touch :updated_at
     end
@@ -1411,7 +1411,7 @@ class BasicsTest < ActiveRecord::TestCase
   end
 
   def test_slice
-    company = Company.new(:rating => 1, :name => "37signals", :firm_name => "37signals")
+    company = Company.new(rating: 1, name: "37signals", firm_name: "37signals")
     hash = company.slice(:name, :rating, "arbitrary_method")
     assert_equal hash[:name], company.name
     assert_equal hash["name"], company.name