minitest-rails 0.2 → 0.3

data/lib/autotest/minitest_rails.rb

@@ -1,7 +1,8 @@
 require 'autotest'
+require "minitest/rails/version"
 
 class Autotest::MinitestRails < Autotest
-  VERSION = "0.2"
+  VERSION = MiniTest::Rails::VERSION
 
   def initialize # :nodoc:
     super

data/lib/generators/mini_test/scaffold/scaffold_generator.rb

@@ -10,6 +10,8 @@ module MiniTest
 
       check_class_collision :suffix => "ControllerTest"
 
+      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+
       def create_test_files
         if options[:spec]
           template "controller_spec.rb",
@@ -23,6 +25,19 @@ module MiniTest
                              "#{controller_file_name}_controller_test.rb")
         end
       end
+
+      def accessible_attributes
+        attributes.reject(&:reference?)
+      end
+
+      def attributes_hash
+        return if accessible_attributes.empty?
+
+        accessible_attributes.map do |a|
+          name = a.name
+          key_value name, "@#{singular_table_name}.#{name}"
+        end.sort.join(', ')
+      end
     end
   end
 end

data/lib/generators/mini_test/scaffold/templates/controller_spec.rb

@@ -4,7 +4,7 @@ require "minitest_helper"
 describe <%= controller_class_name %>Controller do
 
   before do
-    @<%= singular_table_name %> = <%= class_name %>.new
+    @<%= singular_table_name %> = <%= table_name %>(:one)
   end
 
   it "must get index" do
@@ -20,30 +20,30 @@ describe <%= controller_class_name %>Controller do
 
   it "must create <%= singular_table_name %>" do
     assert_difference('<%= class_name %>.count') do
-      post :create, <%= key_value singular_table_name, "@#{singular_table_name}.attributes" %>
+      post :create, <%= "#{singular_table_name}: { #{attributes_hash} }" %>
     end
 
     assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
   end
 
   it "must show <%= singular_table_name %>" do
-    get :show, <%= key_value :id, "@#{singular_table_name}.to_param" %>
+    get :show, <%= key_value :id, "@#{singular_table_name}" %>
     assert_response :success
   end
 
   it "must get edit" do
-    get :edit, <%= key_value :id, "@#{singular_table_name}.to_param" %>
+    get :edit, <%= key_value :id, "@#{singular_table_name}" %>
     assert_response :success
   end
 
   it "must update <%= singular_table_name %>" do
-    put :update, <%= key_value :id, "@#{singular_table_name}.to_param" %>, <%= key_value singular_table_name, "@#{singular_table_name}.attributes" %>
+    put :update, <%= key_value :id, "@#{singular_table_name}" %>, <%= "#{singular_table_name}: { #{attributes_hash} }" %>
     assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
   end
 
   it "must destroy <%= singular_table_name %>" do
     assert_difference('<%= class_name %>.count', -1) do
-      delete :destroy, <%= key_value :id, "@#{singular_table_name}.to_param" %>
+      delete :destroy, <%= key_value :id, "@#{singular_table_name}" %>
     end
 
     assert_redirected_to <%= index_helper %>_path

data/lib/generators/mini_test/scaffold/templates/controller_test.rb

@@ -4,7 +4,7 @@ require "minitest_helper"
 class <%= controller_class_name %>ControllerTest < MiniTest::Rails::ActionController::TestCase
 
   before do
-    @<%= singular_table_name %> = <%= class_name %>.new
+    @<%= singular_table_name %> = <%= table_name %>(:one)
   end
 
   def test_index
@@ -20,30 +20,30 @@ class <%= controller_class_name %>ControllerTest < MiniTest::Rails::ActionContro
 
   def test_create
     assert_difference('<%= class_name %>.count') do
-      post :create, <%= key_value singular_table_name, "@#{singular_table_name}.attributes" %>
+      post :create, <%= "#{singular_table_name}: { #{attributes_hash} }" %>
     end
 
     assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
   end
 
   def test_show
-    get :show, <%= key_value :id, "@#{singular_table_name}.to_param" %>
+    get :show, <%= key_value :id, "@#{singular_table_name}" %>
     assert_response :success
   end
 
   def test_edit
-    get :edit, <%= key_value :id, "@#{singular_table_name}.to_param" %>
+    get :edit, <%= key_value :id, "@#{singular_table_name}" %>
     assert_response :success
   end
 
   def test_update
-    put :update, <%= key_value :id, "@#{singular_table_name}.to_param" %>, <%= key_value singular_table_name, "@#{singular_table_name}.attributes" %>
+    put :update, <%= key_value :id, "@#{singular_table_name}" %>, <%= "#{singular_table_name}: { #{attributes_hash} }" %>
     assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
   end
 
   def test_destroy
     assert_difference('<%= class_name %>.count', -1) do
-      delete :destroy, <%= key_value :id, "@#{singular_table_name}.to_param" %>
+      delete :destroy, <%= key_value :id, "@#{singular_table_name}" %>
     end
 
     assert_redirected_to <%= index_helper %>_path

data/lib/minitest-rails.rb

@@ -1,9 +1,9 @@
+require "minitest/rails/version"
 require "rails"
 require "minitest/unit"
 
 module MiniTest
   module Rails
-    VERSION = "0.2"
     class Railtie < ::Rails::Railtie
       if ::Rails.version.to_f >= 3.1
         config.app_generators.integration_tool :mini_test

data/lib/minitest/rails/action_controller.rb

@@ -16,43 +16,10 @@ module MiniTest
         include ::ActionController::TestCase::Behavior
 
         def self.determine_default_controller_class(name)
-          # Override this method to support nested describes
-          #
-          # describe WidgetsController do
-          #   describe "index" do
-          #     it "is successful" do
-          #       assert_response :success
-          #     end
-          #   end
-          # end
-          #
-          # Original implementation:
-          # name.sub(/Test$/, '').safe_constantize
-          # safe_constantize is not supported in Rails 3.0...
-          ControllerLookup.find name
-        end
-      end
-
-      module ControllerLookup
-        def self.find controller
-          # HACK: I don't love this implementation
-          # Please suggest a better one!
-          names = controller.split "::"
-          controller = while names.size > 0 do
-            # Remove "Test" if present
-            names.last.sub! /Test$/, ''
-            begin
-              constant = names.join("::").constantize
-              break(constant) if constant
-            rescue NameError
-              # do nothing
-            ensure
-              names.pop
-            end
-          end
-          if controller.nil?
-            raise ::NameError.new("Unable to resolve controller for #{name}")
+          controller = determine_constant_from_test_name(name) do |constant|
+            Class === constant && constant < ::ActionController::Metal
           end
+          raise ::NameError.new("Unable to resolve controller for #{name}") if controller.nil?
           controller
         end
       end

data/lib/minitest/rails/action_dispatch.rb

@@ -16,7 +16,7 @@ module MiniTest
         def self.app
           # DEPRECATE Rails application fallback
           # This should be set by the initializer
-          @@app || (defined?(Rails.application) && Rails.application) || nil
+          @@app || (defined?(::Rails.application) && ::Rails.application) || nil
         end
 
         def self.app=(app)
@@ -26,6 +26,11 @@ module MiniTest
         def app
           super || ::ActionDispatch::IntegrationTest.app
         end
+        
+        def url_options
+          reset! unless integration_session
+          integration_session.url_options
+        end
 
         # Register by name
         register_spec_type(/Acceptance ?Test\z/i, self)

data/lib/minitest/rails/action_mailer.rb

@@ -9,10 +9,17 @@ module MiniTest
         register_spec_type(self) do |desc|
           desc < ::ActionMailer::Base if desc.is_a?(Class)
         end
-
         register_spec_type(/Mailer( ?Test)?\z/i, self)
 
         include ::ActionMailer::TestCase::Behavior
+
+        def self.determine_default_mailer(name)
+          mailer = determine_constant_from_test_name(name) do |constant|
+            Class === constant && constant < ::ActionMailer::Base
+          end
+          raise ::ActionMailer::NonInferrableMailerError.new(name) if mailer.nil?
+          mailer
+        end
       end
     end
   end

data/lib/minitest/rails/action_view.rb

@@ -7,13 +7,16 @@ module MiniTest
       class TestCase < MiniTest::Rails::ActiveSupport::TestCase
         TestController = ::ActionView::TestCase::TestController
 
-        # Register by name, because Helpers are just modules
-        register_spec_type(/Helper( ?Test)?\z/i, self)
-
-        # View specs
-        register_spec_type(/View( ?Test)?\z/i, self)
+        # Use AV::TestCase for the base class for helpers and views
+        register_spec_type(/(Helper|View)( ?Test)?\z/i, self)
 
         include ::ActionView::TestCase::Behavior
+
+        def self.determine_default_helper_class(name)
+          determine_constant_from_test_name(name) do |constant|
+            Module === constant
+          end
+        end
       end
     end
   end

data/lib/minitest/rails/active_support.rb

@@ -12,6 +12,7 @@ require 'active_support/testing/isolation'
 require 'minitest/rails/mochaing'
 require 'active_support/core_ext/kernel/reporting'
 
+require "minitest/rails/constant_lookup"
 module MiniTest
   module Rails
     module ActiveSupport
@@ -51,6 +52,7 @@ module MiniTest
         include ::ActiveSupport::Testing::Deprecation
         include ::ActiveSupport::Testing::Pending
         extend  Testing::Declarative
+        include MiniTest::Rails::ActiveSupport::Testing::ConstantLookup
 
         # test/unit backwards compatibility methods
         alias :assert_raise :assert_raises

data/lib/minitest/rails/constant_lookup.rb

@@ -0,0 +1,57 @@
+require "active_support/concern"
+
+module MiniTest
+  module Rails
+    module ActiveSupport
+      module Testing
+        # Resolves a constant from a minitest spec name.
+        #
+        # Given the following spec-style test:
+        #
+        #   describe WidgetsController, :index do
+        #     describe "authenticated user" do
+        #       describe "returns widgets" do
+        #         it "has a controller that exists" do
+        #           assert_kind_of WidgetsController, @controller
+        #         end
+        #       end
+        #     end
+        #   end
+        #
+        # The test will have the following name:
+        #
+        #   "WidgetsController::index::authenticated user::returns widgets"
+        #
+        # The constant WidgetsController can be resolved from the name.
+        # The following code will resolve the constant:
+        #
+        #   controller = determine_constant_from_test_name(name) do |constant|
+        #     Class === constant && constant < ::ActionController::Metal
+        #   end
+        module ConstantLookup
+          extend ::ActiveSupport::Concern
+
+          module ClassMethods
+            def determine_constant_from_test_name(test_name)
+              names = test_name.split "::"
+              while names.size > 0 do
+                names.last.sub! /Test$/, ""
+                # Rails 3.0 doesn't have safe_constantize,
+                # so we'll do it the hard way.
+                begin
+                  constant = names.join("::").constantize
+                  break(constant) if yield(constant)
+                rescue NameError
+                  # Constant wasn't found, move on
+                ensure
+                  names.pop
+                end
+              end
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/minitest/rails/version.rb

@@ -0,0 +1,5 @@
+module MiniTest
+  module Rails
+    VERSION = "0.3"
+  end
+end

data/minitest-rails.gemspec

@@ -2,44 +2,44 @@
 
 Gem::Specification.new do |s|
   s.name = "minitest-rails"
-  s.version = "0.2.20120919094008"
+  s.version = "0.3.20121102170159"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Moore"]
-  s.date = "2012-09-19"
+  s.date = "2012-11-02"
   s.description = "Adds MiniTest as the default testing library in Rails 3.x"
   s.email = ["mike@blowmage.com"]
   s.extra_rdoc_files = ["CHANGELOG.rdoc", "Manifest.txt", "README.rdoc"]
-  s.files = [".autotest", ".gemtest", ".travis.yml", "CHANGELOG.rdoc", "LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "gemfiles/3.0.gemfile", "gemfiles/3.0.gemfile.lock", "gemfiles/3.1.gemfile", "gemfiles/3.1.gemfile.lock", "gemfiles/3.2.gemfile", "gemfiles/3.2.gemfile.lock", "gemfiles/minitest_tu_shim.rb", "lib/autotest/discover.rb", "lib/autotest/fixtures.rb", "lib/autotest/migrate.rb", "lib/autotest/minitest_rails.rb", "lib/generators/mini_test.rb", "lib/generators/mini_test/controller/controller_generator.rb", "lib/generators/mini_test/controller/templates/controller_spec.rb", "lib/generators/mini_test/controller/templates/controller_test.rb", "lib/generators/mini_test/helper/helper_generator.rb", "lib/generators/mini_test/helper/templates/helper_spec.rb", "lib/generators/mini_test/helper/templates/helper_test.rb", "lib/generators/mini_test/install/install_generator.rb", "lib/generators/mini_test/install/templates/test/minitest_helper.rb", "lib/generators/mini_test/integration/integration_generator.rb", "lib/generators/mini_test/integration/templates/integration_spec.rb", "lib/generators/mini_test/integration/templates/integration_test.rb", "lib/generators/mini_test/mailer/mailer_generator.rb", "lib/generators/mini_test/mailer/templates/mailer_spec.rb", "lib/generators/mini_test/mailer/templates/mailer_test.rb", "lib/generators/mini_test/model/model_generator.rb", "lib/generators/mini_test/model/templates/fixtures.yml", "lib/generators/mini_test/model/templates/model_spec.rb", "lib/generators/mini_test/model/templates/model_test.rb", "lib/generators/mini_test/scaffold/scaffold_generator.rb", "lib/generators/mini_test/scaffold/templates/controller_spec.rb", "lib/generators/mini_test/scaffold/templates/controller_test.rb", "lib/minitest-rails.rb", "lib/minitest/rails.rb", "lib/minitest/rails/action_controller.rb", "lib/minitest/rails/action_dispatch.rb", "lib/minitest/rails/action_mailer.rb", "lib/minitest/rails/action_view.rb", "lib/minitest/rails/active_support.rb", "lib/minitest/rails/declarative.rb", "lib/minitest/rails/mochaing.rb", "lib/minitest/rails/tasks/minitest.rake", "lib/minitest/rails/tasks/sub_test_task.rb", "minitest-rails.gemspec", "test/generators/test_controller_generator.rb", "test/generators/test_helper_generator.rb", "test/generators/test_install_generator.rb", "test/generators/test_mailer_generator.rb", "test/generators/test_model_generator.rb", "test/generators/test_scaffold_generator.rb", "test/rails/action_controller/test_controller_lookup.rb", "test/rails/action_controller/test_controllers.rb", "test/rails/action_controller/test_spec_type.rb", "test/rails/test_action_dispatch_spec_type.rb", "test/rails/test_action_mailer_spec_type.rb", "test/rails/test_action_view_spec_type.rb", "test/rails/test_active_support_spec_type.rb", "test/test_sanity.rb"]
+  s.files = [".autotest", ".gemtest", ".travis.yml", "CHANGELOG.rdoc", "LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "gemfiles/3.0.gemfile", "gemfiles/3.0.gemfile.lock", "gemfiles/3.1.gemfile", "gemfiles/3.1.gemfile.lock", "gemfiles/3.2.gemfile", "gemfiles/3.2.gemfile.lock", "gemfiles/minitest_tu_shim.rb", "lib/autotest/discover.rb", "lib/autotest/fixtures.rb", "lib/autotest/migrate.rb", "lib/autotest/minitest_rails.rb", "lib/generators/mini_test.rb", "lib/generators/mini_test/controller/controller_generator.rb", "lib/generators/mini_test/controller/templates/controller_spec.rb", "lib/generators/mini_test/controller/templates/controller_test.rb", "lib/generators/mini_test/helper/helper_generator.rb", "lib/generators/mini_test/helper/templates/helper_spec.rb", "lib/generators/mini_test/helper/templates/helper_test.rb", "lib/generators/mini_test/install/install_generator.rb", "lib/generators/mini_test/install/templates/test/minitest_helper.rb", "lib/generators/mini_test/integration/integration_generator.rb", "lib/generators/mini_test/integration/templates/integration_spec.rb", "lib/generators/mini_test/integration/templates/integration_test.rb", "lib/generators/mini_test/mailer/mailer_generator.rb", "lib/generators/mini_test/mailer/templates/mailer_spec.rb", "lib/generators/mini_test/mailer/templates/mailer_test.rb", "lib/generators/mini_test/model/model_generator.rb", "lib/generators/mini_test/model/templates/fixtures.yml", "lib/generators/mini_test/model/templates/model_spec.rb", "lib/generators/mini_test/model/templates/model_test.rb", "lib/generators/mini_test/scaffold/scaffold_generator.rb", "lib/generators/mini_test/scaffold/templates/controller_spec.rb", "lib/generators/mini_test/scaffold/templates/controller_test.rb", "lib/minitest-rails.rb", "lib/minitest/rails.rb", "lib/minitest/rails/action_controller.rb", "lib/minitest/rails/action_dispatch.rb", "lib/minitest/rails/action_mailer.rb", "lib/minitest/rails/action_view.rb", "lib/minitest/rails/active_support.rb", "lib/minitest/rails/constant_lookup.rb", "lib/minitest/rails/declarative.rb", "lib/minitest/rails/mochaing.rb", "lib/minitest/rails/tasks/minitest.rake", "lib/minitest/rails/tasks/sub_test_task.rb", "lib/minitest/rails/version.rb", "minitest-rails.gemspec", "tasks/gemfiles.rake", "tasks/test.rake", "test/generators/test_controller_generator.rb", "test/generators/test_helper_generator.rb", "test/generators/test_install_generator.rb", "test/generators/test_mailer_generator.rb", "test/generators/test_model_generator.rb", "test/generators/test_scaffold_generator.rb", "test/rails/action_controller/test_controllers.rb", "test/rails/action_controller/test_spec_type.rb", "test/rails/action_dispatch/test_spec_type.rb", "test/rails/action_mailer/test_mailers.rb", "test/rails/action_mailer/test_spec_type.rb", "test/rails/action_view/test_helpers.rb", "test/rails/action_view/test_spec_type.rb", "test/rails/active_support/test_spec_type.rb", "test/rails/test_constant_lookup.rb", "test/test_sanity.rb"]
   s.homepage = "http://blowmage.com/minitest-rails"
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "minitest-rails"
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.23"
   s.summary = "MiniTest integration for Rails 3.x"
-  s.test_files = ["test/generators/test_controller_generator.rb", "test/generators/test_helper_generator.rb", "test/generators/test_install_generator.rb", "test/generators/test_mailer_generator.rb", "test/generators/test_model_generator.rb", "test/generators/test_scaffold_generator.rb", "test/rails/action_controller/test_controller_lookup.rb", "test/rails/action_controller/test_controllers.rb", "test/rails/action_controller/test_spec_type.rb", "test/rails/test_action_dispatch_spec_type.rb", "test/rails/test_action_mailer_spec_type.rb", "test/rails/test_action_view_spec_type.rb", "test/rails/test_active_support_spec_type.rb", "test/test_sanity.rb"]
+  s.test_files = ["test/generators/test_controller_generator.rb", "test/generators/test_helper_generator.rb", "test/generators/test_install_generator.rb", "test/generators/test_mailer_generator.rb", "test/generators/test_model_generator.rb", "test/generators/test_scaffold_generator.rb", "test/rails/action_controller/test_controllers.rb", "test/rails/action_controller/test_spec_type.rb", "test/rails/action_dispatch/test_spec_type.rb", "test/rails/action_mailer/test_mailers.rb", "test/rails/action_mailer/test_spec_type.rb", "test/rails/action_view/test_helpers.rb", "test/rails/action_view/test_spec_type.rb", "test/rails/active_support/test_spec_type.rb", "test/rails/test_constant_lookup.rb", "test/test_sanity.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<minitest>, ["~> 3.4"])
+      s.add_runtime_dependency(%q<minitest>, ["~> 4.0"])
       s.add_runtime_dependency(%q<rails>, ["~> 3.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
       s.add_development_dependency(%q<fakefs>, ["~> 0.4"])
-      s.add_development_dependency(%q<hoe>, ["~> 3.0"])
+      s.add_development_dependency(%q<hoe>, ["~> 3.1"])
     else
-      s.add_dependency(%q<minitest>, ["~> 3.4"])
+      s.add_dependency(%q<minitest>, ["~> 4.0"])
       s.add_dependency(%q<rails>, ["~> 3.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.10"])
       s.add_dependency(%q<fakefs>, ["~> 0.4"])
-      s.add_dependency(%q<hoe>, ["~> 3.0"])
+      s.add_dependency(%q<hoe>, ["~> 3.1"])
     end
   else
-    s.add_dependency(%q<minitest>, ["~> 3.4"])
+    s.add_dependency(%q<minitest>, ["~> 4.0"])
     s.add_dependency(%q<rails>, ["~> 3.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.10"])
     s.add_dependency(%q<fakefs>, ["~> 0.4"])
-    s.add_dependency(%q<hoe>, ["~> 3.0"])
+    s.add_dependency(%q<hoe>, ["~> 3.1"])
   end
 end

data/tasks/gemfiles.rake

@@ -0,0 +1,23 @@
+namespace :gemfiles do
+  desc "Updates the gemfiles"
+  task :update do
+    `bundle --gemfile=gemfiles/3.0.gemfile`
+    `bundle --gemfile=gemfiles/3.1.gemfile`
+    `bundle --gemfile=gemfiles/3.2.gemfile`
+  end
+  desc "Clear the gemfile lock files"
+  task :clear do
+    `rm gemfiles/3.*.gemfile.lock`
+  end
+end
+
+# Building this in case it doesn't exist
+# /me shakes fist at travis-ci
+namespace :gem do
+  task :spec do
+  end
+end
+
+Rake::Task["gem:spec"].enhance do
+  Rake::Task["gemfiles:update"].invoke
+end

data/tasks/test.rake

@@ -0,0 +1,20 @@
+namespace :test do
+  desc "Run tests against the 3.0 gemfile"
+  task "3.0" do
+    ENV["BUNDLE_GEMFILE"] = "gemfiles/3.0.gemfile"
+    sh "bundle exec rake test"
+  end
+
+  desc "Run tests against the 3.1 gemfile"
+  task "3.1" do
+    ENV["BUNDLE_GEMFILE"] = "gemfiles/3.1.gemfile"
+    sh "bundle exec rake test"
+  end
+
+  desc "Run tests against the 3.2 gemfile"
+  task "3.2" do
+    ENV["BUNDLE_GEMFILE"] = "gemfiles/3.2.gemfile"
+    sh "bundle exec rake test"
+  end
+end
+

data/test/rails/action_mailer/test_mailers.rb

@@ -0,0 +1,113 @@
+require "minitest/autorun"
+require "rails"
+
+require "action_mailer"
+require "minitest/rails/action_mailer"
+
+class TestTestMailer < ActionMailer::Base; end
+
+# From Rails...
+class CrazyNameMailerTest < MiniTest::Rails::ActionMailer::TestCase
+  tests TestTestMailer
+
+  def test_set_mailer_class_manual
+    assert_equal TestTestMailer, self.class.mailer_class
+  end
+end
+
+class CrazySymbolNameMailerTest < MiniTest::Rails::ActionMailer::TestCase
+  tests :test_test_mailer
+
+  def test_set_mailer_class_manual_using_symbol
+    assert_equal TestTestMailer, self.class.mailer_class
+  end
+end if Rails::VERSION::STRING >= "3.2"
+
+class CrazyStringNameMailerTest < MiniTest::Rails::ActionMailer::TestCase
+  tests 'test_test_mailer'
+
+  def test_set_mailer_class_manual_using_string
+    assert_equal TestTestMailer, self.class.mailer_class
+  end
+end if Rails::VERSION::STRING >= "3.2"
+
+# New tests...
+describe TestTestMailer do
+  it "gets the mailer from the test name" do
+    assert_equal TestTestMailer, self.class.mailer_class
+  end
+end
+
+describe TestTestMailer, :action do
+  it "gets the mailer from the test name" do
+    assert_equal TestTestMailer, self.class.mailer_class
+  end
+end
+
+describe TestTestMailer do
+  describe "nested" do
+    it "gets the mailer from the test name" do
+      assert_equal TestTestMailer, self.class.mailer_class
+    end
+  end
+end
+
+describe TestTestMailer, :action do
+  describe "nested" do
+    it "gets the mailer from the test name" do
+      assert_equal TestTestMailer, self.class.mailer_class
+    end
+  end
+end
+
+describe "TestTestMailer" do
+  it "gets the mailer from the test name" do
+    assert_equal TestTestMailer, self.class.mailer_class
+  end
+end
+
+describe "TestTestMailerTest" do
+  it "gets the mailer from the test name" do
+    assert_equal TestTestMailer, self.class.mailer_class
+  end
+end
+
+describe "AnotherCrazySymbolNameMailerTest" do
+  tests :test_test_mailer
+
+  it "gets the mailer after setting it with a symbol" do
+    assert_equal TestTestMailer, self.class.mailer_class
+  end
+end if Rails::VERSION::STRING >= "3.2"
+
+describe "AnotherCrazyStringNameMailerTest" do
+  tests 'test_test_mailer'
+
+  it "gets the mailer after setting it with a string" do
+    assert_equal TestTestMailer, self.class.mailer_class
+  end
+end if Rails::VERSION::STRING >= "3.2"
+
+describe "Another Crazy Name Mailer Test" do
+  tests TestTestMailer
+
+  it "gets the mailer after setting it manually" do
+    assert_equal TestTestMailer, self.class.mailer_class
+  end
+end
+
+describe "Another Crazy Symbol Name Mailer Test" do
+  tests :test_test_mailer
+
+  it "gets the mailer after setting it with a symbol" do
+    assert_equal TestTestMailer, self.class.mailer_class
+  end
+end if Rails::VERSION::STRING >= "3.2"
+
+describe "Another Crazy String Name Mailer Test" do
+  tests 'test_test_mailer'
+
+  it "gets the mailer after setting it with a string" do
+    assert_equal TestTestMailer, self.class.mailer_class
+  end
+end if Rails::VERSION::STRING >= "3.2"