minitest-rails 3.0.0.rc1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2688d8c89f8d51e4741631acb4405cbdce0d4b3f
-  data.tar.gz: 72969593b7e65122627b2e4287aff919d605a1d2
+  metadata.gz: b4d24ef4761098d8b1b988493155fb73ba0c480a
+  data.tar.gz: a6c181821e2331d20f05698fb632650c61d50db3
 SHA512:
-  metadata.gz: 3bf3b58bec282d666d52d12148a529e24006a4ff640546d8ca526d5367850ce6dc5dc90da3daf1e375c99e9b576981be45d50f0e1f550c30ec9645f9c78371b5
-  data.tar.gz: 7f135465d0b16375cfb4bd9085b2669836e90c438c63b3ddd80bd0011ec6515527cdfdfeba03b2a7b60371b5c8c06e14aa95edb35e7e2ff67d945e9175cbdee8
+  metadata.gz: 25066c06f3a6097e3a026b8576f3dc69a1b38988f37640f4ecb59868775d54ebfa67e7ff5150b74b12cd60fa28d1f22c17f236bbffbf7ad087c4a07937200892
+  data.tar.gz: 567cda05348d00933ff39b9175011b58315a83ac4c7959df168ed8264c7bce9d2b54fc1d46b086a742268f007c99fb06a0678ad86cf7e209837206a96f7ab1c2

data/.travis.yml

@@ -12,7 +12,7 @@ rvm:
   - 2.2.4
   - 2.2.3
   - 2.2.2
-  - head
+  - ruby-head
 env:
   - "RAILS_VERSION=5.0"
   - "RAILS_VERSION=head"

data/CHANGELOG.rdoc

@@ -1,3 +1,14 @@
+=== 3.0.0 / 2016-07-01
+
+* Support Rails 5
+
+  * The spec DSL is now default.
+  * Controller specs now use ActionDispatch::IntegrationTest.
+  * Controller specs optionally use ActionController::TestCase when
+    rails-controller-testing gem is present.
+
+https://github.com/blowmage/minitest-rails/compare/v2.2.0...v3.0.0
+
 === 2.2.0 / 2015-05-29
 
 * Update to Minitest 5.7

data/Manifest.txt

@@ -43,6 +43,7 @@ lib/minitest-rails.rb
 lib/minitest/rails.rb
 lib/minitest/rails/assertions.rb
 lib/minitest/rails/constant_lookup.rb
+lib/minitest/rails/controller.rb
 lib/minitest/rails/expectations.rb
 lib/minitest/rails/railtie.rb
 lib/minitest/rails/version.rb

data/README.rdoc

@@ -1,6 +1,6 @@
 = minitest-rails
 
-Minitest integration for Rails 4.1+
+Minitest integration for Rails 5
 
 {<img src="https://secure.travis-ci.org/blowmage/minitest-rails.png" alt="Build Status" />}[http://travis-ci.org/blowmage/minitest-rails]
 {<img src="https://codeclimate.com/github/blowmage/minitest-rails.png" />}[https://codeclimate.com/github/blowmage/minitest-rails]
@@ -24,6 +24,10 @@ Add <tt>minitest-rails</tt> to the Gemfile:
 
     gem "minitest-rails"
 
+If you are running Rails 4.1 or 4.2, be sure to specify a 2.x release in the Gemfile:
+
+    gem "minitest-rails", "~> 1.0"
+
 If you are running Rails 4.0 or earlier, be sure to specify a 1.x release in the Gemfile:
 
     gem "minitest-rails", "~> 1.0"
@@ -38,13 +42,13 @@ This will add the <tt>test_helper.rb</tt> file to the <tt>test</tt> directory.
 
 This project aims to enable Minitest within the Rails TestCase classes.
 Your test will continue to inherit from <tt>ActiveSupport::TestCase</tt>, which will now support the spec DSL.
-You can generate test files with the standard model, controller, resource, and other generators:
+You can generate test files using the <tt>Minitest::Spec</tt> DSL with the standard model, controller, resource, and other generators:
 
     rails generate model User
 
-And you can specify generating the tests using the <tt>Minitest::Spec</tt> DSL on any of the generators by providing the <tt>--spec</tt> option:
+And you can specify generating the tests without the <tt>Minitest::Spec</tt> DSL on any of the generators by providing the <tt>--no-spec</tt> option:
 
-    rails generate model User --spec
+    rails generate model User --no-spec
 
 And you can specify not generating the fixture for a model by providing the <tt>--skip-fixture</tt> option:
 
@@ -53,22 +57,16 @@ And you can specify not generating the fixture for a model by providing the <tt>
 You can also set these as defaults by adding the following to the <tt>config/application.rb</tt> file:
 
     config.generators do |g|
-      g.test_framework :minitest, spec: true, fixture: false
+      g.test_framework :minitest, spec: false, fixture: false
     end
-    
-== Running Tests
-
-To run your tests use the <tt>rake test</tt> that ship with rails. For a complete list run <tt>rake -T</tt>.
 
-To add additional testing tasks, define them in your <tt>Rakefile</tt> or a file in <tt>lib/tasks</tt> like so:
+== Running Tests
 
-    Rails::TestTask.new("test:presenters" => "test:prepare") do |t|
-      t.pattern = "test/presenters/**/*_test.rb"
-    end
+To run your tests use the <tt>rails test</tt> that ship with rails.
 
-If you want your new task to be run when you run <tt>rake test</tt>, also add the following:
+== Using Rails 4.1 or 4.2
 
-    Rake::Task["test:run"].enhance ["test:presenters"]
+For information on using minitest-rails with Rails 4.1 and 4.2, see the README for the 2.x branch: https://github.com/blowmage/minitest-rails/tree/2.x#readme
 
 == Using Rails 4.0 or earlier
 
@@ -78,12 +76,6 @@ For information on using minitest-rails with Rails 3.0 through 4.0, see the READ
 
 You can use Capybara for feature tests by adding <tt>minitest-rails-capybara</tt> as a dependency. See the README for more information: https://github.com/blowmage/minitest-rails-capybara
 
-== RSpec Compatibility
-
-RSpec and Minitest's spec DSL are incompatible and both cannot be loaded at the same time. If your tests using the spec DSL are not running it is likely the RSpec DSL is also loaded. Check the dependencies and make sure RSpec is only loaded when running the specs.
-
-If you need to use some RSpec features with minitest-rails require only the needed gems. e.g. To use RSpec mocks with minitest-rails require the "rspec-mocks" gem only, and not the main "rspec" gem which activates the RSpec DSL.
-
 == Get Involved
 
 Join the mailing list to get help or offer suggestions.

data/Rakefile

@@ -20,7 +20,7 @@ Hoe.spec "minitest-rails" do
   license "MIT"
 
   dependency "minitest",       "~> 5.8"
-  dependency "railties",       "~> 5.0.0.rc1"
+  dependency "railties",       "~> 5.0"
   dependency "fakefs",         "= 0.4.3", :dev
   dependency "minitest-focus", "~> 1.1", :dev
 end

data/gemfiles/5.0.gemfile

@@ -1,5 +1,5 @@
 source "http://rubygems.org" do
-  gem "rails", "~> 5.0.0.rc1"
+  gem "rails", "~> 5.0.0"
   gem "sqlite3"
   gem "rake"
 end

data/lib/generators/minitest.rb

@@ -3,12 +3,16 @@ require 'rails/generators/named_base'
 module Minitest
   module Generators
     class Base < ::Rails::Generators::NamedBase #:nodoc:
-      class_option :spec, type: :boolean, default: false,
+      class_option :spec, type: :boolean, default: true,
                           desc: "Use Minitest::Spec DSL"
 
       def self.default_source_root
         File.expand_path(File.join(File.dirname(__FILE__), 'minitest', generator_name, 'templates'))
       end
+
+      def show_helper
+        "#{singular_table_name}_url(#{singular_table_name})"
+      end
     end
   end
 end

data/lib/minitest/rails.rb

@@ -4,6 +4,21 @@ require "minitest/spec"
 require "minitest/mock"
 require "minitest/hell" if ENV["MT_HELL"]
 
+################################################################################
+# Do we support old school controller tests?
+################################################################################
+
+module Minitest
+  module Rails
+    def self.controller_tests?
+      require "rails-controller-testing"
+      return true
+    rescue LoadError
+      return false
+    end
+  end
+end
+
 ################################################################################
 # Add and configure the spec DSL
 ################################################################################
@@ -36,6 +51,30 @@ class ActiveSupport::TestCase
   end
 end
 
+if Minitest::Rails.controller_tests?
+  require "action_controller/test_case"
+  require "minitest/rails/controller"
+  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)
+    register_spec_type(self) do |desc, *addl|
+      addl.include? :controller
+    end
+
+    # 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
+end
+
 require "action_view/test_case"
 class ActionView::TestCase
   # Use AV::TestCase for the base class for helpers and views
@@ -92,15 +131,23 @@ end
 
 require "action_dispatch/testing/integration"
 class ActionDispatch::IntegrationTest
-  # Use AD::IntegrationTest for the base class when describing a controller
-  register_spec_type(self) do |desc|
-    Class === desc && desc < ActionController::Metal
-  end
-  # Register by name, either Integration or Controller
-  register_spec_type(/(Integration|Controller)( ?Test)?\z/i, self)
-  register_spec_type(self) do |desc, *addl|
-    addl.include?(:integration) ||
-      addl.include?(:controller)
+  if Minitest::Rails.controller_tests?
+    # Register by Integration name only
+    register_spec_type(/Integration( ?Test)?\z/i, self)
+    register_spec_type(self) do |desc, *addl|
+      addl.include? :integration
+    end
+  else
+    # Use AD::IntegrationTest for the base class when describing a controller
+    register_spec_type(self) do |desc|
+      Class === desc && desc < ActionController::Metal
+    end
+    # Register by name, either Integration or Controller
+    register_spec_type(/(Integration|Controller)( ?Test)?\z/i, self)
+    register_spec_type(self) do |desc, *addl|
+      addl.include?(:integration) ||
+        addl.include?(:controller)
+    end
   end
 end
 

data/lib/minitest/rails/assertions.rb

@@ -118,41 +118,6 @@ class ActionView::TestCase
   # :method: assert_redirected_to
   # :call-seq: assert_redirected_to(options = {}, message=nil)
 
-  ##
-  # Asserts that the request was rendered with the appropriate template file or partials.
-  #
-  #     # assert that the "new" view template was rendered
-  #     assert_template "new"
-  #
-  #     # assert that the exact template "admin/posts/new" was rendered
-  #     assert_template %r{\Aadmin/posts/new\Z}
-  #
-  #     # assert that the layout 'admin' was rendered
-  #     assert_template layout: 'admin'
-  #     assert_template layout: 'layouts/admin'
-  #     assert_template layout: :admin
-  #
-  #     # assert that no layout was rendered
-  #     assert_template layout: nil
-  #     assert_template layout: false
-  #
-  #     # assert that the "_customer" partial was rendered twice
-  #     assert_template partial: '_customer', count: 2
-  #
-  #     # assert that no partials were rendered
-  #     assert_template partial: false
-  #
-  # In a view test case, you can also assert that specific locals are passed
-  # to partials:
-  #
-  #     # assert that the "_customer" partial was rendered with a specific object
-  #     assert_template partial: '_customer', locals: { customer: @customer }
-  #
-  # See also Minitest::Rails::Expectations#must_render_template
-  #
-  # :method: assert_template
-  # :call-seq: assert_template(options = {}, message = nil)
-
   ##
   # Asserts 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
@@ -427,143 +392,6 @@ class ActionView::TestCase
   # :method: assert_dom_equal
   # :call-seq: assert_dom_equal(expected, actual, message = nil)
   alias :refute_dom_equal :assert_dom_not_equal
-
-  ##
-  # Asserts that there is a tag/node/element in the body of the response
-  # that meets all of the given conditions. The +conditions+ parameter must
-  # be a hash of any of the following keys (all are optional):
-  #
-  # * <tt>:tag</tt>: the node type must match the corresponding value
-  # * <tt>:attributes</tt>: a hash. The node's attributes must match the
-  #   corresponding values in the hash.
-  # * <tt>:parent</tt>: a hash. The node's parent must match the
-  #   corresponding hash.
-  # * <tt>:child</tt>: a hash. At least one of the node's immediate children
-  #   must meet the criteria described by the hash.
-  # * <tt>:ancestor</tt>: a hash. At least one of the node's ancestors must
-  #   meet the criteria described by the hash.
-  # * <tt>:descendant</tt>: a hash. At least one of the node's descendants
-  #   must meet the criteria described by the hash.
-  # * <tt>:sibling</tt>: a hash. At least one of the node's siblings must
-  #   meet the criteria described by the hash.
-  # * <tt>:after</tt>: a hash. The node must be after any sibling meeting
-  #   the criteria described by the hash, and at least one sibling must match.
-  # * <tt>:before</tt>: a hash. The node must be before any sibling meeting
-  #   the criteria described by the hash, and at least one sibling must match.
-  # * <tt>:children</tt>: a hash, for counting children of a node. Accepts
-  #   the keys:
-  #   * <tt>:count</tt>: either a number or a range which must equal (or
-  #     include) the number of children that match.
-  #   * <tt>:less_than</tt>: the number of matching children must be less
-  #     than this number.
-  #   * <tt>:greater_than</tt>: the number of matching children must be
-  #     greater than this number.
-  #   * <tt>:only</tt>: another hash consisting of the keys to use
-  #     to match on the children, and only matching children will be
-  #     counted.
-  # * <tt>:content</tt>: the textual content of the node must match the
-  #   given value. This will not match HTML tags in the body of a
-  #   tag--only text.
-  #
-  # Conditions are matched using the following algorithm:
-  #
-  # * if the condition is a string, it must be a substring of the value.
-  # * if the condition is a regexp, it must match the value.
-  # * if the condition is a number, the value must match number.to_s.
-  # * if the condition is +true+, the value must not be +nil+.
-  # * if the condition is +false+ or +nil+, the value must be +nil+.
-  #
-  #   # Assert that there is a "span" tag
-  #   assert_tag tag: "span"
-  #
-  #   # Assert that there is a "span" tag with id="x"
-  #   assert_tag tag: "span", attributes: { id: "x" }
-  #
-  #   # Assert that there is a "span" tag using the short-hand
-  #   assert_tag :span
-  #
-  #   # Assert that there is a "span" tag with id="x" using the short-hand
-  #   assert_tag :span, attributes: { id: "x" }
-  #
-  #   # Assert that there is a "span" inside of a "div"
-  #   assert_tag tag: "span", parent: { tag: "div" }
-  #
-  #   # Assert that there is a "span" somewhere inside a table
-  #   assert_tag tag: "span", ancestor: { tag: "table" }
-  #
-  #   # Assert that there is a "span" with at least one "em" child
-  #   assert_tag tag: "span", child: { tag: "em" }
-  #
-  #   # Assert that there is a "span" containing a (possibly nested)
-  #   # "strong" tag.
-  #   assert_tag tag: "span", descendant: { tag: "strong" }
-  #
-  #   # Assert that there is a "span" containing between 2 and 4 "em" tags
-  #   # as immediate children
-  #   assert_tag tag: "span",
-  #              children: { count: 2..4, only: { tag: "em" } }
-  #
-  #   # Get funky: assert that there is a "div", with an "ul" ancestor
-  #   # and an "li" parent (with "class" = "enum"), and containing a
-  #   # "span" descendant that contains text matching /hello world/
-  #   assert_tag tag: "div",
-  #              ancestor: { tag: "ul" },
-  #              parent: { tag: "li",
-  #                           attributes: { class: "enum" } },
-  #              descendant: { tag: "span",
-  #                               child: /hello world/ }
-  #
-  # <b>Please note</b>: +assert_tag+ and +assert_no_tag+ only work
-  # with well-formed XHTML. They recognize a few tags as implicitly self-closing
-  # (like br and hr and such) but will not work correctly with tags
-  # that allow optional closing tags (p, li, td). <em>You must explicitly
-  # close all of your tags to use these assertions.</em>
-  #
-  # See also Minitest::Rails::Expectations#must_have_tag
-  #
-  # :method: assert_tag
-  # :call-seq: assert_tag(*opts)
-
-  ##
-  # Identical to +assert_tag+, but asserts that a matching tag does _not_
-  # exist. (See +assert_tag+ for a full discussion of the syntax.)
-  #
-  #   # Assert that there is not a "div" containing a "p"
-  #   assert_no_tag tag: "div", descendant: { tag: "p" }
-  #
-  #   # Assert that an unordered list is empty
-  #   assert_no_tag tag: "ul", descendant: { tag: "li" }
-  #
-  #   # Assert that there is not a "p" tag with between 1 to 3 "img" tags
-  #   # as immediate children
-  #   assert_no_tag tag: "p",
-  #              children: { count: 1..3, only: { tag: "img" } }
-  #
-  # See also Minitest::Rails::Expectations#wont_have_tag
-  #
-  # :method: assert_no_tag
-  # :call-seq: assert_no_tag(*opts)
-
-  ##
-  # Identical to +assert_tag+, but asserts that a matching tag does _not_
-  # exist. (See +assert_tag+ for a full discussion of the syntax.)
-  #
-  #   # Assert that there is not a "div" containing a "p"
-  #   assert_no_tag tag: "div", descendant: { tag: "p" }
-  #
-  #   # Assert that an unordered list is empty
-  #   assert_no_tag tag: "ul", descendant: { tag: "li" }
-  #
-  #   # Assert that there is not a "p" tag with between 1 to 3 "img" tags
-  #   # as immediate children
-  #   assert_no_tag tag: "p",
-  #              children: { count: 1..3, only: { tag: "img" } }
-  #
-  # See also Minitest::Rails::Expectations#wont_have_tag
-  #
-  # :method: refute_tag
-  # :call-seq: refute_tag(*opts)
-  alias :refute_tag :assert_no_tag
 end
 
 class ActionDispatch::IntegrationTest
@@ -647,41 +475,6 @@ class ActionDispatch::IntegrationTest
   # :method: assert_redirected_to
   # :call-seq: assert_redirected_to(options = {}, message=nil)
 
-  ##
-  # Asserts that the request was rendered with the appropriate template file or partials.
-  #
-  #     # assert that the "new" view template was rendered
-  #     assert_template "new"
-  #
-  #     # assert that the exact template "admin/posts/new" was rendered
-  #     assert_template %r{\Aadmin/posts/new\Z}
-  #
-  #     # assert that the layout 'admin' was rendered
-  #     assert_template layout: 'admin'
-  #     assert_template layout: 'layouts/admin'
-  #     assert_template layout: :admin
-  #
-  #     # assert that no layout was rendered
-  #     assert_template layout: nil
-  #     assert_template layout: false
-  #
-  #     # assert that the "_customer" partial was rendered twice
-  #     assert_template partial: '_customer', count: 2
-  #
-  #     # assert that no partials were rendered
-  #     assert_template partial: false
-  #
-  # In a view test case, you can also assert that specific locals are passed
-  # to partials:
-  #
-  #     # assert that the "_customer" partial was rendered with a specific object
-  #     assert_template partial: '_customer', locals: { customer: @customer }
-  #
-  # See also Minitest::Rails::Expectations#must_render_template
-  #
-  # :method: assert_template
-  # :call-seq: assert_template(options = {}, message = nil)
-
   ##
   # Asserts 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
@@ -956,143 +749,6 @@ class ActionDispatch::IntegrationTest
   # :method: assert_dom_equal
   # :call-seq: assert_dom_equal(expected, actual, message = nil)
   alias :refute_dom_equal :assert_dom_not_equal
-
-  ##
-  # Asserts that there is a tag/node/element in the body of the response
-  # that meets all of the given conditions. The +conditions+ parameter must
-  # be a hash of any of the following keys (all are optional):
-  #
-  # * <tt>:tag</tt>: the node type must match the corresponding value
-  # * <tt>:attributes</tt>: a hash. The node's attributes must match the
-  #   corresponding values in the hash.
-  # * <tt>:parent</tt>: a hash. The node's parent must match the
-  #   corresponding hash.
-  # * <tt>:child</tt>: a hash. At least one of the node's immediate children
-  #   must meet the criteria described by the hash.
-  # * <tt>:ancestor</tt>: a hash. At least one of the node's ancestors must
-  #   meet the criteria described by the hash.
-  # * <tt>:descendant</tt>: a hash. At least one of the node's descendants
-  #   must meet the criteria described by the hash.
-  # * <tt>:sibling</tt>: a hash. At least one of the node's siblings must
-  #   meet the criteria described by the hash.
-  # * <tt>:after</tt>: a hash. The node must be after any sibling meeting
-  #   the criteria described by the hash, and at least one sibling must match.
-  # * <tt>:before</tt>: a hash. The node must be before any sibling meeting
-  #   the criteria described by the hash, and at least one sibling must match.
-  # * <tt>:children</tt>: a hash, for counting children of a node. Accepts
-  #   the keys:
-  #   * <tt>:count</tt>: either a number or a range which must equal (or
-  #     include) the number of children that match.
-  #   * <tt>:less_than</tt>: the number of matching children must be less
-  #     than this number.
-  #   * <tt>:greater_than</tt>: the number of matching children must be
-  #     greater than this number.
-  #   * <tt>:only</tt>: another hash consisting of the keys to use
-  #     to match on the children, and only matching children will be
-  #     counted.
-  # * <tt>:content</tt>: the textual content of the node must match the
-  #   given value. This will not match HTML tags in the body of a
-  #   tag--only text.
-  #
-  # Conditions are matched using the following algorithm:
-  #
-  # * if the condition is a string, it must be a substring of the value.
-  # * if the condition is a regexp, it must match the value.
-  # * if the condition is a number, the value must match number.to_s.
-  # * if the condition is +true+, the value must not be +nil+.
-  # * if the condition is +false+ or +nil+, the value must be +nil+.
-  #
-  #   # Assert that there is a "span" tag
-  #   assert_tag tag: "span"
-  #
-  #   # Assert that there is a "span" tag with id="x"
-  #   assert_tag tag: "span", attributes: { id: "x" }
-  #
-  #   # Assert that there is a "span" tag using the short-hand
-  #   assert_tag :span
-  #
-  #   # Assert that there is a "span" tag with id="x" using the short-hand
-  #   assert_tag :span, attributes: { id: "x" }
-  #
-  #   # Assert that there is a "span" inside of a "div"
-  #   assert_tag tag: "span", parent: { tag: "div" }
-  #
-  #   # Assert that there is a "span" somewhere inside a table
-  #   assert_tag tag: "span", ancestor: { tag: "table" }
-  #
-  #   # Assert that there is a "span" with at least one "em" child
-  #   assert_tag tag: "span", child: { tag: "em" }
-  #
-  #   # Assert that there is a "span" containing a (possibly nested)
-  #   # "strong" tag.
-  #   assert_tag tag: "span", descendant: { tag: "strong" }
-  #
-  #   # Assert that there is a "span" containing between 2 and 4 "em" tags
-  #   # as immediate children
-  #   assert_tag tag: "span",
-  #              children: { count: 2..4, only: { tag: "em" } }
-  #
-  #   # Get funky: assert that there is a "div", with an "ul" ancestor
-  #   # and an "li" parent (with "class" = "enum"), and containing a
-  #   # "span" descendant that contains text matching /hello world/
-  #   assert_tag tag: "div",
-  #              ancestor: { tag: "ul" },
-  #              parent: { tag: "li",
-  #                           attributes: { class: "enum" } },
-  #              descendant: { tag: "span",
-  #                               child: /hello world/ }
-  #
-  # <b>Please note</b>: +assert_tag+ and +assert_no_tag+ only work
-  # with well-formed XHTML. They recognize a few tags as implicitly self-closing
-  # (like br and hr and such) but will not work correctly with tags
-  # that allow optional closing tags (p, li, td). <em>You must explicitly
-  # close all of your tags to use these assertions.</em>
-  #
-  # See also Minitest::Rails::Expectations#must_have_tag
-  #
-  # :method: assert_tag
-  # :call-seq: assert_tag(*opts)
-
-  ##
-  # Identical to +assert_tag+, but asserts that a matching tag does _not_
-  # exist. (See +assert_tag+ for a full discussion of the syntax.)
-  #
-  #   # Assert that there is not a "div" containing a "p"
-  #   assert_no_tag tag: "div", descendant: { tag: "p" }
-  #
-  #   # Assert that an unordered list is empty
-  #   assert_no_tag tag: "ul", descendant: { tag: "li" }
-  #
-  #   # Assert that there is not a "p" tag with between 1 to 3 "img" tags
-  #   # as immediate children
-  #   assert_no_tag tag: "p",
-  #              children: { count: 1..3, only: { tag: "img" } }
-  #
-  # See also Minitest::Rails::Expectations#wont_have_tag
-  #
-  # :method: assert_no_tag
-  # :call-seq: assert_no_tag(*opts)
-
-  ##
-  # Identical to +assert_tag+, but asserts that a matching tag does _not_
-  # exist. (See +assert_tag+ for a full discussion of the syntax.)
-  #
-  #   # Assert that there is not a "div" containing a "p"
-  #   assert_no_tag tag: "div", descendant: { tag: "p" }
-  #
-  #   # Assert that an unordered list is empty
-  #   assert_no_tag tag: "ul", descendant: { tag: "li" }
-  #
-  #   # Assert that there is not a "p" tag with between 1 to 3 "img" tags
-  #   # as immediate children
-  #   assert_no_tag tag: "p",
-  #              children: { count: 1..3, only: { tag: "img" } }
-  #
-  # See also Minitest::Rails::Expectations#wont_have_tag
-  #
-  # :method: refute_tag
-  # :call-seq: refute_tag(*opts)
-  alias :refute_tag :assert_no_tag
 end
 
 if defined? ActiveJob

data/lib/minitest/rails/controller.rb

@@ -0,0 +1,14 @@
+##
+# Include the expectation aliases to calls on AC::TC will work.
+# Other assertions and expectations are already inherited.
+# No need to provide docs, we don't want to advertise this support.
+#
+
+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_select :assert_select
+  alias :must_select_email :assert_select_email
+  alias :must_select_encoded :assert_select_encoded
+end

data/lib/minitest/rails/expectations.rb

@@ -362,126 +362,6 @@ module Minitest::Rails::Expectations
   # :args: expected, message = nil
   infect_an_assertion :refute_dom_equal, :wont_dom_equal
 
-  ##
-  # Expects that there is a tag/node/element in the body of the response
-  # that meets all of the given conditions. The +conditions+ parameter must
-  # be a hash of any of the following keys (all are optional):
-  #
-  # * <tt>:tag</tt>: the node type must match the corresponding value
-  # * <tt>:attributes</tt>: a hash. The node's attributes must match the
-  #   corresponding values in the hash.
-  # * <tt>:parent</tt>: a hash. The node's parent must match the
-  #   corresponding hash.
-  # * <tt>:child</tt>: a hash. At least one of the node's immediate children
-  #   must meet the criteria described by the hash.
-  # * <tt>:ancestor</tt>: a hash. At least one of the node's ancestors must
-  #   meet the criteria described by the hash.
-  # * <tt>:descendant</tt>: a hash. At least one of the node's descendants
-  #   must meet the criteria described by the hash.
-  # * <tt>:sibling</tt>: a hash. At least one of the node's siblings must
-  #   meet the criteria described by the hash.
-  # * <tt>:after</tt>: a hash. The node must be after any sibling meeting
-  #   the criteria described by the hash, and at least one sibling must match.
-  # * <tt>:before</tt>: a hash. The node must be before any sibling meeting
-  #   the criteria described by the hash, and at least one sibling must match.
-  # * <tt>:children</tt>: a hash, for counting children of a node. Accepts
-  #   the keys:
-  #   * <tt>:count</tt>: either a number or a range which must equal (or
-  #     include) the number of children that match.
-  #   * <tt>:less_than</tt>: the number of matching children must be less
-  #     than this number.
-  #   * <tt>:greater_than</tt>: the number of matching children must be
-  #     greater than this number.
-  #   * <tt>:only</tt>: another hash consisting of the keys to use
-  #     to match on the children, and only matching children will be
-  #     counted.
-  # * <tt>:content</tt>: the textual content of the node must match the
-  #   given value. This will not match HTML tags in the body of a
-  #   tag--only text.
-  #
-  # Conditions are matched using the following algorithm:
-  #
-  # * if the condition is a string, it must be a substring of the value.
-  # * if the condition is a regexp, it must match the value.
-  # * if the condition is a number, the value must match number.to_s.
-  # * if the condition is +true+, the value must not be +nil+.
-  # * if the condition is +false+ or +nil+, the value must be +nil+.
-  #
-  #   # Expect that there is a "span" tag
-  #   must_have_tag tag: "span"
-  #
-  #   # Expect that there is a "span" tag with id="x"
-  #   must_have_tag tag: "span", attributes: { id: "x" }
-  #
-  #   # Expect that there is a "span" tag using the short-hand
-  #   must_have_tag :span
-  #
-  #   # Expect that there is a "span" tag with id="x" using the short-hand
-  #   must_have_tag :span, attributes: { id: "x" }
-  #
-  #   # Expect that there is a "span" inside of a "div"
-  #   must_have_tag tag: "span", parent: { tag: "div" }
-  #
-  #   # Expect that there is a "span" somewhere inside a table
-  #   must_have_tag tag: "span", ancestor: { tag: "table" }
-  #
-  #   # Expect that there is a "span" with at least one "em" child
-  #   must_have_tag tag: "span", child: { tag: "em" }
-  #
-  #   # Expect that there is a "span" containing a (possibly nested)
-  #   # "strong" tag.
-  #   must_have_tag tag: "span", descendant: { tag: "strong" }
-  #
-  #   # Expect that there is a "span" containing between 2 and 4 "em" tags
-  #   # as immediate children
-  #   must_have_tag tag: "span",
-  #              children: { count: 2..4, only: { tag: "em" } }
-  #
-  #   # Get funky: assert that there is a "div", with an "ul" ancestor
-  #   # and an "li" parent (with "class" = "enum"), and containing a
-  #   # "span" descendant that contains text matching /hello world/
-  #   must_have_tag tag: "div",
-  #              ancestor: { tag: "ul" },
-  #              parent: { tag: "li",
-  #                           attributes: { class: "enum" } },
-  #              descendant: { tag: "span",
-  #                               child: /hello world/ }
-  #
-  # <b>Please note</b>: +must_have_tag+ and +wont_have_tag+ only work
-  # with well-formed XHTML. They recognize a few tags as implicitly self-closing
-  # (like br and hr and such) but will not work correctly with tags
-  # that allow optional closing tags (p, li, td). <em>You must explicitly
-  # close all of your tags to use these assertions.</em>
-  #
-  # See also ActionView::TestCase#assert_tag
-  # See also ActionDispatch::IntegrationTest#assert_tag
-  #
-  # :method: must_have_tag
-  # :call-seq: must_have_tag(*opts)
-
-  ##
-  # Identical to +must_have_tag+, but asserts that a matching tag does _not_
-  # exist. (See +must_have_tag+ for a full discussion of the syntax.)
-  #
-  #   # Expect that there is not a "div" containing a "p"
-  #   wont_have_tag tag: "div", descendant: { tag: "p" }
-  #
-  #   # Expect that an unordered list is empty
-  #   wont_have_tag tag: "ul", descendant: { tag: "li" }
-  #
-  #   # Expect that there is not a "p" tag with between 1 to 3 "img" tags
-  #   # as immediate children
-  #   wont_have_tag tag: "p",
-  #              children: { count: 1..3, only: { tag: "img" } }
-  #
-  # See also ActionView::TestCase#refute_tag
-  # See also ActionDispatch::IntegrationTest#refute_tag
-  # See also ActionView::TestCase#assert_no_tag
-  # See also ActionDispatch::IntegrationTest#assert_no_tag
-  #
-  # :method: wont_have_tag
-  # :call-seq: wont_have_tag(*opts)
-
   if defined?(::ActiveJob)
     ##############################################################################
     # ActiveJob Expectations
@@ -668,8 +548,6 @@ unless ENV["MT_NO_EXPECTATIONS"]
   class ActionView::TestCase # :nodoc:
     alias :must_respond_with :assert_response
     alias :must_redirect_to :assert_redirected_to
-    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
@@ -680,8 +558,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_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

data/lib/minitest/rails/version.rb

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

data/minitest-rails.gemspec

@@ -1,18 +1,18 @@
 # -*- encoding: utf-8 -*-
-# stub: minitest-rails 3.0.0.rc1.20160507123149 ruby lib
+# stub: minitest-rails 3.0.0.20160701081338 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "minitest-rails".freeze
-  s.version = "3.0.0.rc1.20160507123149"
+  s.version = "3.0.0.20160701081338"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1".freeze) if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Mike Moore".freeze]
-  s.date = "2016-05-07"
+  s.date = "2016-07-01"
   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/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.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/controller.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]
@@ -24,14 +24,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<minitest>.freeze, ["~> 5.8"])
-      s.add_runtime_dependency(%q<railties>.freeze, ["~> 5.0.0.rc1"])
+      s.add_runtime_dependency(%q<railties>.freeze, ["~> 5.0"])
       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.8"])
-      s.add_dependency(%q<railties>.freeze, ["~> 5.0.0.rc1"])
+      s.add_dependency(%q<railties>.freeze, ["~> 5.0"])
       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"])
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<minitest>.freeze, ["~> 5.8"])
-    s.add_dependency(%q<railties>.freeze, ["~> 5.0.0.rc1"])
+    s.add_dependency(%q<railties>.freeze, ["~> 5.0"])
     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"])

data/tasks/test.rake

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

data/test/generators/test_controller_generator.rb

@@ -5,7 +5,7 @@ class TestControllerGenerator < GeneratorTest
 
   def test_controller_generator
     assert_output(/create  test\/controllers\/user_controller_test.rb/m) do
-      Minitest::Generators::ControllerGenerator.start ["user"]
+      Minitest::Generators::ControllerGenerator.start ["user", "--no-spec"]
     end
     assert File.exists? "test/controllers/user_controller_test.rb"
     contents = File.read "test/controllers/user_controller_test.rb"
@@ -14,7 +14,7 @@ class TestControllerGenerator < GeneratorTest
 
   def test_namespaced_controller_generator
     assert_output(/create  test\/controllers\/admin\/user_controller_test.rb/m) do
-      Minitest::Generators::ControllerGenerator.start ["admin/user"]
+      Minitest::Generators::ControllerGenerator.start ["admin/user", "--no-spec"]
     end
     assert File.exists? "test/controllers/admin/user_controller_test.rb"
     contents = File.read "test/controllers/admin/user_controller_test.rb"
@@ -26,7 +26,7 @@ class TestControllerGenerator < GeneratorTest
     Rails::Generators.namespace = TestApp
 
     assert_output(/create  test\/controllers\/test_app\/user_controller_test.rb/m) do
-      Minitest::Generators::ControllerGenerator.start ["user"]
+      Minitest::Generators::ControllerGenerator.start ["user", "--no-spec"]
     end
     assert File.exists? "test/controllers/test_app/user_controller_test.rb"
     contents = File.read "test/controllers/test_app/user_controller_test.rb"
@@ -39,7 +39,7 @@ class TestControllerGenerator < GeneratorTest
 
   def test_controller_generator_spec
     assert_output(/create  test\/controllers\/user_controller_test.rb/m) do
-      Minitest::Generators::ControllerGenerator.start ["user", "--spec"]
+      Minitest::Generators::ControllerGenerator.start ["user"]
     end
     assert File.exists? "test/controllers/user_controller_test.rb"
     contents = File.read "test/controllers/user_controller_test.rb"
@@ -48,7 +48,7 @@ class TestControllerGenerator < GeneratorTest
 
   def test_namespaced_controller_generator_spec
     assert_output(/create  test\/controllers\/admin\/user_controller_test.rb/m) do
-      Minitest::Generators::ControllerGenerator.start ["admin/user", "--spec"]
+      Minitest::Generators::ControllerGenerator.start ["admin/user"]
     end
     assert File.exists? "test/controllers/admin/user_controller_test.rb"
     contents = File.read "test/controllers/admin/user_controller_test.rb"

data/test/generators/test_generator_generator.rb

@@ -5,7 +5,7 @@ class TestGeneratorGenerator < GeneratorTest
 
   def test_generator_generator
     assert_output(/create  test\/lib\/generators\/awesome_generator_test.rb/m) do
-      Minitest::Generators::GeneratorGenerator.start ["awesome"]
+      Minitest::Generators::GeneratorGenerator.start ["awesome", "--no-spec"]
     end
     assert File.exists? "test/lib/generators/awesome_generator_test.rb"
     contents = File.read "test/lib/generators/awesome_generator_test.rb"
@@ -14,7 +14,7 @@ class TestGeneratorGenerator < GeneratorTest
 
   def test_namespaced_generator_generator
     assert_output(/create  test\/lib\/generators\/rails\/awesome_generator_test.rb/m) do
-      Minitest::Generators::GeneratorGenerator.start ["rails/awesome"]
+      Minitest::Generators::GeneratorGenerator.start ["rails/awesome", "--no-spec"]
     end
     assert File.exists? "test/lib/generators/rails/awesome_generator_test.rb"
     contents = File.read "test/lib/generators/rails/awesome_generator_test.rb"
@@ -26,7 +26,7 @@ class TestGeneratorGenerator < GeneratorTest
     Rails::Generators.namespace = TestApp
 
     assert_output(/create  test\/lib\/generators\/test_app\/awesome_generator_test.rb/m) do
-      Minitest::Generators::GeneratorGenerator.start ["awesome"]
+      Minitest::Generators::GeneratorGenerator.start ["awesome", "--no-spec"]
     end
     assert File.exists? "test/lib/generators/test_app/awesome_generator_test.rb"
     contents = File.read "test/lib/generators/test_app/awesome_generator_test.rb"
@@ -39,7 +39,7 @@ class TestGeneratorGenerator < GeneratorTest
 
   def test_generator_generator_spec
     assert_output(/create  test\/lib\/generators\/awesome_generator_test.rb/m) do
-      Minitest::Generators::GeneratorGenerator.start ["awesome", "--spec"]
+      Minitest::Generators::GeneratorGenerator.start ["awesome"]
     end
     assert File.exists? "test/lib/generators/awesome_generator_test.rb"
     contents = File.read "test/lib/generators/awesome_generator_test.rb"
@@ -48,7 +48,7 @@ class TestGeneratorGenerator < GeneratorTest
 
   def test_namespaced_generator_generator_spec
     assert_output(/create  test\/lib\/generators\/rails\/awesome_generator_test.rb/m) do
-      Minitest::Generators::GeneratorGenerator.start ["rails/awesome", "--spec"]
+      Minitest::Generators::GeneratorGenerator.start ["rails/awesome"]
     end
     assert File.exists? "test/lib/generators/rails/awesome_generator_test.rb"
     contents = File.read "test/lib/generators/rails/awesome_generator_test.rb"

data/test/generators/test_helper_generator.rb

@@ -5,28 +5,28 @@ class TestHelperGenerator < GeneratorTest
 
   def test_helper_generator
     refute_output(/create  test\/helpers\/user_helper_test.rb/m) do
-      Minitest::Generators::HelperGenerator.start ["user"]
+      Minitest::Generators::HelperGenerator.start ["user", "--no-spec"]
     end
     refute File.exists? "test/helpers/user_helper_test.rb"
   end
 
   def test_namespaced_helper_generator
     refute_output(/create  test\/helpers\/admin\/user_helper_test.rb/m) do
-      Minitest::Generators::HelperGenerator.start ["admin/user"]
+      Minitest::Generators::HelperGenerator.start ["admin/user", "--no-spec"]
     end
     refute File.exists? "test/helpers/admin/user_helper_test.rb"
   end
 
   def test_helper_generator_spec
     refute_output(/create  test\/helpers\/user_helper_test.rb/m) do
-      Minitest::Generators::HelperGenerator.start ["user", "--spec"]
+      Minitest::Generators::HelperGenerator.start ["user"]
     end
     refute File.exists? "test/helpers/user_helper_test.rb"
   end
 
   def test_namespaced_helper_generator_spec
     refute_output(/create  test\/helpers\/admin\/user_helper_test.rb/m) do
-      Minitest::Generators::HelperGenerator.start ["admin/user", "--spec"]
+      Minitest::Generators::HelperGenerator.start ["admin/user"]
     end
     refute File.exists? "test/helpers/admin/user_helper_test.rb"
   end

data/test/generators/test_job_generator.rb

@@ -7,7 +7,7 @@ if defined? ActiveJob # Rails 4.2 and later.
 
     def test_job_generator
       assert_output(/create  test\/jobs\/user_invite_job_test.rb/m) do
-        Minitest::Generators::JobGenerator.start ["user_invite"]
+        Minitest::Generators::JobGenerator.start ["user_invite", "--no-spec"]
       end
       assert File.exists? "test/jobs/user_invite_job_test.rb"
       contents = File.read "test/jobs/user_invite_job_test.rb"
@@ -16,7 +16,7 @@ if defined? ActiveJob # Rails 4.2 and later.
 
     def test_namespaced_job_generator
       assert_output(/create  test\/jobs\/admin\/user_invite_job_test.rb/m) do
-        Minitest::Generators::JobGenerator.start ["admin/user_invite"]
+        Minitest::Generators::JobGenerator.start ["admin/user_invite", "--no-spec"]
       end
       assert File.exists? "test/jobs/admin/user_invite_job_test.rb"
       contents = File.read "test/jobs/admin/user_invite_job_test.rb"
@@ -25,7 +25,7 @@ if defined? ActiveJob # Rails 4.2 and later.
 
     def test_job_generator_spec
       assert_output(/create  test\/jobs\/user_invite_job_test.rb/m) do
-        Minitest::Generators::JobGenerator.start ["user_invite", "--spec"]
+        Minitest::Generators::JobGenerator.start ["user_invite"]
       end
       assert File.exists? "test/jobs/user_invite_job_test.rb"
       contents = File.read "test/jobs/user_invite_job_test.rb"
@@ -34,7 +34,7 @@ if defined? ActiveJob # Rails 4.2 and later.
 
     def test_namespaced_job_generator_spec
       assert_output(/create  test\/jobs\/admin\/user_invite_job_test.rb/m) do
-        Minitest::Generators::JobGenerator.start ["admin/user_invite", "--spec"]
+        Minitest::Generators::JobGenerator.start ["admin/user_invite"]
       end
       assert File.exists? "test/jobs/admin/user_invite_job_test.rb"
       contents = File.read "test/jobs/admin/user_invite_job_test.rb"

data/test/generators/test_mailer_generator.rb

@@ -5,7 +5,7 @@ class TestMailerGenerator < GeneratorTest
 
   def test_mailer_generator
     assert_output(/create  test\/mailers\/notification_mailer_test.rb/m) do
-      Minitest::Generators::MailerGenerator.start ["notification"]
+      Minitest::Generators::MailerGenerator.start ["notification", "--no-spec"]
     end
     assert File.exists? "test/mailers/notification_mailer_test.rb"
     contents = File.read "test/mailers/notification_mailer_test.rb"
@@ -14,7 +14,7 @@ class TestMailerGenerator < GeneratorTest
 
   def test_namespaced_mailer_generator
     assert_output(/create  test\/mailers\/admin\/notification_mailer_test.rb/m) do
-      Minitest::Generators::MailerGenerator.start ["admin/notification"]
+      Minitest::Generators::MailerGenerator.start ["admin/notification", "--no-spec"]
     end
     assert File.exists? "test/mailers/admin/notification_mailer_test.rb"
     contents = File.read "test/mailers/admin/notification_mailer_test.rb"
@@ -23,7 +23,7 @@ class TestMailerGenerator < GeneratorTest
 
   def test_mailer_generator_spec
     assert_output(/create  test\/mailers\/notification_mailer_test.rb/m) do
-      Minitest::Generators::MailerGenerator.start ["notification", "welcome", "--spec"]
+      Minitest::Generators::MailerGenerator.start ["notification", "welcome"]
     end
     assert File.exists? "test/mailers/notification_mailer_test.rb"
     contents = File.read "test/mailers/notification_mailer_test.rb"
@@ -32,7 +32,7 @@ class TestMailerGenerator < GeneratorTest
 
   def test_namespaced_mailer_generator_spec
     assert_output(/create  test\/mailers\/admin\/notification_mailer_test.rb/m) do
-      Minitest::Generators::MailerGenerator.start ["admin/notification", "welcome", "--spec"]
+      Minitest::Generators::MailerGenerator.start ["admin/notification", "welcome"]
     end
     assert File.exists? "test/mailers/admin/notification_mailer_test.rb"
     contents = File.read "test/mailers/admin/notification_mailer_test.rb"

data/test/generators/test_model_generator.rb

@@ -5,7 +5,7 @@ class TestModelGenerator < GeneratorTest
 
   def test_model_generator
     assert_output(/create  test\/models\/user_test.rb/m) do
-      Minitest::Generators::ModelGenerator.start ["user"]
+      Minitest::Generators::ModelGenerator.start ["user", "--no-spec"]
     end
     assert File.exists? "test/models/user_test.rb"
     contents = File.read "test/models/user_test.rb"
@@ -14,7 +14,7 @@ class TestModelGenerator < GeneratorTest
 
   def test_namespaced_model_generator
     assert_output(/create  test\/models\/admin\/user_test.rb/m) do
-      Minitest::Generators::ModelGenerator.start ["admin/user"]
+      Minitest::Generators::ModelGenerator.start ["admin/user", "--no-spec"]
     end
     assert File.exists? "test/models/admin/user_test.rb"
     contents = File.read "test/models/admin/user_test.rb"
@@ -26,7 +26,7 @@ class TestModelGenerator < GeneratorTest
     Rails::Generators.namespace = TestApp
 
     assert_output(/create  test\/models\/test_app\/user_test.rb/m) do
-      Minitest::Generators::ModelGenerator.start ["user"]
+      Minitest::Generators::ModelGenerator.start ["user", "--no-spec"]
     end
     assert File.exists? "test/models/test_app/user_test.rb"
     contents = File.read "test/models/test_app/user_test.rb"
@@ -39,7 +39,7 @@ class TestModelGenerator < GeneratorTest
 
   def test_model_generator_spec
     assert_output(/create  test\/models\/user_test.rb/m) do
-      Minitest::Generators::ModelGenerator.start ["user", "--spec"]
+      Minitest::Generators::ModelGenerator.start ["user"]
     end
     assert File.exists? "test/models/user_test.rb"
     # assert File.exists? "test/fixtures/users.yml"
@@ -49,7 +49,7 @@ class TestModelGenerator < GeneratorTest
 
   def test_namespaced_model_generator_spec
     assert_output(/create  test\/models\/admin\/user_test.rb/m) do
-      Minitest::Generators::ModelGenerator.start ["admin/user", "--spec"]
+      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"
@@ -58,14 +58,14 @@ class TestModelGenerator < GeneratorTest
 
   def test_model_generator_fixture
     assert_output(/create  test\/fixtures\/users.yml/m) do
-      Minitest::Generators::ModelGenerator.start ["user"]
+      Minitest::Generators::ModelGenerator.start ["user", "--no-spec"]
     end
     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"]
+      Minitest::Generators::ModelGenerator.start ["admin/user", "--no-spec"]
     end
     assert File.exists? "test/fixtures/admin/users.yml"
   end

data/test/generators/test_scaffold_generator.rb

@@ -5,7 +5,7 @@ class TestScaffoldGenerator < GeneratorTest
 
   def test_scaffold_generator
     assert_output(/create  test\/controllers\/users_controller_test.rb/m) do
-      Minitest::Generators::ScaffoldGenerator.start ["User", "name:string", "email:string"]
+      Minitest::Generators::ScaffoldGenerator.start ["User", "name:string", "email:string", "--no-spec"]
     end
     assert File.exists? "test/controllers/users_controller_test.rb"
     contents = File.read "test/controllers/users_controller_test.rb"
@@ -15,7 +15,7 @@ class TestScaffoldGenerator < GeneratorTest
 
   def test_scaffold_generator_spec
     assert_output(/create  test\/controllers\/users_controller_test.rb/m) do
-      Minitest::Generators::ScaffoldGenerator.start ["User", "name:string", "email:string", "--spec"]
+      Minitest::Generators::ScaffoldGenerator.start ["User", "name:string", "email:string"]
     end
     assert File.exists? "test/controllers/users_controller_test.rb"
     contents = File.read "test/controllers/users_controller_test.rb"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minitest-rails
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc1
+  version: 3.0.0
 platform: ruby
 authors:
 - Mike Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-08 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0.rc1
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0.rc1
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -149,6 +149,7 @@ files:
 - lib/minitest/rails.rb
 - lib/minitest/rails/assertions.rb
 - lib/minitest/rails/constant_lookup.rb
+- lib/minitest/rails/controller.rb
 - lib/minitest/rails/expectations.rb
 - lib/minitest/rails/railtie.rb
 - lib/minitest/rails/version.rb
@@ -196,9 +197,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.4