minitest-rails 0.2 → 0.5

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/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/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/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

@@ -1,10 +1,10 @@
 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 %> = <%= 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/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/minitest/rails/constant_lookup.rb

@@ -0,0 +1,54 @@
+require "active_support/concern"
+require "active_support/inflector"
+
+module MiniTest
+  module Rails
+    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  # :nodoc:
+          def determine_constant_from_test_name(test_name)
+            names = test_name.split "::"
+            while names.size > 0 do
+              names.last.sub!(/Test$/, "")
+              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

data/lib/minitest/rails/tasks/minitest.rake

@@ -1,81 +1,52 @@
-require 'rake/testtask'
-require 'minitest/rails/tasks/sub_test_task'
-
-# The default tests to run, update this list to change behavior
-MINITEST_TASKS = %w(models helpers controllers mailers acceptance) #views
-
-def all_directories_under_test
-  Dir['test/*/'].map {|dir| /test\/(.+?)\//.match(dir)[1] }
-end
-
-def all_minitest_directories
-  (MINITEST_TASKS + all_directories_under_test).uniq
-end
+require "rake/testtask"
+require "minitest/rails/testing"
+require "minitest/rails/tasks/sub_test_task"
 
 desc "Runs minitest"
 task :test do
   # Add to existing task if exists, or create new task otherwise
-  Rake::Task['minitest'].invoke
+  Rake::Task["minitest"].invoke
 end
 
-namespace 'test' do
+namespace "test" do
   task :prepare do
     # Define here in case test_unit isn't loaded
   end
 end
 
-desc "Runs #{MINITEST_TASKS.join(", ")} together"
+# desc "Runs default tests (#{MiniTest::Rails::Testing.default_tasks.join(', ')})"
 task :minitest do
-  Rake::Task['minitest:default'].invoke
+  Rake::Task["minitest:default"].invoke
 end
 
-namespace 'minitest' do
+namespace "minitest" do
 
-  # Only run the default tasks defined in MINITEST_TASKS
+  # Only run the default tasks defined in MiniTest::Rails::Testing.default_tasks
   task :default do
-    errors = MINITEST_TASKS.collect do |task|
-      begin
-        Rake::Task["minitest:#{task}"].invoke
-        nil
-      rescue => e
-        { :task => "minitest:#{task}", :exception => e }
-      end
-    end.compact
-
-    if errors.any?
-      puts errors.map { |e| "Errors running #{e[:task]}! #{e[:exception].inspect}" }.join("\n")
-      abort
-    end
+    MiniTest::Rails::Testing.run_tests MiniTest::Rails::Testing.default_tasks
   end
 
   # Run all tests in all the test directories
+  # desc "Runs all tests"
   task :all do
-    errors = all_minitest_directories.collect do |task|
-      begin
-        Rake::Task["minitest:#{task}"].invoke
-        nil
-      rescue => e
-        { :task => "minitest:#{task}", :exception => e }
-      end
-    end.compact
-
-    if errors.any?
-      puts errors.map { |e| "Errors running #{e[:task]}! #{e[:exception].inspect}" }.join("\n")
-      abort
-    end
+    MiniTest::Rails::Testing.run_tests MiniTest::Rails::Testing.all_tasks
   end
 
-  all_minitest_directories.each do |task|
-    MiniTest::Rails::Tasks::SubTestTask.new(task => 'test:prepare') do |t|
-      t.libs.push 'test'
-      t.pattern = "test/#{task}/**/*_test.rb"
+  MiniTest::Rails::Testing.all_tasks.each do |task_dir|
+    unless Rake::Task.task_defined? "minitest:#{task_dir}"
+      # desc "Runs tests under test/#{task_dir}"
+      MiniTest::Rails::Tasks::SubTestTask.new(task_dir => "test:prepare") do |t|
+        t.libs.push "test"
+        t.pattern = "test/#{task_dir}/**/*_test.rb"
+        t.options = MiniTest::Rails::Testing.task_opts[task_dir] if MiniTest::Rails::Testing.task_opts[task_dir]
+      end
     end
   end
 
 end
 
 # Override the default task
-task :default => [] # Just in case it hasn't already been set
+task :default => [] # Just in case it hasn"t already been set
 Rake::Task[:default].clear
-desc "Runs minitest"
+desc "Runs default tests"
 task :default => "minitest"

data/lib/minitest/rails/test_case.rb

@@ -0,0 +1,93 @@
+gem "minitest" # make sure we get the gem, not stdlib
+require "minitest/spec"
+
+# I hate this! Be sure you have installed minitest_tu_shim
+require "test/unit" if RUBY_VERSION < "1.9"
+
+begin
+  require "active_support/testing/tagged_logging"
+rescue LoadError; end
+require "active_support/testing/setup_and_teardown"
+require "active_support/testing/assertions"
+require "active_support/testing/deprecation"
+require "active_support/testing/pending"
+require "active_support/testing/isolation"
+require "active_support/core_ext/kernel/reporting"
+
+begin
+  require 'active_support/testing/constant_lookup'
+rescue LoadError; end
+require "minitest/rails/constant_lookup"
+
+begin
+  silence_warnings { require "mocha/setup" }
+rescue LoadError
+end
+
+module MiniTest
+  module Rails
+    class TestCase < MiniTest::Spec
+
+      # This is deprecated in minitest, but I don't want to change the Rails calls to it.
+      # Keep it here for now, until a better way presents itself...
+      def assert_block msg = nil
+        msg = message(msg) { "Expected block to return true value" }
+        assert yield, msg
+      end
+
+      # For backward compatibility with Test::Unit
+      def build_message(message, template = nil, *args)
+        template = template.gsub('<?>', '<%s>')
+        message || sprintf(template, *args)
+      end
+
+      Assertion = MiniTest::Assertion
+      alias_method :method_name, :name if method_defined? :name
+      alias_method :method_name, :__name__ if method_defined? :__name__
+
+      $tags = {}
+      def self.for_tag(tag)
+        yield if $tags[tag]
+      end
+
+      include ::ActiveSupport::Testing::TaggedLogging if defined? ActiveSupport::Testing::TaggedLogging
+      include ::ActiveSupport::Testing::SetupAndTeardown
+      include ::ActiveSupport::Testing::Assertions
+      include ::ActiveSupport::Testing::Deprecation
+      include ::ActiveSupport::Testing::Pending
+
+      # Alias `it` instead of extending ActiveSupport::Testing::Declarative
+      class << self
+        alias :test :it
+      end
+
+      # Resolve constants from the test name when using the spec DSL
+      include Testing::ConstantLookup
+
+      # test/unit backwards compatibility methods
+      alias :assert_raise :assert_raises
+      alias :assert_not_empty :refute_empty
+      alias :assert_not_equal :refute_equal
+      alias :assert_not_in_delta :refute_in_delta
+      alias :assert_not_in_epsilon :refute_in_epsilon
+      alias :assert_not_includes :refute_includes
+      alias :assert_not_instance_of :refute_instance_of
+      alias :assert_not_kind_of :refute_kind_of
+      alias :assert_no_match :refute_match
+      alias :assert_not_nil :refute_nil
+      alias :assert_not_operator :refute_operator
+      alias :assert_not_predicate :refute_predicate
+      alias :assert_not_respond_to :refute_respond_to
+      alias :assert_not_same :refute_same
+
+      # Fails if the block raises an exception.
+      #
+      #   assert_nothing_raised do
+      #     ...
+      #   end
+      def assert_nothing_raised(*args)
+        yield
+      end
+    end
+  end
+end