minitest-rails 0.3 → 0.5

data/gemfiles/4.0.gemfile

@@ -0,0 +1,8 @@
+source "http://rubygems.org"
+
+gem "rails", github: "rails/rails" # Set to master until we get a release
+gem "rdoc", "~> 3.10"
+gem "hoe", "~> 3.0"
+gem "fakefs", "~> 0.4"
+
+gemspec :path=>"../"

data/gemfiles/4.0.gemfile.lock

@@ -0,0 +1,104 @@
+GIT
+  remote: git://github.com/rails/rails.git
+  revision: 0fe64f4273d055f4fbca866ea6e05bf05a76a31c
+  specs:
+    actionmailer (4.0.0.beta)
+      actionpack (= 4.0.0.beta)
+      mail (~> 2.5.3)
+    actionpack (4.0.0.beta)
+      activesupport (= 4.0.0.beta)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.4.3)
+      rack-test (~> 0.6.1)
+    activemodel (4.0.0.beta)
+      activesupport (= 4.0.0.beta)
+      builder (~> 3.1.0)
+    activerecord (4.0.0.beta)
+      activemodel (= 4.0.0.beta)
+      activerecord-deprecated_finders (= 0.0.1)
+      activesupport (= 4.0.0.beta)
+      arel (~> 3.0.2)
+    activesupport (4.0.0.beta)
+      i18n (~> 0.6)
+      minitest (~> 4.1)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.33)
+    rails (4.0.0.beta)
+      actionmailer (= 4.0.0.beta)
+      actionpack (= 4.0.0.beta)
+      activerecord (= 4.0.0.beta)
+      activesupport (= 4.0.0.beta)
+      bundler (>= 1.3.0.pre.4, < 2.0)
+      railties (= 4.0.0.beta)
+      sprockets-rails (~> 2.0.0.rc1)
+    railties (4.0.0.beta)
+      actionpack (= 4.0.0.beta)
+      activesupport (= 4.0.0.beta)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.15.4, < 2.0)
+
+PATH
+  remote: /Users/blowmage/codez/minitest-rails
+  specs:
+    minitest-rails (0.5.20130110235401)
+      minitest (~> 4.0)
+      rails (>= 3.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activerecord-deprecated_finders (0.0.1)
+    arel (3.0.2)
+    atomic (1.0.1)
+    builder (3.1.4)
+    erubis (2.7.0)
+    fakefs (0.4.2)
+    hike (1.2.1)
+    hoe (3.4.0)
+      rake (>= 0.8, < 11.0)
+    i18n (0.6.1)
+    json (1.7.6)
+    mail (2.5.3)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.19)
+    minitest (4.4.0)
+    multi_json (1.5.0)
+    polyglot (0.3.3)
+    rack (1.4.3)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rake (10.0.3)
+    rdoc (3.12)
+      json (~> 1.4)
+    sprockets (2.8.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.0.rc1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    thor (0.16.0)
+    thread_safe (0.1.0)
+      atomic
+    tilt (1.3.3)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.35)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fakefs (~> 0.4)
+  hoe (~> 3.0)
+  minitest-rails!
+  rails!
+  rdoc (~> 3.10)

data/lib/generators/mini_test.rb

@@ -3,24 +3,37 @@ require 'rails/generators/named_base'
 module MiniTest
   module Generators
     class Base < ::Rails::Generators::NamedBase #:nodoc:
+
+      class_option :old_style_hash, :type => :boolean, :default => false,
+                                    :desc => "Force using old style hash (:foo => 'bar') on Ruby >= 1.9"
+
       def self.source_root
         @_minitest_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'mini_test', generator_name, 'templates'))
       end
 
-      if ::Rails.version.to_f < 3.1
-        protected
-        # These methods don't exist in Rails 3.0
-        def module_namespacing(&block)
-          yield if block_given?
+      protected
+
+      # Fill in methods that might be missing depending on the version of Rails
+
+      def module_namespacing(&block)
+        yield if block_given?
+      end unless respond_to? :module_namespacing
+
+      def key_value(key, value)
+        if options[:old_style_hash] || RUBY_VERSION < '1.9'
+          ":#{key} => #{value}"
+        else
+          "#{key}: #{value}"
         end
-        def key_value(key, value)
-          if options[:old_style_hash] || RUBY_VERSION < '1.9'
-            ":#{key} => #{value}"
-          else
-            "#{key}: #{value}"
-          end
+      end unless respond_to? :key_value
+
+      def attributes_names
+        @attributes_names ||= attributes.each_with_object([]) do |a, names|
+          names << a.column_name
+          names << "#{a.name}_type" if a.polymorphic?
         end
-      end
+      end unless respond_to? :attributes_names
+
     end
   end
 end

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

@@ -1,7 +1,7 @@
 require "minitest_helper"
 
 <% module_namespacing do -%>
-class <%= class_name %>ControllerTest < MiniTest::Rails::ActionController::TestCase
+class <%= class_name %>ControllerTest < ActionController::TestCase
 <% if actions.empty? -%>
   # test "the truth" do
   #   assert true

data/lib/generators/mini_test/helper/templates/helper_test.rb

@@ -1,10 +1,10 @@
 require "minitest_helper"
 
 <% module_namespacing do -%>
-class <%= class_name %>HelperTest < MiniTest::Rails::ActionView::TestCase
+class <%= class_name %>HelperTest < ActionView::TestCase
 
   def test_sanity
-    flunk "Need real tests"
+    assert true
   end
 
 end

data/lib/generators/mini_test/install/install_generator.rb

@@ -14,7 +14,7 @@ DESC
       end
 
       def copy_minitest_files
-        directory 'test'
+        template 'test/minitest_helper.rb', File.join("test", "minitest_helper.rb")
       end
 
     end

data/lib/generators/mini_test/install/templates/test/minitest_helper.rb

@@ -4,22 +4,16 @@ require File.expand_path('../../config/environment', __FILE__)
 require "minitest/autorun"
 require "minitest/rails"
 
-# Uncomment if you want Capybara in accceptance/integration tests
+# Add `gem "minitest/rails/capybara"` to the test group of your Gemfile
+# and uncomment the following if you want Capybara feature tests
 # require "minitest/rails/capybara"
 
 # Uncomment if you want awesome colorful output
 # require "minitest/pride"
 
-class MiniTest::Rails::ActiveSupport::TestCase
+class ActiveSupport::TestCase
   # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
   fixtures :all
 
   # Add more helper methods to be used by all tests here...
 end
-
-# Do you want all existing Rails tests to use MiniTest::Rails?
-# Comment out the following and either:
-# A) Change the require on the existing tests to `require "minitest_helper"`
-# B) Require this file's code in test_helper.rb
-
-# MiniTest::Rails.override_testunit!

data/lib/generators/mini_test/integration/integration_generator.rb

@@ -9,9 +9,9 @@ module MiniTest
 
       def create_test_files
         if options[:spec]
-          template 'integration_spec.rb', File.join('test/acceptance', class_path, "#{file_name}_test.rb")
+          template 'integration_spec.rb', File.join('test/integration', class_path, "#{file_name}_test.rb")
         else
-          template 'integration_test.rb', File.join('test/acceptance', class_path, "#{file_name}_test.rb")
+          template 'integration_test.rb', File.join('test/integration', class_path, "#{file_name}_test.rb")
         end
       end
     end

data/lib/generators/mini_test/integration/templates/integration_spec.rb

@@ -1,7 +1,7 @@
 require "minitest_helper"
 
-# To be handled correctly this spec must end with "Acceptance Test"
-describe "<%= class_name %> Acceptance Test" do
+# To be handled correctly this spec must end with "Integration Test"
+describe "<%= class_name %> Integration Test" do
   # it "must be a real test" do
   #   flunk "Need real tests"
   # end

data/lib/generators/mini_test/integration/templates/integration_test.rb

@@ -1,6 +1,6 @@
 require "minitest_helper"
 
-class <%= class_name %>Test < MiniTest::Rails::ActionDispatch::IntegrationTest
+class <%= class_name %>Test < ActionDispatch::IntegrationTest
   # test "the truth" do
   #   assert true
   # end

data/lib/generators/mini_test/mailer/templates/mailer_test.rb

@@ -1,7 +1,7 @@
 require "minitest_helper"
 
 <% module_namespacing do -%>
-class <%= class_name %>Test < MiniTest::Rails::ActionMailer::TestCase
+class <%= class_name %>Test < ActionMailer::TestCase
 <% actions.each do |action| -%>
   test "<%= action %>" do
     mail = <%= class_name %>.<%= action %>

data/lib/generators/mini_test/model/templates/model_test.rb

@@ -1,7 +1,7 @@
 require "minitest_helper"
 
 <% module_namespacing do -%>
-class <%= class_name %>Test < MiniTest::Rails::ActiveSupport::TestCase
+class <%= class_name %>Test < ActiveSupport::TestCase
   # test "the truth" do
   #   assert true
   # end

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

@@ -1,7 +1,7 @@
 require "minitest_helper"
 
 <% module_namespacing do -%>
-class <%= controller_class_name %>ControllerTest < MiniTest::Rails::ActionController::TestCase
+class <%= controller_class_name %>ControllerTest < ActionController::TestCase
 
   before do
     @<%= singular_table_name %> = <%= table_name %>(:one)

data/lib/minitest/rails.rb

@@ -2,53 +2,142 @@
 # so fixtures aren't loaded into that environment
 abort("Abort testing: Your Rails environment is running in production mode!") if Rails.env.production?
 
-require "minitest/rails/active_support"
-require "minitest/rails/action_controller"
-require "minitest/rails/action_view"
-require "minitest/rails/action_mailer" if defined? ActionMailer
-require "minitest/rails/action_dispatch"
+require "minitest/rails/test_case"
 
 # Enable turn if it is available
 begin
-  require 'turn/autorun'
+  require "turn/autorun"
 rescue LoadError
 end
 
-module MiniTest
-  module Rails
-    def self.override_testunit!
-      Kernel.silence_warnings do
-        ::ActiveSupport.const_set    :TestCase,        MiniTest::Rails::ActiveSupport::TestCase
-        ::ActionController.const_set :TestCase,        MiniTest::Rails::ActionController::TestCase
-        ::ActionView.const_set       :TestCase,        MiniTest::Rails::ActionView::TestCase
-        ::ActionMailer.const_set     :TestCase,        MiniTest::Rails::ActionMailer::TestCase if defined? ActionMailer
-        ::ActionDispatch.const_set   :IntegrationTest, MiniTest::Rails::ActionDispatch::IntegrationTest
+# Override the default ActiveSupport::TestCase to set the minitest dependency
+
+require "active_support/test_case"
+Kernel.silence_warnings do
+  ActiveSupport.const_set :TestCase, MiniTest::Rails::TestCase
+end
+
+# Add spec DSL integration
+
+if defined?(ActiveRecord::Base)
+  class ActiveSupport::TestCase
+    # Use AS::TestCase for the base class when describing a model
+    register_spec_type(self) do |desc|
+      desc < ActiveRecord::Base if desc.is_a?(Class)
+    end
+  end
+end
+
+require "action_controller/test_case"
+class ActionController::TestCase
+  # Use AC::TestCase for the base class when describing a controller
+  register_spec_type(self) do |desc|
+    Class === desc && desc < ActionController::Metal
+  end
+  register_spec_type(/Controller( ?Test)?\z/i, self)
+
+  # Resolve the controller from the test name when using the spec DSL
+  def self.determine_default_controller_class(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
+
+require "action_view/test_case"
+class ActionView::TestCase
+  # Use AV::TestCase for the base class for helpers and views
+  register_spec_type(/(Helper( ?Test)?| View Test)\z/i, self)
+
+  # Resolve the helper or view from the test name when using the spec DSL
+  def self.determine_default_helper_class(name)
+    determine_constant_from_test_name(name) do |constant|
+      Module === constant
+    end
+  end
+end
+
+if defined? ActionMailer
+  require "action_mailer/test_helper"
+  require "action_mailer/test_case"
+  class ActionMailer::TestCase
+    # Use AM::TestCase for the base class when describing a mailer
+    register_spec_type(self) do |desc|
+      desc < ActionMailer::Base if desc.is_a?(Class)
+    end
+    register_spec_type(/Mailer( ?Test)?\z/i, self)
+
+    # Resolve the mailer from the test name when using the spec DSL
+    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
 
+require "action_dispatch/testing/integration"
+class ActionDispatch::IntegrationTest
+  # Register by name, consider Acceptance to be deprecated
+  register_spec_type(/(Integration|Acceptance)( ?Test)?\z/i, self)
+end
+
+# Default wiring for the tests. This was originaly done in the helper.
+
+# Enable fixtures if appropriate
+
 if defined?(ActiveRecord::Base)
-  class MiniTest::Rails::ActiveSupport::TestCase
+  class ActiveSupport::TestCase
     include ActiveRecord::TestFixtures
     self.fixture_path = "#{Rails.root}/test/fixtures/"
   end
 
-  MiniTest::Rails::ActionDispatch::IntegrationTest.fixture_path = MiniTest::Rails::ActiveSupport::TestCase.fixture_path
+  ActionDispatch::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path
 
   def create_fixtures(*table_names, &block)
-    ActiveRecord::Fixtures.create_fixtures(MiniTest::Rails::ActiveSupport::TestCase.fixture_path, table_names, {}, &block)
+    ActiveRecord::Fixtures.create_fixtures(ActiveSupport::TestCase.fixture_path, table_names, {}, &block)
   end
 end
 
-class MiniTest::Rails::ActionController::TestCase
+# Setup the routes
+
+class ActionController::TestCase
   setup do
     @routes = Rails.application.routes
   end
 end
 
-class MiniTest::Rails::ActionDispatch::IntegrationTest
+class ActionDispatch::IntegrationTest
   setup do
     @routes = Rails.application.routes
   end
 end
+
+# Deprecated, for backwards compatibility with older minitest-rails only
+
+module MiniTest
+  module Rails
+    def self.override_testunit!
+      # noop
+    end
+    module ActiveSupport
+      TestCase = ::ActiveSupport::TestCase
+    end
+    module ActionController
+      TestCase = ::ActionController::TestCase
+    end
+    module ActionView
+      TestCase = ::ActionView::TestCase
+    end
+    module ActionMailer
+      TestCase = ::ActionMailer::TestCase if defined? ::ActionMailer
+    end
+    module ActionDispatch
+      IntegrationTest = ::ActionDispatch::IntegrationTest
+    end
+  end
+end