minitest-rails 2.2.1 → 3.0.0.rc1

data/lib/minitest/rails/expectations.rb

@@ -54,7 +54,6 @@ module Minitest::Rails::Expectations
   #     must_respond_with 401
   #     value(response).must_respond_with 401
   #
-  # See also ActionController::TestCase#assert_response
   # See also ActionView::TestCase#assert_response
   # See also ActionDispatch::IntegrationTest#assert_response
   #
@@ -78,50 +77,12 @@ module Minitest::Rails::Expectations
   #     # expect that the redirection matches the regular expression
   #     must_redirect_to %r(\Ahttp://example.org)
   #
-  # See also ActionController::TestCase#assert_redirected_to
   # See also ActionView::TestCase#assert_redirected_to
   # See also ActionDispatch::IntegrationTest#assert_redirected_to
   #
   # :method: must_redirect_to
   # :call-seq: must_redirect_to(options = {}, message=nil)
 
-  ##
-  # Expects that the request was rendered with the appropriate template file or partials.
-  #
-  #     # expect that the "new" view template was rendered
-  #     must_render_template "new"
-  #
-  #     # expect that the exact template "admin/posts/new" was rendered
-  #     must_render_template %r{\Aadmin/posts/new\Z}
-  #
-  #     # expect that the layout 'admin' was rendered
-  #     must_render_template layout: 'admin'
-  #     must_render_template layout: 'layouts/admin'
-  #     must_render_template layout: :admin
-  #
-  #     # expect that no layout was rendered
-  #     must_render_template layout: nil
-  #     must_render_template layout: false
-  #
-  #     # expect that the "_customer" partial was rendered twice
-  #     must_render_template partial: '_customer', count: 2
-  #
-  #     # expect that no partials were rendered
-  #     must_render_template partial: false
-  #
-  # In a view test case, you can also expect that specific locals are passed
-  # to partials:
-  #
-  #     # expect that the "_customer" partial was rendered with a specific object
-  #     must_render_template partial: '_customer', locals: { customer: @customer }
-  #
-  # See also ActionController::TestCase#assert_template
-  # See also ActionView::TestCase#assert_template
-  # See also ActionDispatch::IntegrationTest#assert_template
-  #
-  # :method: must_render_template
-  # :call-seq: must_render_template(options = {}, message = nil)
-
   ##
   # Expects that the provided options can be used to generate the provided path. This is the inverse of +assert_recognizes+.
   # The +extras+ parameter is used to tell the request the names and values of additional request parameters that would be in
@@ -141,7 +102,6 @@ module Minitest::Rails::Expectations
   #   # Expects that the generated route gives us our custom route
   #   value({ controller: 'scm', action: 'show_diff', revision: "12" }).must_route_from "changesets/12"
   #
-  # See also ActionController::TestCase#assert_generates
   # See also ActionView::TestCase#assert_generates
   # See also ActionDispatch::IntegrationTest#assert_generates
   #
@@ -181,7 +141,6 @@ module Minitest::Rails::Expectations
   #   # Test a custom route
   #   value('view/item1').must_route_from({controller: 'items', action: 'show', id: '1'})
   #
-  # See also ActionController::TestCase#assert_recognizes
   # See also ActionView::TestCase#assert_recognizes
   # See also ActionDispatch::IntegrationTest#assert_recognizes
   #
@@ -212,7 +171,6 @@ module Minitest::Rails::Expectations
   #  # Tests a route with a HTTP method
   #  value({ controller: "product", action: "update", id: "321" }).must_route_for({ method: 'put', path: '/product/321' })
   #
-  # See also ActionController::TestCase#assert_routing
   # See also ActionView::TestCase#assert_routing
   # See also ActionDispatch::IntegrationTest#assert_routing
   #
@@ -308,7 +266,6 @@ module Minitest::Rails::Expectations
   #     must_select "[name=?]", /.+/  # Not empty
   #   end
   #
-  # See also ActionController::TestCase#assert_select
   # See also ActionView::TestCase#assert_select
   # See also ActionDispatch::IntegrationTest#assert_select
   #
@@ -331,7 +288,6 @@ module Minitest::Rails::Expectations
   #    end
   #  end
   #
-  # See also ActionController::TestCase#assert_select_email
   # See also ActionView::TestCase#assert_select_email
   # See also ActionDispatch::IntegrationTest#assert_select_email
   #
@@ -371,7 +327,6 @@ module Minitest::Rails::Expectations
   #     end
   #   end
   #
-  # See also ActionController::TestCase#assert_select_encoded
   # See also ActionView::TestCase#assert_select_encoded
   # See also ActionDispatch::IntegrationTest#assert_select_encoded
   #
@@ -385,7 +340,6 @@ module Minitest::Rails::Expectations
   #     apple_link = '<a href="http://www.example.com">Apples</a>'
   #     value(link_to("Apples", "http://www.example.com")).must_dom_equal apple_link
   #
-  # See also ActionController::TestCase#assert_dom_equal
   # See also ActionView::TestCase#assert_dom_equal
   # See also ActionDispatch::IntegrationTest#assert_dom_equal
   #
@@ -399,10 +353,8 @@ module Minitest::Rails::Expectations
   #     orange_link = '<a href="http://www.example.com">Oranges</a>'
   #     link_to("Apples", "http://www.example.com").wont_dom_equal orange_link
   #
-  # See also ActionController::TestCase#refute_dom_equal
   # See also ActionView::TestCase#refute_dom_equal
   # See also ActionDispatch::IntegrationTest#refute_dom_equal
-  # See also ActionController::TestCase#assert_dom_not_equal
   # See also ActionView::TestCase#assert_dom_not_equal
   # See also ActionDispatch::IntegrationTest#assert_dom_not_equal
   #
@@ -501,7 +453,6 @@ module Minitest::Rails::Expectations
   # that allow optional closing tags (p, li, td). <em>You must explicitly
   # close all of your tags to use these assertions.</em>
   #
-  # See also ActionController::TestCase#assert_tag
   # See also ActionView::TestCase#assert_tag
   # See also ActionDispatch::IntegrationTest#assert_tag
   #
@@ -523,10 +474,8 @@ module Minitest::Rails::Expectations
   #   wont_have_tag tag: "p",
   #              children: { count: 1..3, only: { tag: "img" } }
   #
-  # See also ActionController::TestCase#refute_tag
   # See also ActionView::TestCase#refute_tag
   # See also ActionDispatch::IntegrationTest#refute_tag
-  # See also ActionController::TestCase#assert_no_tag
   # See also ActionView::TestCase#assert_no_tag
   # See also ActionDispatch::IntegrationTest#assert_no_tag
   #
@@ -716,20 +665,9 @@ unless ENV["MT_NO_EXPECTATIONS"]
   end
   # Not real expectations, just aliases
   # The error messages don't get messed up this way
-  class ActionController::TestCase # :nodoc:
-    alias :must_respond_with :assert_response
-    alias :must_redirect_to :assert_redirected_to
-    alias :must_render_template :assert_template
-    alias :must_have_tag :assert_tag
-    alias :wont_have_tag :assert_no_tag
-    alias :must_select :assert_select
-    alias :must_select_email :assert_select_email
-    alias :must_select_encoded :assert_select_encoded
-  end
   class ActionView::TestCase # :nodoc:
     alias :must_respond_with :assert_response
     alias :must_redirect_to :assert_redirected_to
-    alias :must_render_template :assert_template
     alias :must_have_tag :assert_tag
     alias :wont_have_tag :assert_no_tag
     alias :must_select :assert_select
@@ -742,7 +680,6 @@ unless ENV["MT_NO_EXPECTATIONS"]
   class ActionDispatch::IntegrationTest # :nodoc:
     alias :must_respond_with :assert_response
     alias :must_redirect_to :assert_redirected_to
-    alias :must_render_template :assert_template
     alias :must_have_tag :assert_tag
     alias :wont_have_tag :assert_no_tag
     alias :must_select :assert_select

data/lib/minitest/rails/version.rb

@@ -1,5 +1,5 @@
 module Minitest
   module Rails
-    VERSION = "2.2.1"
+    VERSION = "3.0.0.rc1"
   end
 end

data/minitest-rails.gemspec

@@ -1,18 +1,18 @@
 # -*- encoding: utf-8 -*-
-# stub: minitest-rails 2.2.1.20160507120303 ruby lib
+# stub: minitest-rails 3.0.0.rc1.20160507123149 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "minitest-rails".freeze
-  s.version = "2.2.1.20160507120303"
+  s.version = "3.0.0.rc1.20160507123149"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Mike Moore".freeze]
   s.date = "2016-05-07"
   s.description = "Adds Minitest as the default testing library in Rails".freeze
   s.email = ["mike@blowmage.com".freeze]
   s.extra_rdoc_files = ["CHANGELOG.rdoc".freeze, "Manifest.txt".freeze, "README.rdoc".freeze]
-  s.files = [".autotest".freeze, ".gemtest".freeze, ".travis.yml".freeze, "CHANGELOG.rdoc".freeze, "Gemfile".freeze, "LICENSE".freeze, "Manifest.txt".freeze, "README.rdoc".freeze, "Rakefile".freeze, "gemfiles/4.1.gemfile".freeze, "gemfiles/4.2.gemfile".freeze, "lib/generators/.document".freeze, "lib/generators/minitest.rb".freeze, "lib/generators/minitest/controller/controller_generator.rb".freeze, "lib/generators/minitest/controller/templates/controller_spec.rb".freeze, "lib/generators/minitest/controller/templates/controller_test.rb".freeze, "lib/generators/minitest/generator/generator_generator.rb".freeze, "lib/generators/minitest/generator/templates/generator_spec.rb".freeze, "lib/generators/minitest/generator/templates/generator_test.rb".freeze, "lib/generators/minitest/helper/helper_generator.rb".freeze, "lib/generators/minitest/helper/templates/helper_spec.rb".freeze, "lib/generators/minitest/helper/templates/helper_test.rb".freeze, "lib/generators/minitest/install/install_generator.rb".freeze, "lib/generators/minitest/install/templates/test_helper.rb".freeze, "lib/generators/minitest/integration/integration_generator.rb".freeze, "lib/generators/minitest/integration/templates/integration_spec.rb".freeze, "lib/generators/minitest/integration/templates/integration_test.rb".freeze, "lib/generators/minitest/job/job_generator.rb".freeze, "lib/generators/minitest/job/templates/job_spec.rb".freeze, "lib/generators/minitest/job/templates/job_test.rb".freeze, "lib/generators/minitest/mailer/mailer_generator.rb".freeze, "lib/generators/minitest/mailer/templates/mailer_spec.rb".freeze, "lib/generators/minitest/mailer/templates/mailer_test.rb".freeze, "lib/generators/minitest/mailer/templates/preview.rb".freeze, "lib/generators/minitest/model/model_generator.rb".freeze, "lib/generators/minitest/model/templates/fixtures.yml".freeze, "lib/generators/minitest/model/templates/model_spec.rb".freeze, "lib/generators/minitest/model/templates/model_test.rb".freeze, "lib/generators/minitest/route/route_generator.rb".freeze, "lib/generators/minitest/route/templates/route_spec.rb".freeze, "lib/generators/minitest/route/templates/route_test.rb".freeze, "lib/generators/minitest/scaffold/scaffold_generator.rb".freeze, "lib/generators/minitest/scaffold/templates/controller_spec.rb".freeze, "lib/generators/minitest/scaffold/templates/controller_test.rb".freeze, "lib/minitest-rails.rb".freeze, "lib/minitest/rails.rb".freeze, "lib/minitest/rails/assertions.rb".freeze, "lib/minitest/rails/constant_lookup.rb".freeze, "lib/minitest/rails/expectations.rb".freeze, "lib/minitest/rails/railtie.rb".freeze, "lib/minitest/rails/version.rb".freeze, "minitest-rails.gemspec".freeze, "tasks/test.rake".freeze, "test/generators/test_controller_generator.rb".freeze, "test/generators/test_generator_generator.rb".freeze, "test/generators/test_helper_generator.rb".freeze, "test/generators/test_install_generator.rb".freeze, "test/generators/test_job_generator.rb".freeze, "test/generators/test_mailer_generator.rb".freeze, "test/generators/test_model_generator.rb".freeze, "test/generators/test_route_generator.rb".freeze, "test/generators/test_scaffold_generator.rb".freeze, "test/helper.rb".freeze, "test/rails/action_controller/test_assertions.rb".freeze, "test/rails/action_controller/test_controllers.rb".freeze, "test/rails/action_controller/test_expectations.rb".freeze, "test/rails/action_controller/test_spec_type.rb".freeze, "test/rails/action_dispatch/test_spec_type.rb".freeze, "test/rails/action_mailer/test_mailers.rb".freeze, "test/rails/action_mailer/test_spec_type.rb".freeze, "test/rails/action_view/test_helpers.rb".freeze, "test/rails/action_view/test_spec_type.rb".freeze, "test/rails/active_job/test_assertions.rb".freeze, "test/rails/active_job/test_expectations.rb".freeze, "test/rails/active_job/test_spec_type.rb".freeze, "test/rails/active_support/test_assertions.rb".freeze, "test/rails/active_support/test_expectations.rb".freeze, "test/rails/active_support/test_spec_type.rb".freeze, "test/rails/generators/test_spec_type.rb".freeze, "test/rails/minitest_5_api_test.rb".freeze, "test/rails/test_constant_lookup.rb".freeze, "test/test_sanity.rb".freeze]
+  s.files = [".autotest".freeze, ".gemtest".freeze, ".travis.yml".freeze, "CHANGELOG.rdoc".freeze, "Gemfile".freeze, "LICENSE".freeze, "Manifest.txt".freeze, "README.rdoc".freeze, "Rakefile".freeze, "gemfiles/5.0.gemfile".freeze, "gemfiles/head.gemfile".freeze, "lib/generators/.document".freeze, "lib/generators/minitest.rb".freeze, "lib/generators/minitest/controller/controller_generator.rb".freeze, "lib/generators/minitest/controller/templates/controller_spec.rb".freeze, "lib/generators/minitest/controller/templates/controller_test.rb".freeze, "lib/generators/minitest/generator/generator_generator.rb".freeze, "lib/generators/minitest/generator/templates/generator_spec.rb".freeze, "lib/generators/minitest/generator/templates/generator_test.rb".freeze, "lib/generators/minitest/helper/helper_generator.rb".freeze, "lib/generators/minitest/install/install_generator.rb".freeze, "lib/generators/minitest/install/templates/test_helper.rb".freeze, "lib/generators/minitest/integration/integration_generator.rb".freeze, "lib/generators/minitest/integration/templates/integration_spec.rb".freeze, "lib/generators/minitest/integration/templates/integration_test.rb".freeze, "lib/generators/minitest/job/job_generator.rb".freeze, "lib/generators/minitest/job/templates/job_spec.rb".freeze, "lib/generators/minitest/job/templates/job_test.rb".freeze, "lib/generators/minitest/mailer/mailer_generator.rb".freeze, "lib/generators/minitest/mailer/templates/mailer_spec.rb".freeze, "lib/generators/minitest/mailer/templates/mailer_test.rb".freeze, "lib/generators/minitest/mailer/templates/preview.rb".freeze, "lib/generators/minitest/model/model_generator.rb".freeze, "lib/generators/minitest/model/templates/fixtures.yml".freeze, "lib/generators/minitest/model/templates/model_spec.rb".freeze, "lib/generators/minitest/model/templates/model_test.rb".freeze, "lib/generators/minitest/scaffold/scaffold_generator.rb".freeze, "lib/generators/minitest/scaffold/templates/api_controller_spec.rb".freeze, "lib/generators/minitest/scaffold/templates/api_controller_test.rb".freeze, "lib/generators/minitest/scaffold/templates/controller_spec.rb".freeze, "lib/generators/minitest/scaffold/templates/controller_test.rb".freeze, "lib/minitest-rails.rb".freeze, "lib/minitest/rails.rb".freeze, "lib/minitest/rails/assertions.rb".freeze, "lib/minitest/rails/constant_lookup.rb".freeze, "lib/minitest/rails/expectations.rb".freeze, "lib/minitest/rails/railtie.rb".freeze, "lib/minitest/rails/version.rb".freeze, "minitest-rails.gemspec".freeze, "tasks/test.rake".freeze, "test/generators/test_controller_generator.rb".freeze, "test/generators/test_generator_generator.rb".freeze, "test/generators/test_helper_generator.rb".freeze, "test/generators/test_install_generator.rb".freeze, "test/generators/test_job_generator.rb".freeze, "test/generators/test_mailer_generator.rb".freeze, "test/generators/test_model_generator.rb".freeze, "test/generators/test_scaffold_generator.rb".freeze, "test/helper.rb".freeze, "test/rails/action_dispatch/test_assertions.rb".freeze, "test/rails/action_dispatch/test_expectations.rb".freeze, "test/rails/action_dispatch/test_spec_type.rb".freeze, "test/rails/action_mailer/test_mailers.rb".freeze, "test/rails/action_mailer/test_spec_type.rb".freeze, "test/rails/action_view/test_helpers.rb".freeze, "test/rails/action_view/test_spec_type.rb".freeze, "test/rails/active_job/test_assertions.rb".freeze, "test/rails/active_job/test_expectations.rb".freeze, "test/rails/active_job/test_spec_type.rb".freeze, "test/rails/active_support/test_assertions.rb".freeze, "test/rails/active_support/test_expectations.rb".freeze, "test/rails/active_support/test_spec_type.rb".freeze, "test/rails/generators/test_spec_type.rb".freeze, "test/rails/test_constant_lookup.rb".freeze, "test/test_sanity.rb".freeze]
   s.homepage = "http://blowmage.com/minitest-rails".freeze
   s.licenses = ["MIT".freeze]
   s.rdoc_options = ["--main".freeze, "README.rdoc".freeze]
@@ -23,23 +23,26 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<minitest>.freeze, ["~> 5.7"])
-      s.add_runtime_dependency(%q<railties>.freeze, ["~> 4.1"])
+      s.add_runtime_dependency(%q<minitest>.freeze, ["~> 5.8"])
+      s.add_runtime_dependency(%q<railties>.freeze, ["~> 5.0.0.rc1"])
       s.add_development_dependency(%q<rdoc>.freeze, ["~> 4.0"])
       s.add_development_dependency(%q<fakefs>.freeze, ["= 0.4.3"])
+      s.add_development_dependency(%q<minitest-focus>.freeze, ["~> 1.1"])
       s.add_development_dependency(%q<hoe>.freeze, ["~> 3.15"])
     else
-      s.add_dependency(%q<minitest>.freeze, ["~> 5.7"])
-      s.add_dependency(%q<railties>.freeze, ["~> 4.1"])
+      s.add_dependency(%q<minitest>.freeze, ["~> 5.8"])
+      s.add_dependency(%q<railties>.freeze, ["~> 5.0.0.rc1"])
       s.add_dependency(%q<rdoc>.freeze, ["~> 4.0"])
       s.add_dependency(%q<fakefs>.freeze, ["= 0.4.3"])
+      s.add_dependency(%q<minitest-focus>.freeze, ["~> 1.1"])
       s.add_dependency(%q<hoe>.freeze, ["~> 3.15"])
     end
   else
-    s.add_dependency(%q<minitest>.freeze, ["~> 5.7"])
-    s.add_dependency(%q<railties>.freeze, ["~> 4.1"])
+    s.add_dependency(%q<minitest>.freeze, ["~> 5.8"])
+    s.add_dependency(%q<railties>.freeze, ["~> 5.0.0.rc1"])
     s.add_dependency(%q<rdoc>.freeze, ["~> 4.0"])
     s.add_dependency(%q<fakefs>.freeze, ["= 0.4.3"])
+    s.add_dependency(%q<minitest-focus>.freeze, ["~> 1.1"])
     s.add_dependency(%q<hoe>.freeze, ["~> 3.15"])
   end
 end

data/tasks/test.rake

@@ -1,23 +1,23 @@
 namespace :test do
-  desc "Run tests for Rails 4.1"
-  task "4.1" do
+  desc "Run tests for Rails 5.0"
+  task "5.0" do
     sh "rm -f Gemfile.lock"
-    ENV["RAILS_VERSION"] = "4.1"
+    ENV["RAILS_VERSION"] = "5.0"
     sh "bundle && bundle exec rake test"
     sh "rm -f Gemfile.lock"
   end
 
-  desc "Run tests for Rails 4.2"
-  task "4.2" do
+  desc "Run tests for Rails head"
+  task "head" do
     sh "rm -f Gemfile.lock"
-    ENV["RAILS_VERSION"] = "4.2"
+    ENV["RAILS_VERSION"] = "head"
     sh "bundle && bundle exec rake test"
     sh "rm -f Gemfile.lock"
   end
 
   desc "Run tests for all Rails versions"
   task "all" do
-    sh "rake test:4.1"
-    sh "rake test:4.2"
+    sh "rake test:5.0"
+    sh "rake test:head"
   end
 end

data/test/generators/test_helper_generator.rb

@@ -4,39 +4,31 @@ require "generators/minitest/helper/helper_generator"
 class TestHelperGenerator < GeneratorTest
 
   def test_helper_generator
-    assert_output(/create  test\/helpers\/user_helper_test.rb/m) do
+    refute_output(/create  test\/helpers\/user_helper_test.rb/m) do
       Minitest::Generators::HelperGenerator.start ["user"]
     end
-    assert File.exists? "test/helpers/user_helper_test.rb"
-    contents = File.read "test/helpers/user_helper_test.rb"
-    assert_match(/class UserHelperTest < ActionView::TestCase/m, contents)
+    refute File.exists? "test/helpers/user_helper_test.rb"
   end
 
   def test_namespaced_helper_generator
-    assert_output(/create  test\/helpers\/admin\/user_helper_test.rb/m) do
+    refute_output(/create  test\/helpers\/admin\/user_helper_test.rb/m) do
       Minitest::Generators::HelperGenerator.start ["admin/user"]
     end
-    assert File.exists? "test/helpers/admin/user_helper_test.rb"
-    contents = File.read "test/helpers/admin/user_helper_test.rb"
-    assert_match(/class Admin::UserHelperTest < ActionView::TestCase/m, contents)
+    refute File.exists? "test/helpers/admin/user_helper_test.rb"
   end
 
   def test_helper_generator_spec
-    assert_output(/create  test\/helpers\/user_helper_test.rb/m) do
+    refute_output(/create  test\/helpers\/user_helper_test.rb/m) do
       Minitest::Generators::HelperGenerator.start ["user", "--spec"]
     end
-    assert File.exists? "test/helpers/user_helper_test.rb"
-    contents = File.read "test/helpers/user_helper_test.rb"
-    assert_match(/describe UserHelper do/m, contents)
+    refute File.exists? "test/helpers/user_helper_test.rb"
   end
 
   def test_namespaced_helper_generator_spec
-    assert_output(/create  test\/helpers\/admin\/user_helper_test.rb/m) do
+    refute_output(/create  test\/helpers\/admin\/user_helper_test.rb/m) do
       Minitest::Generators::HelperGenerator.start ["admin/user", "--spec"]
     end
-    assert File.exists? "test/helpers/admin/user_helper_test.rb"
-    contents = File.read "test/helpers/admin/user_helper_test.rb"
-    assert_match(/describe Admin::UserHelper do/m, contents)
+    refute File.exists? "test/helpers/admin/user_helper_test.rb"
   end
 
 end

data/test/generators/test_mailer_generator.rb

@@ -4,40 +4,39 @@ require "generators/minitest/mailer/mailer_generator"
 class TestMailerGenerator < GeneratorTest
 
   def test_mailer_generator
-    assert_output(/create  test\/mailers\/notification_test.rb/m) do
+    assert_output(/create  test\/mailers\/notification_mailer_test.rb/m) do
       Minitest::Generators::MailerGenerator.start ["notification"]
     end
-    assert File.exists? "test/mailers/notification_test.rb"
-    contents = File.read "test/mailers/notification_test.rb"
-    assert_match(/class NotificationTest/m, contents)
+    assert File.exists? "test/mailers/notification_mailer_test.rb"
+    contents = File.read "test/mailers/notification_mailer_test.rb"
+    assert_match(/class NotificationMailerTest/m, contents)
   end
 
   def test_namespaced_mailer_generator
-    assert_output(/create  test\/mailers\/admin\/notification_test.rb/m) do
+    assert_output(/create  test\/mailers\/admin\/notification_mailer_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)
+    assert File.exists? "test/mailers/admin/notification_mailer_test.rb"
+    contents = File.read "test/mailers/admin/notification_mailer_test.rb"
+    assert_match(/class Admin::NotificationMailerTest/m, contents)
   end
 
   def test_mailer_generator_spec
-    assert_output(/create  test\/mailers\/notification_test.rb/m) do
+    assert_output(/create  test\/mailers\/notification_mailer_test.rb/m) do
       Minitest::Generators::MailerGenerator.start ["notification", "welcome", "--spec"]
     end
-    assert File.exists? "test/mailers/notification_test.rb"
-    contents = File.read "test/mailers/notification_test.rb"
-    assert_match(/describe Notification do/m, contents)
+    assert File.exists? "test/mailers/notification_mailer_test.rb"
+    contents = File.read "test/mailers/notification_mailer_test.rb"
+    assert_match(/describe NotificationMailer do/m, contents)
   end
 
   def test_namespaced_mailer_generator_spec
-    assert_output(/create  test\/mailers\/admin\/notification_test.rb/m) do
+    assert_output(/create  test\/mailers\/admin\/notification_mailer_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)
+    assert File.exists? "test/mailers/admin/notification_mailer_test.rb"
+    contents = File.read "test/mailers/admin/notification_mailer_test.rb"
+    assert_match(/describe Admin::NotificationMailer do/m, contents)
   end
 
-
 end

data/test/generators/test_model_generator.rb

@@ -42,7 +42,7 @@ class TestModelGenerator < GeneratorTest
       Minitest::Generators::ModelGenerator.start ["user", "--spec"]
     end
     assert File.exists? "test/models/user_test.rb"
-    assert File.exists? "test/fixtures/users.yml"
+    # assert File.exists? "test/fixtures/users.yml"
     contents = File.read "test/models/user_test.rb"
     assert_match(/describe User do/m, contents)
   end

data/test/generators/test_scaffold_generator.rb

@@ -10,7 +10,7 @@ class TestScaffoldGenerator < GeneratorTest
     assert File.exists? "test/controllers/users_controller_test.rb"
     contents = File.read "test/controllers/users_controller_test.rb"
     assert_match(/class UsersControllerTest/m, contents)
-    assert_match(/post :create, user: { email: user.email, name: user.name }/m, contents)
+    assert_match(/post users_url, params: { user: { email: user.email, name: user.name } }/m, contents)
   end
 
   def test_scaffold_generator_spec
@@ -20,7 +20,7 @@ class TestScaffoldGenerator < GeneratorTest
     assert File.exists? "test/controllers/users_controller_test.rb"
     contents = File.read "test/controllers/users_controller_test.rb"
     assert_match(/describe UsersController do/m, contents)
-    assert_match(/post :create, user: { email: user.email, name: user.name }/m, contents)
+    assert_match(/post users_url, params: { user: { email: user.email, name: user.name } }/m, contents)
   end
 
 end

data/test/helper.rb

@@ -20,6 +20,7 @@ require "minitest-rails"
 require "rails/test_help"
 require "minitest/rails"
 
+require "minitest/focus"
 require "fakefs/safe"
 
 class FakeFS::File
@@ -39,6 +40,20 @@ class GeneratorTest < Minitest::Test
     FakeFS::FileSystem.clear
     FakeFS.deactivate!
   end
+
+  def refute_output stdout = nil, stderr = nil
+    out, err = capture_io do
+      yield
+    end
+
+    err_msg = Regexp === stderr ? :refute_match : :refute_equal if stderr
+    out_msg = Regexp === stdout ? :refute_match : :refute_equal if stdout
+
+    y = send err_msg, stderr, err, "In stderr" if err_msg
+    x = send out_msg, stdout, out, "In stdout" if out_msg
+
+    (!stdout || x) && (!stderr || y)
+  end
 end
 
 require "rails/test_help"
@@ -54,7 +69,7 @@ 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 index; render html: "<html><head><title>Models</title></head><body><h1>All <em>Models</em></h1></body></html>".html_safe; end
   def new; redirect_to "/models"; end
 end
 module Admin

data/test/rails/{action_controller → action_dispatch}/test_assertions.rb

@@ -1,23 +1,16 @@
 require "helper"
 
-class TestActionControllerAssertions < ActionController::TestCase
-  tests ModelsController
-
+class TestIntegrationAssertions < ActionDispatch::IntegrationTest
   def test_assert_response
-    get :index
+    get models_path
     assert_response :success
   end
 
   def test_assert_redirected_to
-    get :new
+    get new_model_path
     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"
@@ -37,7 +30,7 @@ class TestActionControllerAssertions < ActionController::TestCase
   end
 
   def test_assert_select
-    get :index
+    get models_path
     assert_select "body h1"
     assert_select "body" do
       assert_select "h1"