diff options
author | Arun Agrawal <arunagw@gmail.com> | 2013-05-24 11:20:20 +0200 |
---|---|---|
committer | Arun Agrawal <arunagw@gmail.com> | 2013-05-24 11:20:20 +0200 |
commit | b75c8e58ab2ea055324c6f95127b5b940e758d57 (patch) | |
tree | fa6a485a4f6c0144728f27653365e53fdb83d903 | |
parent | d29399061e54092fdbf57780c38e19dd1921f45d (diff) | |
download | rails-b75c8e58ab2ea055324c6f95127b5b940e758d57.tar.gz rails-b75c8e58ab2ea055324c6f95127b5b940e758d57.tar.bz2 rails-b75c8e58ab2ea055324c6f95127b5b940e758d57.zip |
Using 1.8.7 syntax for 3-2-stable
-rw-r--r-- | activerecord/test/cases/associations/has_many_associations_test.rb | 2 | ||||
-rw-r--r-- | activerecord/test/cases/autosave_association_test.rb | 8 | ||||
-rw-r--r-- | activerecord/test/models/person.rb | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb index 8fd9de07c9..a75d064ac0 100644 --- a/activerecord/test/cases/associations/has_many_associations_test.rb +++ b/activerecord/test/cases/associations/has_many_associations_test.rb @@ -1496,7 +1496,7 @@ class HasManyAssociationsTest < ActiveRecord::TestCase david = people(:david) assert_equal ["A Modest Proposal"], david.essays.map(&:name) - david.essays = [Essay.create!(name: "Remote Work" )] + david.essays = [Essay.create!(:name => "Remote Work" )] assert_equal ["Remote Work"], david.essays.map(&:name) end diff --git a/activerecord/test/cases/autosave_association_test.rb b/activerecord/test/cases/autosave_association_test.rb index bb07cf4185..f7697fa77b 100644 --- a/activerecord/test/cases/autosave_association_test.rb +++ b/activerecord/test/cases/autosave_association_test.rb @@ -781,17 +781,17 @@ class TestDestroyAsPartOfAutosaveAssociation < ActiveRecord::TestCase end def test_should_save_new_record_that_has_same_value_as_existing_record_marked_for_destruction_on_field_that_has_unique_index - Bird.connection.add_index :birds, :name, unique: true + Bird.connection.add_index :birds, :name, :unique => true - 3.times { |i| @pirate.birds.create(name: "unique_birds_#{i}") } + 3.times { |i| @pirate.birds.create(:name => "unique_birds_#{i}") } @pirate.birds[0].mark_for_destruction - @pirate.birds.build(name: @pirate.birds[0].name) + @pirate.birds.build(:name => @pirate.birds[0].name) @pirate.save! assert_equal 3, @pirate.birds.reload.length ensure - Bird.connection.remove_index :birds, column: :name + Bird.connection.remove_index :birds, :column => :name end # Add and remove callbacks tests for association collections. diff --git a/activerecord/test/models/person.rb b/activerecord/test/models/person.rb index 3a7a730a1a..d316a0b992 100644 --- a/activerecord/test/models/person.rb +++ b/activerecord/test/models/person.rb @@ -27,7 +27,7 @@ class Person < ActiveRecord::Base has_many :agents_posts, :through => :agents, :source => :posts has_many :agents_posts_authors, :through => :agents_posts, :source => :author - has_many :essays, primary_key: "first_name", foreign_key: "writer_id" + has_many :essays, :primary_key => "first_name", :foreign_key => "writer_id" scope :males, :conditions => { :gender => 'M' } scope :females, :conditions => { :gender => 'F' } |