minitest-rails 0.9.2 → 1.0.0.beta1

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

@@ -15,48 +15,79 @@ end
 
 namespace "minitest" do
 
-  # Only run the default tasks defined in MiniTest::Rails::Testing.default_tasks
+  # Main entry point for minitest
   task :default do
     if ENV["TEST"]
       Rake::Task["minitest:single"].invoke
     else
-      MiniTest::Rails::Testing.run_tests MiniTest::Rails::Testing.default_tasks
+      Rake::Task["minitest:run"].invoke
     end
   end
 
-  desc "Run all tests"
-  task :all do
-    MiniTest::Rails::Testing.run_tests MiniTest::Rails::Testing.all_tasks
+  # Run a single test
+  MiniTest::Rails::Tasks::SubTestTask.new(:single => "test:prepare") do |t|
+    t.libs << "test"
+  end
+
+  # Run the default tests as definded in MiniTest::Rails::Testing.default_tasks
+  MiniTest::Rails::Tasks::SubTestTask.new(:run => "test:prepare") do |t|
+    t.libs.push "test"
+    t.pattern = "test/{#{MiniTest::Rails::Testing.default_tasks.join(',')}}/**/*_test.rb"
+  end
+
+  desc "Runs all tests"
+  MiniTest::Rails::Tasks::SubTestTask.new(:all => "test:prepare") do |t|
+    t.libs.push "test"
+    t.pattern = "test/**/*_test.rb"
   end
+
   namespace "all" do
-    desc "Run all tests, ungrouped for quicker execution"
-    MiniTest::Rails::Tasks::SubTestTask.new(:quick => "test:prepare") do |t|
+    desc "Runs all tests, without resetting the db"
+    MiniTest::Rails::Tasks::SubTestTask.new(:quick) do |t|
       t.libs.push "test"
       t.pattern = "test/**/*_test.rb"
     end
   end
 
-  MiniTest::Rails::Tasks::SubTestTask.new(:single => "test:prepare") do |t|
-    t.libs << "test"
-  end
-
+  # Loop that will define a task for each directory that has tests
   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
 
+# Statistics
+
+# set hook on stats task
+task :stats => "minitest:setup_stats"
+
+namespace "minitest" do
+  task :setup_stats do
+    require "rails/code_statistics"
+
+    # Clear existing test directories
+    STATS_DIRECTORIES.reject! { |name, dir| dir.starts_with? Rails.root.join("test").to_s }
+    CodeStatistics::TEST_TYPES.clear
+
+    # Add test directories that minitest-rails knows about
+    MiniTest::Rails::Testing.all_tasks.each do |dir|
+      name = "#{dir.capitalize} tests"
+      STATS_DIRECTORIES << [ name, Rails.root.join("test").join(dir).to_s ]
+      CodeStatistics::TEST_TYPES << name
+    end
+  end
+end
+
 # Override the test task
 task :test => [] # Just in case it hasn't already been set
 Rake::Task[:test].clear
-desc "Run default tests"
+desc "Runs default tests"
 task :test => "minitest"
 
 # Override the default task

data/lib/minitest/rails/testing.rb

@@ -6,34 +6,24 @@ module MiniTest
       mattr_accessor :default_tasks
       mattr_accessor :task_opts
 
+      ##
+      # The default tasks that are to be run by <tt>rake minitest</tt>.
+      #
+      #     # Add test/presenters to default test task
+      #     MiniTest::Rails::Testing.default_tasks << "presenters"
+      #
+      # Default values are: models helpers controllers mailers integration
+      # :attr: default_tasks
       self.default_tasks = %w(models helpers controllers mailers integration)
-      self.task_opts = { "performance" => "-- --benchmark" }
 
+      ##
+      # Retreive all the directories that have tests in them.
       def self.all_tasks
         Dir["test/*/"].map {|dir| /test\/(.+?)\//.match(dir)[1] }.select do |dir|
           !Dir.glob("test/#{dir}/**/*_test.rb").empty?
         end
       end
 
-      def self.run_tests directories
-        errors = directories.collect do |dir|
-          task = "minitest:#{dir}"
-          begin
-            if Rake::Task.task_defined? task
-              Rake::Task[task].invoke
-            end
-            nil
-          rescue => e
-            { :task => task, :exception => e }
-          end
-        end.compact
-
-        if errors.any?
-          puts errors.map { |e| "Errors running #{e[:task]}! #{e[:exception].inspect}" }.join("\n")
-          abort
-        end
-      end
-
     end
   end
 end

data/lib/minitest/rails/version.rb

@@ -1,5 +1,5 @@
 module MiniTest
   module Rails
-    VERSION = "0.9.2"
+    VERSION = "1.0.0.beta1"
   end
 end

data/lib/minitest/rails.rb

@@ -1,5 +1,9 @@
 gem "minitest"
-require "minitest/autorun"
+require "minitest/unit"
+require "minitest/test"
+require "minitest/spec"
+require "minitest/mock"
+require "minitest/autorun" unless ENV["MT_RAILS_NO_AUTORUN"]
 
 # Call rails/test_help because previous versions of minitest-rails
 # duplicated this functionality while trying to control the order
@@ -63,7 +67,7 @@ class ActionView::TestCase
   # 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
+      Module === constant && !(Class === constant)
     end
   end
 end
@@ -95,15 +99,30 @@ class ActionDispatch::IntegrationTest
   register_spec_type(/(Integration|Acceptance)( ?Test)?\z/i, self)
 end
 
+################################################################################
+# Assertions and Expectations
+################################################################################
+
+require "minitest/rails/assertions"
+require "minitest/rails/expectations"
+
+# :stopdoc:
+
 ################################################################################
 # 1.8.7 Spec DSL Support
 ################################################################################
 
 if LoadError.const_defined? :REGEXPS
   # Add relaxed regexp to allow whitespace so nested describes won't fail on 1.8.
-  LoadError::REGEXPS.unshift /^Missing \w+ (?:file\s*)?(.+\.rb)/i
+  LoadError::REGEXPS.unshift(/^Missing \w+ (?:file\s*)?(.+\.rb)/i)
 end
 
+################################################################################
+# Run load hooks so that other gems can register spec types
+################################################################################
+
+ActiveSupport.run_load_hooks(:minitest, ActiveSupport::TestCase)
+
 ################################################################################
 # Deprecated, for backwards compatibility with older minitest-rails only
 # Will be removed at version 1.0

data/minitest-rails.gemspec

@@ -1,45 +1,50 @@
 # -*- encoding: utf-8 -*-
+# stub: minitest-rails 1.0.0.beta1.20131220153633 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "minitest-rails"
-  s.version = "0.9.2.20130405010332"
+  s.version = "1.0.0.beta1.20131220153633"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Moore"]
-  s.date = "2013-04-05"
+  s.date = "2013-12-20"
   s.description = "Adds MiniTest as the default testing library in Rails 3 and 4"
   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/4.0.gemfile", "gemfiles/4.0.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_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/route/route_generator.rb", "lib/generators/mini_test/route/templates/route_spec.rb", "lib/generators/mini_test/route/templates/route_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/constant_lookup.rb", "lib/minitest/rails/deprecated/action_controller.rb", "lib/minitest/rails/deprecated/action_dispatch.rb", "lib/minitest/rails/deprecated/action_mailer.rb", "lib/minitest/rails/deprecated/action_view.rb", "lib/minitest/rails/deprecated/active_support.rb", "lib/minitest/rails/railtie.rb", "lib/minitest/rails/tasks/minitest.rake", "lib/minitest/rails/tasks/sub_test_task.rb", "lib/minitest/rails/testing.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_route_generator.rb", "test/generators/test_scaffold_generator.rb", "test/helper.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.files = [".autotest", ".gemtest", ".travis.yml", "CHANGELOG.rdoc", "Gemfile", "LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "gemfiles/3.0.gemfile", "gemfiles/3.1.gemfile", "gemfiles/3.2.gemfile", "gemfiles/4.0.gemfile", "gemfiles/minitest_tu_shim.rb", "lib/generators/.document", "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_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/route/route_generator.rb", "lib/generators/mini_test/route/templates/route_spec.rb", "lib/generators/mini_test/route/templates/route_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/assertions.rb", "lib/minitest/rails/constant_lookup.rb", "lib/minitest/rails/deprecated/action_controller.rb", "lib/minitest/rails/deprecated/action_dispatch.rb", "lib/minitest/rails/deprecated/action_mailer.rb", "lib/minitest/rails/deprecated/action_view.rb", "lib/minitest/rails/deprecated/active_support.rb", "lib/minitest/rails/expectations.rb", "lib/minitest/rails/generators.rb", "lib/minitest/rails/railtie.rb", "lib/minitest/rails/tasks/.document", "lib/minitest/rails/tasks/minitest.rake", "lib/minitest/rails/tasks/sub_test_task.rb", "lib/minitest/rails/testing.rb", "lib/minitest/rails/version.rb", "minitest-rails.gemspec", "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_route_generator.rb", "test/generators/test_scaffold_generator.rb", "test/helper.rb", "test/rails/action_controller/test_assertions.rb", "test/rails/action_controller/test_controllers.rb", "test/rails/action_controller/test_expectations.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_assertions.rb", "test/rails/active_support/test_expectations.rb", "test/rails/active_support/test_spec_type.rb", "test/rails/generators/test_spec_type.rb", "test/rails/minitest_5_api_test.rb", "test/rails/test_constant_lookup.rb", "test/test_sanity.rb"]
   s.homepage = "http://blowmage.com/minitest-rails"
+  s.licenses = ["MIT"]
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "minitest-rails"
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "2.1.11"
   s.summary = "MiniTest integration for Rails 3 and 4"
-  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_route_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.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_route_generator.rb", "test/generators/test_scaffold_generator.rb", "test/rails/action_controller/test_assertions.rb", "test/rails/action_controller/test_controllers.rb", "test/rails/action_controller/test_expectations.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_assertions.rb", "test/rails/active_support/test_expectations.rb", "test/rails/active_support/test_spec_type.rb", "test/rails/generators/test_spec_type.rb", "test/rails/test_constant_lookup.rb", "test/test_sanity.rb", "test/rails/minitest_5_api_test.rb"]
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<minitest>, ["~> 4.7"])
-      s.add_runtime_dependency(%q<rails>, [">= 3.0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
+      s.add_runtime_dependency(%q<minitest-test>, ["~> 1.0"])
+      s.add_runtime_dependency(%q<railties>, [">= 3.0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
       s.add_development_dependency(%q<fakefs>, ["~> 0.4"])
-      s.add_development_dependency(%q<hoe>, ["~> 3.5"])
+      s.add_development_dependency(%q<hoe>, ["~> 3.7"])
     else
       s.add_dependency(%q<minitest>, ["~> 4.7"])
-      s.add_dependency(%q<rails>, [">= 3.0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.10"])
+      s.add_dependency(%q<minitest-test>, ["~> 1.0"])
+      s.add_dependency(%q<railties>, [">= 3.0"])
+      s.add_dependency(%q<rdoc>, ["~> 4.0"])
       s.add_dependency(%q<fakefs>, ["~> 0.4"])
-      s.add_dependency(%q<hoe>, ["~> 3.5"])
+      s.add_dependency(%q<hoe>, ["~> 3.7"])
     end
   else
     s.add_dependency(%q<minitest>, ["~> 4.7"])
-    s.add_dependency(%q<rails>, [">= 3.0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.10"])
+    s.add_dependency(%q<minitest-test>, ["~> 1.0"])
+    s.add_dependency(%q<railties>, [">= 3.0"])
+    s.add_dependency(%q<rdoc>, ["~> 4.0"])
     s.add_dependency(%q<fakefs>, ["~> 0.4"])
-    s.add_dependency(%q<hoe>, ["~> 3.5"])
+    s.add_dependency(%q<hoe>, ["~> 3.7"])
   end
 end

data/tasks/test.rake

@@ -1,26 +1,38 @@
 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"
+  desc "Run tests for Rails 4.0"
+  task "4.0" do
+    ENV["RAILS_VERSION"] = "4.0"
+    sh "bundle && bundle exec rake test"
+    sh "rm Gemfile.lock"
+  end
+
+  desc "Run tests for Rails 3.2"
+  task "3.2" do
+    ENV["RAILS_VERSION"] = "3.2"
+    sh "bundle && bundle exec rake test"
+    sh "rm Gemfile.lock"
   end
 
-  desc "Run tests against the 3.1 gemfile"
+  desc "Run tests for Rails 3.1"
   task "3.1" do
-    ENV["BUNDLE_GEMFILE"] = "gemfiles/3.1.gemfile"
-    sh "bundle exec rake test"
+    ENV["RAILS_VERSION"] = "3.1"
+    sh "bundle && bundle exec rake test"
+    sh "rm Gemfile.lock"
   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"
+  desc "Run tests for Rails 3.0"
+  task "3.0" do
+    ENV["RAILS_VERSION"] = "3.0"
+    sh "bundle && bundle exec rake test"
+    sh "rm Gemfile.lock"
   end
 
-  desc "Run tests against the 4.0 gemfile"
-  task "4.0" do
-    ENV["BUNDLE_GEMFILE"] = "gemfiles/4.0.gemfile"
-    sh "bundle exec rake test"
+  desc "Run tests for all Rails versions"
+  task "all" do
+    sh "rake test:4.0"
+    sh "rake test:3.2"
+    sh "rake test:3.1"
+    sh "rake test:3.0"
   end
 end
 

data/test/generators/test_install_generator.rb

@@ -11,6 +11,23 @@ class TestInstallGenerator < GeneratorTest
     contents = File.read "test/test_helper.rb"
     assert_match(/require "rails\/test_help"/m, contents)
     assert_match(/require "minitest\/rails"/m, contents)
+    assert_match(/fixtures :all/m, contents)
+    if Rails::VERSION::STRING >= "4.0"
+      assert_match(/ActiveRecord::Migration.check_pending\!/m, contents)
+    else
+      refute_match(/ActiveRecord::Migration.check_pending\!/m, contents)
+    end
   end
 
+  def test_install_generator_without_active_record
+    assert_output(/create  test\/test_helper.rb/m) do
+      MiniTest::Generators::InstallGenerator.start ["--skip-active-record"]
+    end
+    assert File.exists? "test/test_helper.rb"
+    contents = File.read "test/test_helper.rb"
+    assert_match(/require "rails\/test_help"/m, contents)
+    assert_match(/require "minitest\/rails"/m, contents)
+    refute_match(/fixtures :all/m, contents)
+    refute_match(/ActiveRecord::Migration.check_pending\!/m, contents)
+  end
 end

data/test/generators/test_mailer_generator.rb

@@ -12,6 +12,15 @@ class TestMailerGenerator < GeneratorTest
     assert_match(/class NotificationTest/m, contents)
   end
 
+  def test_namespaced_mailer_generator
+    assert_output(/create  test\/mailers\/admin\/notification_test.rb/m) do
+      MiniTest::Generators::MailerGenerator.start ["admin/notification"]
+    end
+    assert File.exists? "test/mailers/admin/notification_test.rb"
+    contents = File.read "test/mailers/admin/notification_test.rb"
+    assert_match(/class Admin::NotificationTest/m, contents)
+  end
+
   def test_mailer_generator_spec
     assert_output(/create  test\/mailers\/notification_test.rb/m) do
       MiniTest::Generators::MailerGenerator.start ["notification", "welcome", "--spec"]
@@ -21,4 +30,14 @@ class TestMailerGenerator < GeneratorTest
     assert_match(/describe Notification do/m, contents)
   end
 
+  def test_namespaced_mailer_generator_spec
+    assert_output(/create  test\/mailers\/admin\/notification_test.rb/m) do
+      MiniTest::Generators::MailerGenerator.start ["admin/notification", "welcome", "--spec"]
+    end
+    assert File.exists? "test/mailers/admin/notification_test.rb"
+    contents = File.read "test/mailers/admin/notification_test.rb"
+    assert_match(/describe Admin::Notification do/m, contents)
+  end
+
+
 end

data/test/generators/test_model_generator.rb

@@ -12,6 +12,15 @@ class TestModelGenerator < GeneratorTest
     assert_match(/class UserTest/m, contents)
   end
 
+  def test_namespaced_model_generator
+    assert_output(/create  test\/models\/admin\/user_test.rb/m) do
+      MiniTest::Generators::ModelGenerator.start ["admin/user"]
+    end
+    assert File.exists? "test/models/admin/user_test.rb"
+    contents = File.read "test/models/admin/user_test.rb"
+    assert_match(/class Admin::UserTest/m, contents)
+  end
+
   def test_model_generator_spec
     assert_output(/create  test\/models\/user_test.rb/m) do
       MiniTest::Generators::ModelGenerator.start ["user", "--spec"]
@@ -22,6 +31,15 @@ class TestModelGenerator < GeneratorTest
     assert_match(/describe User do/m, contents)
   end
 
+  def test_namespaced_model_generator_spec
+    assert_output(/create  test\/models\/admin\/user_test.rb/m) do
+      MiniTest::Generators::ModelGenerator.start ["admin/user", "--spec"]
+    end
+    assert File.exists? "test/models/admin/user_test.rb"
+    contents = File.read "test/models/admin/user_test.rb"
+    assert_match(/describe Admin::User do/m, contents)
+  end
+
   def test_model_generator_fixture
     assert_output(/create  test\/fixtures\/users.yml/m) do
       MiniTest::Generators::ModelGenerator.start ["user"]
@@ -29,6 +47,13 @@ class TestModelGenerator < GeneratorTest
     assert File.exists? "test/fixtures/users.yml"
   end
 
+  def test_namespaced_model_generator_fixture
+    assert_output(/create  test\/fixtures\/admin\/users.yml/m) do
+      MiniTest::Generators::ModelGenerator.start ["admin/user"]
+    end
+    assert File.exists? "test/fixtures/admin/users.yml"
+  end
+
   def test_model_generator_skip_fixture
     out, _ = capture_io do
       MiniTest::Generators::ModelGenerator.start ["user", "--skip-fixture"]
@@ -36,5 +61,4 @@ class TestModelGenerator < GeneratorTest
     refute_match(/create  test\/fixtures\/users.yml/m, out)
     refute File.exists? "test/fixtures/users.yml"
   end
-
 end

data/test/helper.rb

@@ -34,3 +34,30 @@ class GeneratorTest < MiniTest::Unit::TestCase
     FakeFS.deactivate!
   end
 end
+
+require "rails/test_help"
+
+module TestApp
+  class Application < ::Rails::Application
+    config.secret_key_base = "abc123"
+  end
+end
+
+TestApp::Application.initialize!
+
+class ApplicationController < ActionController::Base; end
+class ModelsController < ApplicationController
+  def index; render :text => "<html><head><title>Models</title></head><body><h1>All Models</h1></body></html>"; end
+  def new; redirect_to "/models"; end
+end
+module Admin
+  class WidgetsController < ApplicationController; end
+end
+
+TestApp::Application.routes.draw do
+  # root :to => "models#index"
+  resources :models
+  namespace :admin do
+    resources :widgets
+  end
+end

data/test/rails/action_controller/test_assertions.rb

@@ -0,0 +1,46 @@
+require "helper"
+
+class TestActionControllerAssertions < ActionController::TestCase
+  tests ModelsController
+
+  def test_assert_response
+    get :index
+    assert_response :success
+  end
+
+  def test_assert_redirected_to
+    get :new
+    assert_redirected_to :models
+  end
+
+  def test_assert_template
+    get :index
+    assert_template :layout => false
+  end
+
+  def test_routing_assertions
+    params = { :controller => "models", :action => "index" }
+    path = "/models"
+    assert_generates path, params
+    assert_recognizes params, path
+    assert_routing path, params
+  end
+
+  def test_assert_dom_equal
+    apple_link = '<a href="http://www.example.com" target="_blank">Apples</a>'
+    apple_link2 = '<a target="_blank" href="http://www.example.com">Apples</a>'
+    orange_link = '<a href="http://www.example.com">Oranges</a>'
+
+    assert_dom_equal apple_link, apple_link2
+    refute_dom_equal apple_link, orange_link
+    assert_dom_not_equal apple_link, orange_link
+  end
+
+  def test_assert_select
+    get :index
+    assert_select "body h1"
+    assert_select "body" do
+      assert_select "h1"
+    end
+  end
+end

data/test/rails/action_controller/test_controllers.rb

@@ -1,16 +1,5 @@
 require "helper"
 
-class TestApp < Rails::Application
-end
-Rails.application = TestApp
-Rails.configuration.secret_key_base = "abc123"
-
-class ApplicationController < ActionController::Base; end
-class ModelsController      < ApplicationController;  end
-module Admin
-  class WidgetsController < ApplicationController; end
-end
-
 # ApplicationController
 describe ApplicationController do
   describe "nested" do
@@ -136,7 +125,7 @@ end
 # Nested Admin::WidgetsControllerTest
 module Admin
   class WidgetsControllerTest < ActionController::TestCase
-    test "exists" do
+    def test_exists
       assert_kind_of Admin::WidgetsController, @controller
     end
   end
@@ -159,7 +148,7 @@ module Admin
 end
 
 class Admin::WidgetsControllerTest < ActionController::TestCase
-  test "exists here too" do
+  def test_exists_here_too
     assert_kind_of Admin::WidgetsController, @controller
   end
 end

data/test/rails/action_controller/test_expectations.rb

@@ -0,0 +1,45 @@
+require "helper"
+
+class TestActionControllerExpectations < ActionController::TestCase
+  tests ModelsController
+
+  def test_must_respond_with
+    get :index
+    must_respond_with :success
+  end
+
+  def test_must_redirect_to
+    get :new
+    must_redirect_to :models
+  end
+
+  def test_must_render_template
+    get :index
+    must_render_template :layout => false
+  end
+
+  def test_routing_expectations
+    params = { :controller => "models", :action => "index" }
+    path = "/models"
+    params.must_route_to path
+    path.must_route_from params
+    params.must_route_for path
+  end
+
+  def test_must_dom_equal
+    apple_link = '<a href="http://www.example.com" target="_blank">Apples</a>'
+    apple_link2 = '<a target="_blank" href="http://www.example.com">Apples</a>'
+    orange_link = '<a href="http://www.example.com">Oranges</a>'
+
+    apple_link.must_dom_equal apple_link2
+    apple_link.wont_dom_equal orange_link
+  end
+
+  def test_must_select
+    get :index
+    must_select "body h1"
+    must_select "body" do
+      must_select "h1"
+    end
+  end
+end