modernizes hash syntax in activerecord

1 files changed, 24 insertions, 24 deletions

diff --git a/activerecord/test/cases/associations/has_one_through_associations_test.rb b/activerecord/test/cases/associations/has_one_through_associations_test.rb
index ef1cc3b27a..3a7f48fbb7 100644
--- a/activerecord/test/cases/associations/has_one_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_one_through_associations_test.rb
@@ -34,14 +34,14 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_creating_association_creates_through_record
-    new_member = Member.create(:name => "Chris")
-    new_member.club = Club.create(:name => "LRUG")
+    new_member = Member.create(name: "Chris")
+    new_member.club = Club.create(name: "LRUG")
     assert_not_nil new_member.current_membership
     assert_not_nil new_member.club
   end
 
   def test_creating_association_builds_through_record_for_new
-    new_member = Member.new(:name => "Jane")
+    new_member = Member.new(name: "Jane")
     new_member.club = clubs(:moustache_club)
     assert new_member.current_membership
     assert_equal clubs(:moustache_club), new_member.current_membership.club
@@ -65,7 +65,7 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_replace_target_record
-    new_club = Club.create(:name => "Marx Bros")
+    new_club = Club.create(name: "Marx Bros")
     @member.club = new_club
     @member.reload
     assert_equal new_club, @member.club
@@ -73,7 +73,7 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
 
   def test_replacing_target_record_deletes_old_association
     assert_no_difference "Membership.count" do
-      new_club = Club.create(:name => "Bananarama")
+      new_club = Club.create(name: "Bananarama")
       @member.club = new_club
       @member.reload
     end
@@ -92,7 +92,7 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
 
   def test_has_one_through_eager_loading
     members = assert_queries(3) do #base table, through table, clubs table
-      Member.all.merge!(:includes => :club, :where => ["name = ?", "Groucho Marx"]).to_a
+      Member.all.merge!(includes: :club, where: ["name = ?", "Groucho Marx"]).to_a
     end
     assert_equal 1, members.size
     assert_not_nil assert_no_queries {members[0].club}
@@ -100,7 +100,7 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
 
   def test_has_one_through_eager_loading_through_polymorphic
     members = assert_queries(3) do #base table, through table, clubs table
-      Member.all.merge!(:includes => :sponsor_club, :where => ["name = ?", "Groucho Marx"]).to_a
+      Member.all.merge!(includes: :sponsor_club, where: ["name = ?", "Groucho Marx"]).to_a
     end
     assert_equal 1, members.size
     assert_not_nil assert_no_queries {members[0].sponsor_club}
@@ -108,14 +108,14 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
 
   def test_has_one_through_with_conditions_eager_loading
     # conditions on the through table
-    assert_equal clubs(:moustache_club), Member.all.merge!(:includes => :favourite_club).find(@member.id).favourite_club
+    assert_equal clubs(:moustache_club), Member.all.merge!(includes: :favourite_club).find(@member.id).favourite_club
     memberships(:membership_of_favourite_club).update_columns(favourite: false)
-    assert_equal nil,                    Member.all.merge!(:includes => :favourite_club).find(@member.id).reload.favourite_club
+    assert_equal nil,                    Member.all.merge!(includes: :favourite_club).find(@member.id).reload.favourite_club
 
     # conditions on the source table
-    assert_equal clubs(:moustache_club), Member.all.merge!(:includes => :hairy_club).find(@member.id).hairy_club
+    assert_equal clubs(:moustache_club), Member.all.merge!(includes: :hairy_club).find(@member.id).hairy_club
     clubs(:moustache_club).update_columns(name: "Association of Clean-Shaven Persons")
-    assert_equal nil,                    Member.all.merge!(:includes => :hairy_club).find(@member.id).reload.hairy_club
+    assert_equal nil,                    Member.all.merge!(includes: :hairy_club).find(@member.id).reload.hairy_club
   end
 
   def test_has_one_through_polymorphic_with_source_type
@@ -123,14 +123,14 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_eager_has_one_through_polymorphic_with_source_type
-    clubs = Club.all.merge!(:includes => :sponsored_member, :where => ["name = ?","Moustache and Eyebrow Fancier Club"]).to_a
+    clubs = Club.all.merge!(includes: :sponsored_member, where: ["name = ?","Moustache and Eyebrow Fancier Club"]).to_a
     # Only the eyebrow fanciers club has a sponsored_member
     assert_not_nil assert_no_queries {clubs[0].sponsored_member}
   end
 
   def test_has_one_through_nonpreload_eagerloading
     members = assert_queries(1) do
-      Member.all.merge!(:includes => :club, :where => ["members.name = ?", "Groucho Marx"], :order => "clubs.name").to_a #force fallback
+      Member.all.merge!(includes: :club, where: ["members.name = ?", "Groucho Marx"], order: "clubs.name").to_a #force fallback
     end
     assert_equal 1, members.size
     assert_not_nil assert_no_queries {members[0].club}
@@ -138,16 +138,16 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
 
   def test_has_one_through_nonpreload_eager_loading_through_polymorphic
     members = assert_queries(1) do
-      Member.all.merge!(:includes => :sponsor_club, :where => ["members.name = ?", "Groucho Marx"], :order => "clubs.name").to_a #force fallback
+      Member.all.merge!(includes: :sponsor_club, where: ["members.name = ?", "Groucho Marx"], order: "clubs.name").to_a #force fallback
     end
     assert_equal 1, members.size
     assert_not_nil assert_no_queries {members[0].sponsor_club}
   end
 
   def test_has_one_through_nonpreload_eager_loading_through_polymorphic_with_more_than_one_through_record
-    Sponsor.new(:sponsor_club => clubs(:crazy_club), :sponsorable => members(:groucho)).save!
+    Sponsor.new(sponsor_club: clubs(:crazy_club), sponsorable: members(:groucho)).save!
     members = assert_queries(1) do
-      Member.all.merge!(:includes => :sponsor_club, :where => ["members.name = ?", "Groucho Marx"], :order => "clubs.name DESC").to_a #force fallback
+      Member.all.merge!(includes: :sponsor_club, where: ["members.name = ?", "Groucho Marx"], order: "clubs.name DESC").to_a #force fallback
     end
     assert_equal 1, members.size
     assert_not_nil assert_no_queries { members[0].sponsor_club }
@@ -159,8 +159,8 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
   end
 
   def test_assigning_association_correctly_assigns_target
-    new_member = Member.create(:name => "Chris")
-    new_member.club = new_club = Club.create(:name => "LRUG")
+    new_member = Member.create(name: "Chris")
+    new_member.club = new_club = Club.create(name: "LRUG")
     assert_equal new_club, new_member.association(:club).target
   end
 
@@ -177,7 +177,7 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
   def test_assigning_to_has_one_through_preserves_decorated_join_record
     @organization = organizations(:nsa)
     assert_difference "MemberDetail.count", 1 do
-      @member_detail = MemberDetail.new(:extra_data => "Extra")
+      @member_detail = MemberDetail.new(extra_data: "Extra")
       @member.member_detail = @member_detail
       @member.organization = @organization
     end
@@ -191,7 +191,7 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
     @new_organization = organizations(:discordians)
 
     assert_difference "MemberDetail.count", 1 do
-      @member_detail = MemberDetail.new(:extra_data => "Extra")
+      @member_detail = MemberDetail.new(extra_data: "Extra")
       @member.member_detail = @member_detail
       @member.organization = @organization
     end
@@ -217,7 +217,7 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
     @member.member_detail = @member_detail
     @member.organization = @organization
     @member_details = assert_queries(3) do
-      MemberDetail.all.merge!(:includes => :member_type).to_a
+      MemberDetail.all.merge!(includes: :member_type).to_a
     end
     @new_detail = @member_details[0]
     assert @new_detail.send(:association, :member_type).loaded?
@@ -230,19 +230,19 @@ class HasOneThroughAssociationsTest < ActiveRecord::TestCase
 
     assert_nothing_raised do
       Club.find(@club.id).save!
-      Club.all.merge!(:includes => :sponsored_member).find(@club.id).save!
+      Club.all.merge!(includes: :sponsored_member).find(@club.id).save!
     end
 
     @club.sponsor.destroy
 
     assert_nothing_raised do
       Club.find(@club.id).save!
-      Club.all.merge!(:includes => :sponsored_member).find(@club.id).save!
+      Club.all.merge!(includes: :sponsored_member).find(@club.id).save!
     end
   end
 
   def test_through_belongs_to_after_destroy
-    @member_detail = MemberDetail.new(:extra_data => "Extra")
+    @member_detail = MemberDetail.new(extra_data: "Extra")
     @member.member_detail = @member_detail
     @member.save!