aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-09-09 21:50:10 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2011-09-09 21:50:10 -0700
commitf43ffdcb9677d4fbe03ccd83a4c427b57ccd15f0 (patch)
treec6524de33c4c2702b90d416ccd14bb1317dafe5b
parent0f04260c514fe0a58adb57f3b8d69f12f18cfe9e (diff)
parentfb73be84695d700f11673ba92f29dfeef3659a37 (diff)
downloadrails-f43ffdcb9677d4fbe03ccd83a4c427b57ccd15f0.tar.gz
rails-f43ffdcb9677d4fbe03ccd83a4c427b57ccd15f0.tar.bz2
rails-f43ffdcb9677d4fbe03ccd83a4c427b57ccd15f0.zip
Merge pull request #2966 from arunagw/no_use_warnings_removed
Not used variables removed. Warnings removed.
-rw-r--r--activerecord/test/cases/relations_test.rb2
-rw-r--r--activeresource/test/cases/base/load_test.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index b491d63047..0f50ac9a2b 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -938,7 +938,7 @@ class RelationTest < ActiveRecord::TestCase
def test_first_or_create_bang_with_invalid_block
assert_raise(ActiveRecord::RecordInvalid) do
- parrot = Bird.where(:color => 'green').first_or_create! { |bird| bird.pirate_id = 1 }
+ Bird.where(:color => 'green').first_or_create! { |bird| bird.pirate_id = 1 }
end
end
diff --git a/activeresource/test/cases/base/load_test.rb b/activeresource/test/cases/base/load_test.rb
index 0bbd3ab5f5..784e7dd036 100644
--- a/activeresource/test/cases/base/load_test.rb
+++ b/activeresource/test/cases/base/load_test.rb
@@ -66,11 +66,11 @@ class BaseLoadTest < Test::Unit::TestCase
end
def test_load_hash_with_integers_as_keys
- assert_nothing_raised{person = @person.load(@books)}
+ assert_nothing_raised{@person.load(@books)}
end
def test_load_hash_with_dates_as_keys
- assert_nothing_raised{person = @person.load(@books_date)}
+ assert_nothing_raised{@person.load(@books_date)}
end
def test_load_expects_hash