Ticket #8521: test_superclasses.diff

actionmailer/lib/action_mailer/mailer_test.rb

@@ +1 @@
+require 'rails_test'
+
+module ActionMailer
+  class MailerTest < ::RailsTest #:nodoc:
+    include ActionController::UrlWriter
+    include ActionMailer::Quoting
+    
+    CHARSET = "utf-8"
+    
+    def setup_with_mailer_initialisation
+      setup_without_mailer_initialisation
+      
+      ActionMailer::Base.delivery_method = :test
+      ActionMailer::Base.perform_deliveries = true
+      ActionMailer::Base.deliveries = []
+
+      @expected = TMail::Mail.new
+      @expected.set_content_type "text", "plain", { "charset" => CHARSET }
+      @expected.mime_version = '1.0'
+    end
+
+    alias_method_chain :setup, :mailer_initialisation
+    
+    def self.method_added(method)
+      if method.to_s == 'setup' && !method_defined?(:user_defined_setup)
+        alias_method :user_defined_setup, :setup
+        define_method(:setup) do
+          rails_internal_setup
+          user_defined_setup
+        end
+      end
+      
+      super(method)
+    end
+  
+    protected
+      def read_fixture(action)
+        IO.readlines("#{self.class.fixture_path}#{self.class.to_s.gsub("Test", "").underscore}/#{action}")
+      end
+
+      def encode(subject)
+        quoted_printable(subject, CHARSET)
+      end
+  end
+end

actionpack/lib/action_controller/controller_test.rb

@@ +1 @@
+require 'rails_test'
+
+module ActionController
+  class ControllerTest < ::RailsTest #:nodoc:
+    def setup
+      @controller = self.class.controller_class.new
+      @request    = ActionController::TestRequest.new
+      @response   = ActionController::TestResponse.new
+    end
+    
+    alias_method :rails_internal_setup, :setup
+          
+    class << self
+      def method_added(method)
+        if method.to_s == 'setup' && !method_defined?(:user_defined_setup)
+          alias_method :user_defined_setup, :setup
+          define_method(:setup) do
+            rails_internal_setup
+            user_defined_setup
+          end
+        end
+
+        super(method)
+      end
+      
+      def controller_class
+        return @controller_class if @controller_class
+
+        @controller_class = case @controller_class_or_symbol
+          when nil then controller_class_from_test_class_name
+          when Symbol then controller_class_from_symbol
+          else @controller_class_or_symbol
+        end
+        
+        @controller_class.send(:define_method, :rescue_action) { |e| raise e }
+        @controller_class
+      end
+
+      def controller_class_from_symbol
+        "#{@controller_class_or_symbol}Controller".camelize.constantize
+      end
+
+      def controller_class_from_test_class_name
+        self.to_s.gsub("Test", "").constantize
+      end
+      
+      def controller(controller_class_or_symbol)
+        @controller_class_or_symbol = controller_class_or_symbol
+      end
+    end
+  end
+end

actionpack/lib/action_controller/integration.rb

@@ -2 +2 @@
-require 'stringio'
-require 'uri'
-require 'action_controller/test_process'
+require 'rails_test'
-
-module ActionController
-  module Integration #:nodoc:
@@ -444 +445 @@
-  #         end
-  #       end
-  #   end
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    # Reset the current session. This is useful for testing multiple sessions
-    # in a single test case.
-    def reset!

railties/lib/rails_generator/generators/components/controller/templates/functional_test.rb

@@ -1 +1 @@
-require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper'
-require '<%= file_path %>_controller'
-
-
-
-
-
-
-
-
-
-
-
+
-  # Replace this with your real tests.
-  def test_truth
-    assert true

railties/lib/rails_generator/generators/components/mailer/templates/unit_test.rb

@@ -1 +1 @@
-require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-<% for action in actions -%>
-  def test_<%= action %>
-    @expected.subject = '<%= class_name %>#<%= action %>'
@@ -26 +11 @@
-  end
-
-<% end -%>
-  private
-    def read_fixture(action)
-      IO.readlines("#{FIXTURES_PATH}/<%= file_path %>/#{action}")
-    end
-
-    def encode(subject)
-      quoted_printable(subject, CHARSET)
-    end
-end

railties/lib/test_help.rb

@@ -7 +7 @@
-require 'test/unit'
-require 'active_record/fixtures'
-require 'action_controller/test_process'
+require 'rails_test'
+require 'action_mailer/mailer_test'
+require 'action_controller/controller_test'
-require 'action_controller/integration'
-
-Test::Unit::TestCase.fixture_path = RAILS_ROOT + "/test/fixtures/"
-ActionController::IntegrationTest.fixture_path = Test::Unit::TestCase.fixture_path
-
-def create_fixtures(*table_names)
-  Fixtures.create_fixtures(RAILS_ROOT + "/test/fixtures", table_names)

railties/lib/rails_test.rb

@@ +1 @@
+class RailsTest < Test::Unit::TestCase #:nodoc:
+  # Work around a bug in test/unit caused by the default test being named
+  # as a symbol (:default_test), which causes regex test filters
+  # (like "ruby test.rb -n /foo/") to fail because =~ doesn't work on
+  # symbols.
+  def initialize(name) #:nodoc:
+    super(name.to_s)
+  end
+
+  # Work around test/unit's requirement that every subclass of TestCase have
+  # at least one test method. Note that this implementation extends to all
+  # subclasses, as well, so subclasses of RailsTest may also exist
+  # without any test methods.
+  def run(*args) #:nodoc:
+    return if @method_name == "default_test"
+    super   
+  end
+  
+  # Because of how use_instantiated_fixtures, use_transactional_fixtures
+  # and fixture_path are defined, we need to treat them as special cases. 
+  # Otherwise, users would potentially have to set their values for 
+  # Test::Unit::TestCase and all its subclasses, since by the time the 
+  # value is set on TestCase, its subclasses have already been defined 
+  # and cannot inherit changes to those variables. So, we make those three 
+  # attributes copy-on-write.
+  class << self    
+    def use_transactional_fixtures=(flag) #:nodoc:
+      @_use_transactional_fixtures = true
+      @use_transactional_fixtures = flag
+    end
+
+    def use_instantiated_fixtures=(flag) #:nodoc:
+      @_use_instantiated_fixtures = true
+      @use_instantiated_fixtures = flag
+    end
+    
+    def fixture_path=(flag) #:nodoc:
+      @_fixture_path = true
+      @fixture_path = flag
+    end
+        
+    def use_transactional_fixtures #:nodoc:
+      @_use_transactional_fixtures ?
+        @use_transactional_fixtures :
+        superclass.use_transactional_fixtures
+    end
+
+    def use_instantiated_fixtures #:nodoc:
+      @_use_instantiated_fixtures ?
+        @use_instantiated_fixtures :
+        superclass.use_instantiated_fixtures
+    end
+
+    def fixture_path #:nodoc:
+      @_fixture_path ?
+        @fixture_path :
+        superclass.fixture_path
+    end
+  end
+end