removing unused variables

rails · Nov 23, 2010 · 4d31ee1 · 4d31ee1
1 parent e83d153
commit 4d31ee1
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 12 deletions.
diff --git a/activerecord/lib/active_record/associations/through_association_scope.rb b/activerecord/lib/active_record/associations/through_association_scope.rb
@@ -16,7 +16,7 @@ def construct_find_scope
           :readonly   => @reflection.options[:readonly]
         }
       end
-      
+
       def construct_create_scope
         construct_owner_attributes(@reflection)
       end
@@ -51,7 +51,7 @@ def construct_from
 
       def construct_select(custom_select = nil)
         distinct = "DISTINCT " if @reflection.options[:uniq]
-        selected = custom_select || @reflection.options[:select] || "#{distinct}#{@reflection.quoted_table_name}.*"
+        custom_select || @reflection.options[:select] || "#{distinct}#{@reflection.quoted_table_name}.*"
       end
 
       def construct_joins(custom_joins = nil)

diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb
@@ -67,8 +67,7 @@ def test_create_from_association_should_respect_default_scope
   end
 
   def test_no_sql_should_be_fired_if_association_already_loaded
-    car = Car.create(:name => 'honda')
-    bulb = car.bulbs.create
+    Car.create(:name => 'honda')
     bulbs = Car.first.bulbs
     bulbs.inspect # to load all instances of bulbs
     assert_no_queries do

diff --git a/activerecord/test/cases/associations/has_many_through_associations_test.rb b/activerecord/test/cases/associations/has_many_through_associations_test.rb
@@ -354,7 +354,6 @@ def test_association_proxy_transaction_method_starts_transaction_in_association_
   end
 
   def test_has_many_association_through_a_belongs_to_association_where_the_association_doesnt_exist
-    author = authors(:mary)
     post = Post.create!(:title => "TITLE", :body => "BODY")
     assert_equal [], post.author_favorites
   end

diff --git a/activerecord/test/cases/associations/has_one_associations_test.rb b/activerecord/test/cases/associations/has_one_associations_test.rb
@@ -163,7 +163,6 @@ def test_exclusive_dependence
 
     firm = ExclusivelyDependentFirm.find(9)
     assert_not_nil firm.account
-    account_id = firm.account.id
     assert_equal [], Account.destroyed_account_ids[firm.id]
 
     firm.destroy
@@ -180,7 +179,7 @@ def test_dependence_with_nil_associate
   def test_dependence_with_restrict
     firm = RestrictedFirm.new(:name => 'restrict')
     firm.save!
-    account = firm.create_account(:credit_limit => 10)
+    firm.create_account(:credit_limit => 10)
     assert_not_nil firm.account
     assert_raise(ActiveRecord::DeleteRestrictionError) { firm.destroy }
   end
@@ -197,8 +196,8 @@ def test_successful_build_association
   def test_build_association_twice_without_saving_affects_nothing
     count_of_account = Account.count
     firm = Firm.find(:first)
-    account1 = firm.build_account("credit_limit" => 1000)
-    account2 = firm.build_account("credit_limit" => 2000)
+    firm.build_account("credit_limit" => 1000)
+    firm.build_account("credit_limit" => 2000)
 
     assert_equal count_of_account, Account.count
   end

diff --git a/activerecord/test/cases/associations/inverse_associations_test.rb b/activerecord/test/cases/associations/inverse_associations_test.rb
@@ -484,7 +484,6 @@ def test_eager_loaded_child_instance_should_be_shared_with_parent_on_find
 
   def test_child_instance_should_be_shared_with_replaced_via_accessor_parent
     face = faces(:confused)
-    old_man = face.polymorphic_man
     new_man = Man.new
 
     assert_not_nil face.polymorphic_man
@@ -499,7 +498,6 @@ def test_child_instance_should_be_shared_with_replaced_via_accessor_parent
 
   def test_child_instance_should_be_shared_with_replaced_via_method_parent
     face = faces(:confused)
-    old_man = face.polymorphic_man
     new_man = Man.new
 
     assert_not_nil face.polymorphic_man

diff --git a/activerecord/test/cases/associations/join_model_test.rb b/activerecord/test/cases/associations/join_model_test.rb
@@ -642,7 +642,7 @@ def test_preload_polymorph_many_types
 
   def test_preload_nil_polymorphic_belongs_to
     assert_nothing_raised do
-      taggings = Tagging.find(:all, :include => :taggable, :conditions => ['taggable_type IS NULL'])
+      Tagging.find(:all, :include => :taggable, :conditions => ['taggable_type IS NULL'])
     end
   end