minitest-rails 1.0.1 → 2.0.0.beta1

data/lib/minitest/rails/constant_lookup.rb

@@ -1,7 +1,7 @@
 require "active_support/concern"
 require "active_support/inflector"
 
-module MiniTest
+module Minitest
   module Rails
     module Testing
       # Resolves a constant from a minitest spec name.

data/lib/minitest/rails/expectations.rb

@@ -1,97 +1,9 @@
-module MiniTest::Rails::Expectations
+module Minitest::Rails::Expectations
 
   ##############################################################################
   # ActiveSupport Expectations
   ##############################################################################
 
-  ##
-  # Checks if an expression is blank. Passes if actual.blank? is true.
-  #
-  # === This expectation is deprecated.
-  #
-  # Use the following to check for <tt>blank?</tt> instead:
-  #
-  #     actual.must_be :blank?
-  #
-  # The deprecated expectation can be called like this:
-  #
-  #     "".must_be_blank
-  #     nil.must_be_blank
-  #     [].must_be_blank
-  #     {}.must_be_blank
-  #
-  # See also ActiveSupport::TestCase#assert_blank
-  #
-  # :method: must_be_blank
-  # :args: message = nil
-  infect_an_assertion :assert_blank, :must_be_blank, :unary
-
-  ##
-  # Checks if an expression is not present. Passes if actual.present? is false.
-  #
-  # === This expectation is deprecated.
-  #
-  # Use the following to check for <tt>present?</tt> instead:
-  #
-  #     actual.wont_be :present?
-  #
-  # The deprecated expectation can be called like this:
-  #
-  #     "".wont_be_present
-  #     nil.wont_be_present
-  #     [].wont_be_present
-  #     {}.wont_be_present
-  #
-  # See also ActiveSupport::TestCase#refute_present
-  #
-  # :method: wont_be_present
-  # :args: message = nil
-  infect_an_assertion :refute_present, :wont_be_present, :unary
-
-  ##
-  # Checks if an expression is present. Passes if actual.present? is true.
-  #
-  # === This expectation is deprecated.
-  #
-  # Use the following to check for <tt>present?</tt> instead:
-  #
-  #     actual.must_be :present?
-  #
-  # The deprecated expectation can be called like this:
-  #
-  #     "here".must_be_present
-  #     Object.new.must_be_present
-  #     [1,2,3].must_be_present
-  #     {:key => :value}.must_be_present
-  #
-  # See also ActiveSupport::TestCase#assert_present
-  #
-  # :method: must_be_present
-  # :args: message = nil
-  infect_an_assertion :assert_present, :must_be_present, :unary
-
-  ##
-  # Checks if an expression is not blank. Passes if actual.blank? is false.
-  #
-  # === This expectation is deprecated.
-  #
-  # Use the following to check for <tt>blank?</tt> instead:
-  #
-  #     actual.wont_be :blank?
-  #
-  # The deprecated expectation can be called like this:
-  #
-  #     "here".wont_be_blank
-  #     Object.new.wont_be_blank
-  #     [1,2,3].wont_be_blank
-  #     {:key => :value}.wont_be_blank
-  #
-  # See also ActiveSupport::TestCase#refute_blank
-  #
-  # :method: wont_be_blank
-  # :args: message = nil
-  infect_an_assertion :refute_blank, :wont_be_blank, :unary
-
   ##
   # Checks the numeric difference between the return value of an expression as a result of what is evaluated.
   #
@@ -622,7 +534,7 @@ end
 
 unless ENV["MT_NO_EXPECTATIONS"]
   class Object # :nodoc:
-    include MiniTest::Rails::Expectations
+    include Minitest::Rails::Expectations
   end
   # Not real expectations, just aliases
   # The error messages don't get messed up this way

data/lib/minitest/rails/railtie.rb

@@ -1,12 +1,12 @@
 require "rails"
 
-module MiniTest
+module Minitest
   module Rails
     class Railtie < ::Rails::Railtie # :nodoc:
       generators = config.respond_to?(:app_generators) ? config.app_generators : config.generators
-      generators.integration_tool :mini_test
-      generators.test_framework   :mini_test
-      generators.fallbacks[:mini_test] = :test_unit
+      generators.integration_tool :minitest
+      generators.test_framework   :minitest
+      generators.fallbacks[:minitest] = :test_unit
 
       rake_tasks do
         load "minitest/rails/tasks/minitest.rake"

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

@@ -25,42 +25,42 @@ namespace "minitest" do
   end
 
   # Run a single test
-  MiniTest::Rails::Tasks::SubTestTask.new(:single => "test:prepare") do |t|
+  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|
+  # 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"
+    t.pattern = "test/{#{Minitest::Rails::Testing.default_tasks.join(',')}}/**/*_test.rb"
   end
 
-  # Run the default tests as definded in MiniTest::Rails::Testing.default_tasks
+  # Run the default tests as definded in Minitest::Rails::Testing.default_tasks
   desc "Runs the default tests, without resetting the db"
-  MiniTest::Rails::Tasks::SubTestTask.new(:quick) do |t|
+  Minitest::Rails::Tasks::SubTestTask.new(:quick) do |t|
     t.libs.push "test"
-    t.pattern = "test/{#{MiniTest::Rails::Testing.default_tasks.join(',')}}/**/*_test.rb"
+    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|
+  Minitest::Rails::Tasks::SubTestTask.new(all: "test:prepare") do |t|
     t.libs.push "test"
     t.pattern = "test/**/*_test.rb"
   end
 
   namespace "all" do
     desc "Runs all tests, without resetting the db"
-    MiniTest::Rails::Tasks::SubTestTask.new(:quick) do |t|
+    Minitest::Rails::Tasks::SubTestTask.new(:quick) do |t|
       t.libs.push "test"
       t.pattern = "test/**/*_test.rb"
     end
   end
 
   # Loop that will define a task for each directory that has tests
-  MiniTest::Rails::Testing.all_tasks.each do |task_dir|
+  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|
+      Minitest::Rails::Tasks::SubTestTask.new(task_dir => "test:prepare") do |t|
         t.libs.push "test"
         t.pattern = "test/#{task_dir}/**/*_test.rb"
       end
@@ -72,7 +72,7 @@ end
 # Statistics
 
 # set hook on stats task
-task :stats => "minitest:setup_stats"
+task stats: "minitest:setup_stats"
 
 namespace "minitest" do
   task :setup_stats do
@@ -83,7 +83,7 @@ namespace "minitest" do
     CodeStatistics::TEST_TYPES.clear
 
     # Add test directories that minitest-rails knows about
-    MiniTest::Rails::Testing.all_tasks.each do |dir|
+    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
@@ -94,28 +94,28 @@ end
 # Define tasks under "test" if they don't already exist
 if !Rake::Task.task_defined? :test
   desc "Runs default tests"
-  task :test => "minitest"
+  task test: "minitest"
 
   namespace "test" do
-    MiniTest::Rails::Testing.all_tasks.each do |task_dir|
+    Minitest::Rails::Testing.all_tasks.each do |task_dir|
       desc "Runs tests under test/#{task_dir}"
       task task_dir => "minitest:#{task_dir}"
     end
 
     desc "Runs the default tests, without resetting the db"
-    task "quick" => "minitest:quick"
+    task quick: "minitest:quick"
 
     desc "Runs all tests"
-    task "all" => "minitest:all"
+    task all: "minitest:all"
 
     namespace "all" do
       desc "Runs all tests, without resetting the db"
-      task "quick" => "minitest:all:quick"
+      task quick: "minitest:all:quick"
     end
   end
 end
 
 # Override the default task
-task :default => [] # Just in case it hasn't already been set
+task default: [] # Just in case it hasn't already been set
 Rake::Task[:default].clear
-task :default => "minitest"
+task default: "minitest"

data/lib/minitest/rails/tasks/sub_test_task.rb

@@ -1,6 +1,6 @@
 require 'rake/testtask'
 
-module MiniTest
+module Minitest
   module Rails
     module Tasks
       # Silence the default description to cut down on `rake -T` noise.

data/lib/minitest/rails/testing.rb

@@ -1,6 +1,6 @@
 require "rake/testtask"
 
-module MiniTest
+module Minitest
   module Rails
     module Testing
       mattr_accessor :default_tasks
@@ -10,7 +10,7 @@ module MiniTest
       # 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"
+      #     Minitest::Rails::Testing.default_tasks << "presenters"
       #
       # Default values are: models helpers controllers mailers integration
       # :attr: default_tasks

data/lib/minitest/rails/version.rb

@@ -1,5 +1,5 @@
-module MiniTest
+module Minitest
   module Rails
-    VERSION = "1.0.1"
+    VERSION = "2.0.0.beta1"
   end
 end

data/lib/minitest/rails.rb

@@ -1,5 +1,5 @@
 gem "minitest"
-require "minitest/unit"
+require "minitest"
 require "minitest/test"
 require "minitest/spec"
 require "minitest/mock"
@@ -18,19 +18,22 @@ class ActiveSupport::TestCase
   end if self.respond_to? :describe
 
   # Add spec DSL
-  extend MiniTest::Spec::DSL
+  extend Minitest::Spec::DSL
 
   # Resolve constants from the test name when using the spec DSL
-  include MiniTest::Rails::Testing::ConstantLookup
+  include Minitest::Rails::Testing::ConstantLookup
 end
 
-if defined?(ActiveRecord::Base)
-  class ActiveSupport::TestCase
+class ActiveSupport::TestCase
+  if defined?(ActiveRecord::Base)
     # Use AS::TestCase for the base class when describing a model
     register_spec_type(self) do |desc|
       desc < ActiveRecord::Base if desc.is_a?(Class)
     end
   end
+  register_spec_type(self) do |desc, addl|
+    :model == addl
+  end
 end
 
 require "action_controller/test_case"
@@ -40,6 +43,9 @@ class ActionController::TestCase
     Class === desc && desc < ActionController::Metal
   end
   register_spec_type(/Controller( ?Test)?\z/i, self)
+  register_spec_type(self) do |desc, addl|
+    :controller == addl
+  end
 
   # Resolve the controller from the test name when using the spec DSL
   def self.determine_default_controller_class(name)
@@ -55,6 +61,9 @@ require "action_view/test_case"
 class ActionView::TestCase
   # Use AV::TestCase for the base class for helpers and views
   register_spec_type(/(Helper( ?Test)?| View Test)\z/i, self)
+  register_spec_type(self) do |desc, addl|
+    [ :view, :helper ].include? addl
+  end
 
   # Resolve the helper or view from the test name when using the spec DSL
   def self.determine_default_helper_class(name)
@@ -73,6 +82,9 @@ if defined? ActionMailer
       desc < ActionMailer::Base if desc.is_a?(Class)
     end
     register_spec_type(/Mailer( ?Test)?\z/i, self)
+  register_spec_type(self) do |desc, addl|
+    :mailer == addl
+  end
 
     # Resolve the mailer from the test name when using the spec DSL
     def self.determine_default_mailer(name)
@@ -89,6 +101,27 @@ require "action_dispatch/testing/integration"
 class ActionDispatch::IntegrationTest
   # Register by name, consider Acceptance to be deprecated
   register_spec_type(/(Integration|Acceptance)( ?Test)?\z/i, self)
+  register_spec_type(self) do |desc, addl|
+    :integration == addl
+  end
+end
+
+class Rails::Generators::TestCase
+  register_spec_type(self) do |desc|
+    desc < Rails::Generators::Base if desc.is_a?(Class)
+  end
+  register_spec_type(/Generator( ?Test)?\z/i, self)
+  register_spec_type(self) do |desc, addl|
+    :generator == addl
+  end
+
+  def self.determine_default_generator(name)
+    generator = determine_constant_from_test_name(name) do |constant|
+      Class === constant && constant < Rails::Generators::Base
+    end
+    raise NameError.new("Unable to resolve generator for #{name}") if generator.nil?
+    generator
+  end
 end
 
 ################################################################################
@@ -100,15 +133,6 @@ 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)
-end
-
 ################################################################################
 # Run load hooks so that other gems can register spec types
 ################################################################################

data/minitest-rails.gemspec

@@ -1,47 +1,44 @@
 # -*- encoding: utf-8 -*-
-# stub: minitest-rails 1.0.1.20140414185943 ruby lib
+# stub: minitest-rails 2.0.0.beta1.20140414183410 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "minitest-rails"
-  s.version = "1.0.1.20140414185943"
+  s.version = "2.0.0.beta1.20140414183410"
 
-  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.require_paths = ["lib"]
   s.authors = ["Mike Moore"]
   s.date = "2014-04-15"
-  s.description = "Adds MiniTest as the default testing library in Rails 3 and 4"
+  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", "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/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.files = [".autotest", ".gemtest", ".travis.yml", "CHANGELOG.rdoc", "Gemfile", "LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "gemfiles/4.1.gemfile", "lib/generators/.document", "lib/generators/minitest.rb", "lib/generators/minitest/controller/controller_generator.rb", "lib/generators/minitest/controller/templates/controller_spec.rb", "lib/generators/minitest/controller/templates/controller_test.rb", "lib/generators/minitest/generator/generator_generator.rb", "lib/generators/minitest/generator/templates/generator_spec.rb", "lib/generators/minitest/generator/templates/generator_test.rb", "lib/generators/minitest/helper/helper_generator.rb", "lib/generators/minitest/helper/templates/helper_spec.rb", "lib/generators/minitest/helper/templates/helper_test.rb", "lib/generators/minitest/install/install_generator.rb", "lib/generators/minitest/install/templates/test_helper.rb", "lib/generators/minitest/integration/integration_generator.rb", "lib/generators/minitest/integration/templates/integration_spec.rb", "lib/generators/minitest/integration/templates/integration_test.rb", "lib/generators/minitest/mailer/mailer_generator.rb", "lib/generators/minitest/mailer/templates/mailer_spec.rb", "lib/generators/minitest/mailer/templates/mailer_test.rb", "lib/generators/minitest/mailer/templates/preview.rb", "lib/generators/minitest/model/model_generator.rb", "lib/generators/minitest/model/templates/fixtures.yml", "lib/generators/minitest/model/templates/model_spec.rb", "lib/generators/minitest/model/templates/model_test.rb", "lib/generators/minitest/route/route_generator.rb", "lib/generators/minitest/route/templates/route_spec.rb", "lib/generators/minitest/route/templates/route_test.rb", "lib/generators/minitest/scaffold/scaffold_generator.rb", "lib/generators/minitest/scaffold/templates/controller_spec.rb", "lib/generators/minitest/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/expectations.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_generator_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.rubygems_version = "2.2.2"
-  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_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"]
+  s.summary = "Minitest integration for Rails 4.1+"
+  s.test_files = ["test/generators/test_controller_generator.rb", "test/generators/test_generator_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 = 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<minitest-test>, ["~> 1.0"])
-      s.add_runtime_dependency(%q<railties>, ["< 4.1", ">= 3.0"])
+      s.add_runtime_dependency(%q<minitest>, ["< 6.0", ">= 5.3.3"])
+      s.add_runtime_dependency(%q<railties>, ["~> 4.1"])
       s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
       s.add_development_dependency(%q<fakefs>, ["= 0.4.3"])
       s.add_development_dependency(%q<hoe>, ["~> 3.11"])
     else
-      s.add_dependency(%q<minitest>, ["~> 4.7"])
-      s.add_dependency(%q<minitest-test>, ["~> 1.0"])
-      s.add_dependency(%q<railties>, ["< 4.1", ">= 3.0"])
+      s.add_dependency(%q<minitest>, ["< 6.0", ">= 5.3.3"])
+      s.add_dependency(%q<railties>, ["~> 4.1"])
       s.add_dependency(%q<rdoc>, ["~> 4.0"])
       s.add_dependency(%q<fakefs>, ["= 0.4.3"])
       s.add_dependency(%q<hoe>, ["~> 3.11"])
     end
   else
-    s.add_dependency(%q<minitest>, ["~> 4.7"])
-    s.add_dependency(%q<minitest-test>, ["~> 1.0"])
-    s.add_dependency(%q<railties>, ["< 4.1", ">= 3.0"])
+    s.add_dependency(%q<minitest>, ["< 6.0", ">= 5.3.3"])
+    s.add_dependency(%q<railties>, ["~> 4.1"])
     s.add_dependency(%q<rdoc>, ["~> 4.0"])
     s.add_dependency(%q<fakefs>, ["= 0.4.3"])
     s.add_dependency(%q<hoe>, ["~> 3.11"])

data/tasks/test.rake

@@ -1,41 +1,14 @@
 namespace :test do
-  desc "Run tests for Rails 4.0"
-  task "4.0" do
+  desc "Run tests for Rails 4.1"
+  task "4.1" do
     sh "rm -f Gemfile.lock"
-    ENV["RAILS_VERSION"] = "4.0"
-    sh "bundle && bundle exec rake test"
-    sh "rm -f Gemfile.lock"
-  end
-
-  desc "Run tests for Rails 3.2"
-  task "3.2" do
-    sh "rm -f Gemfile.lock"
-    ENV["RAILS_VERSION"] = "3.2"
-    sh "bundle && bundle exec rake test"
-    sh "rm -f Gemfile.lock"
-  end
-
-  desc "Run tests for Rails 3.1"
-  task "3.1" do
-    sh "rm -f Gemfile.lock"
-    ENV["RAILS_VERSION"] = "3.1"
-    sh "bundle && bundle exec rake test"
-    sh "rm -f Gemfile.lock"
-  end
-
-  desc "Run tests for Rails 3.0"
-  task "3.0" do
-    sh "rm -f Gemfile.lock"
-    ENV["RAILS_VERSION"] = "3.0"
+    ENV["RAILS_VERSION"] = "4.1"
     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.0"
-    sh "rake test:3.2"
-    sh "rake test:3.1"
-    sh "rake test:3.0"
+    sh "rake test:4.1"
   end
 end

data/test/generators/test_controller_generator.rb

@@ -1,11 +1,11 @@
 require "helper"
-require "generators/mini_test/controller/controller_generator"
+require "generators/minitest/controller/controller_generator"
 
 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"]
     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"]
     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"]
     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", "--spec"]
     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", "--spec"]
     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

@@ -0,0 +1,58 @@
+require "helper"
+require "generators/minitest/generator/generator_generator"
+
+class TestGeneratorGenerator < GeneratorTest
+
+  def test_generator_generator
+    assert_output(/create  test\/lib\/generators\/awesome_generator_test.rb/m) do
+      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"
+    assert_match(/class AwesomeGeneratorTest/m, contents)
+  end
+
+  def test_namespaced_generator_generator
+    assert_output(/create  test\/lib\/generators\/rails\/awesome_generator_test.rb/m) do
+      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"
+    assert_match(/class Rails::AwesomeGeneratorTest/m, contents)
+  end
+
+  def test_module_namespaced_generator_generator
+    assert_nil Rails::Generators.namespace
+    Rails::Generators.namespace = TestApp
+
+    assert_output(/create  test\/lib\/generators\/test_app\/awesome_generator_test.rb/m) do
+      Minitest::Generators::GeneratorGenerator.start ["awesome"]
+    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"
+    assert_match(/module TestApp/m, contents)
+    assert_match(/class AwesomeGeneratorTest/m, contents)
+  ensure
+    # Restore default namespace
+    Rails::Generators.namespace = nil
+  end if Rails::Generators.respond_to? :namespace
+
+  def test_generator_generator_spec
+    assert_output(/create  test\/lib\/generators\/awesome_generator_test.rb/m) do
+      Minitest::Generators::GeneratorGenerator.start ["awesome", "--spec"]
+    end
+    assert File.exists? "test/lib/generators/awesome_generator_test.rb"
+    contents = File.read "test/lib/generators/awesome_generator_test.rb"
+    assert_match(/describe AwesomeGenerator do/m, contents)
+  end
+
+  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"]
+    end
+    assert File.exists? "test/lib/generators/rails/awesome_generator_test.rb"
+    contents = File.read "test/lib/generators/rails/awesome_generator_test.rb"
+    assert_match(/describe Rails::AwesomeGenerator do/m, contents)
+  end
+
+end