Ticket #10630: instance_variable_names.diff

actionmailer/test/adv_attr_test.rb

@@ +1 @@
+require File.dirname(__FILE__) + '/abstract_unit'
+require 'action_mailer/adv_attr_accessor'
+
+class AdvAttrTest < Test::Unit::TestCase
+  class Person
+    include ActionMailer::AdvAttrAccessor
+    adv_attr_accessor :name
+  end
+
+  def test_adv_attr
+    bob = Person.new
+    assert_nil bob.name
+    bob.name 'Bob'
+    assert_equal 'Bob', bob.name
+    
+    assert_raise(ArgumentError) {bob.name 'x', 'y'}    
+  end
+  
+  
+end

actionmailer/lib/action_mailer/adv_attr_accessor.rb

@@ -16 +16 @@
-          define_method(name) do |*parameters|
-            raise ArgumentError, "expected 0 or 1 parameters" unless parameters.length <= 1
-            if parameters.empty?
-
+_name
-                instance_variable_get(ivar)
-              end
-            else

activesupport/test/core_ext/object_and_class_ext_test.rb

@@ -182 +182 @@
-    @source.instance_variable_set(:@baz, 'baz')
-  end
-
+  def test_instance_variable_names
+    assert_equal %w(@bar @baz), @source.instance_variable_names.sort
+  end
+  
-  def test_instance_variable_defined
-    assert @source.instance_variable_defined?('@bar')
-    assert @source.instance_variable_defined?(:@bar)

activesupport/lib/active_support/core_ext/object/instance_variables.rb

@@ -12 +12 @@
-      values
-    end
-  end
+  
+  def instance_variable_names
+    instance_variables.map(&:to_s)
+  end
-
-  def copy_instance_variables_from(object, exclude = []) #:nodoc:
-    exclude += object.protected_instance_variables if object.respond_to? :protected_instance_variables

activerecord/test/associations/inner_join_association_test.rb

@@ -67 +67 @@
-  def test_find_with_implicit_inner_joins_does_not_set_associations
-    authors = Author.find(:all, :select => 'authors.*', :joins => :posts)
-    assert !authors.empty?, "expected authors to be non-empty"
-
+_name
-  end
-  
-  def test_count_honors_implicit_inner_joins

actionpack/test/controller/new_render_test.rb

@@ -495 +495 @@
-    ActionController::Base.protected_variables_cache = nil
-
-    get :hello_world
+    assert !assigns.include?('_request'), '_request should not be in assigns'
-    assert !assigns.include?('request'), 'request should not be in assigns'
-
-    ActionController::Base.view_controller_internals = true

actionpack/lib/action_controller/base.rb

@@ -1210 +1210 @@
-
-      def add_instance_variables_to_assigns
-        @@protected_variables_cache ||= Set.new(protected_instance_variables)
-
+_name
-          next if @@protected_variables_cache.include?(var)
-          @assigns[var[1..-1]] = instance_variable_get(var)
-        end

actionpack/lib/action_controller/test_process.rb

@@ -373 +373 @@
-      # Sanity check for required instance variables so we can give an
-      # understandable error message.
-      %w(@controller @request @response).each do |iv_name|
-s.include?(iv_name) || instance_variabl
+_names.include?(iv_name) || instance_variable_nam
-          raise "#{iv_name} is nil: make sure you set it in your test's setup method."
-        end
-      end