minitest-rails 0.2 → 0.5

data/test/generators/test_model_generator.rb

@@ -1,46 +1,21 @@
-require "minitest/autorun"
-require "minitest-rails"
-
-require "rails"
-require "rails/generators"
-
+require "helper"
 require "generators/mini_test/model/model_generator"
 
-require "fakefs/safe"
-
-class FakeFS::File
-  def self.binread file
-    File.open(file, "rb") { |f| f.read }
-  end
-end
-
-class TestModelGenerator < MiniTest::Unit::TestCase
-  def setup
-    Rails::Generators.no_color!
-    FakeFS.activate!
-    FakeFS::FileSystem.clone "lib/generators"
-  end
-
-  def teardown
-    FakeFS::FileSystem.clear
-    FakeFS.deactivate!
-  end
+class TestModelGenerator < GeneratorTest
 
   def test_model_generator
-    out, err = capture_io do
+    assert_output(/create  test\/models\/user_test.rb/m) do
       MiniTest::Generators::ModelGenerator.start ["user"]
     end
-    assert_match(/create  test\/models\/user_test.rb/m, out)
     assert File.exists? "test/models/user_test.rb"
     contents = File.read "test/models/user_test.rb"
     assert_match(/class UserTest/m, contents)
   end
 
   def test_model_generator_spec
-    out, err = capture_io do
+    assert_output(/create  test\/models\/user_test.rb/m) do
       MiniTest::Generators::ModelGenerator.start ["user", "--spec"]
     end
-    assert_match(/create  test\/models\/user_test.rb/m, out)
     assert File.exists? "test/models/user_test.rb"
     assert File.exists? "test/fixtures/users.yml"
     contents = File.read "test/models/user_test.rb"
@@ -48,18 +23,18 @@ class TestModelGenerator < MiniTest::Unit::TestCase
   end
 
   def test_model_generator_fixture
-    out, err = capture_io do
+    assert_output(/create  test\/fixtures\/users.yml/m) do
       MiniTest::Generators::ModelGenerator.start ["user"]
     end
-    assert_match(/create  test\/fixtures\/users.yml/m, out)
     assert File.exists? "test/fixtures/users.yml"
   end
 
   def test_model_generator_skip_fixture
-    out, err = capture_io do
+    out, _ = capture_io do
       MiniTest::Generators::ModelGenerator.start ["user", "--skip-fixture"]
     end
     refute_match(/create  test\/fixtures\/users.yml/m, out)
     refute File.exists? "test/fixtures/users.yml"
   end
+
 end

data/test/generators/test_scaffold_generator.rb

@@ -1,48 +1,24 @@
-require "minitest/autorun"
-require "minitest-rails"
-
-require "rails"
-require "rails/generators"
-
+require "helper"
 require "generators/mini_test/scaffold/scaffold_generator"
 
-require "fakefs/safe"
-
-class FakeFS::File
-  def self.binread file
-    File.open(file, "rb") { |f| f.read }
-  end
-end
-
-class TestScaffoldGenerator < MiniTest::Unit::TestCase
-  def setup
-    Rails::Generators.no_color!
-    FakeFS.activate!
-    FakeFS::FileSystem.clone "lib/generators"
-  end
-
-  def teardown
-    FakeFS::FileSystem.clear
-    FakeFS.deactivate!
-  end
+class TestScaffoldGenerator < GeneratorTest
 
   def test_scaffold_generator
-    out, err = capture_io do
+    assert_output(/create  test\/controllers\/users_controller_test.rb/m) do
       MiniTest::Generators::ScaffoldGenerator.start ["user"]
     end
-    assert_match(/create  test\/controllers\/users_controller_test.rb/m, out)
     assert File.exists? "test/controllers/users_controller_test.rb"
     contents = File.read "test/controllers/users_controller_test.rb"
     assert_match(/class UsersControllerTest/m, contents)
   end
 
   def test_scaffold_generator_spec
-    out, err = capture_io do
+    assert_output(/create  test\/controllers\/users_controller_test.rb/m) do
       MiniTest::Generators::ScaffoldGenerator.start ["user", "--spec"]
     end
-    assert_match(/create  test\/controllers\/users_controller_test.rb/m, out)
     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)
   end
+
 end

data/test/helper.rb

@@ -0,0 +1,35 @@
+require "minitest/autorun"
+
+require "rails"
+require "rails/generators"
+
+require "active_record"
+
+require "action_controller"
+require "action_controller/railtie"
+
+require "action_mailer"
+
+require "minitest-rails"
+require "minitest/rails"
+
+require "fakefs/safe"
+
+class FakeFS::File
+  def self.binread file
+    File.open(file, "rb") { |f| f.read }
+  end
+end
+
+class GeneratorTest < MiniTest::Unit::TestCase
+  def setup
+    Rails::Generators.no_color!
+    FakeFS.activate!
+    FakeFS::FileSystem.clone "lib/generators"
+  end
+
+  def teardown
+    FakeFS::FileSystem.clear
+    FakeFS.deactivate!
+  end
+end

data/test/rails/action_controller/test_controllers.rb

@@ -1,19 +1,9 @@
-require "minitest/autorun"
-require "rails"
-
-require "minitest/rails/action_controller"
-require "action_controller"
-
-# require "active_record/railtie"
-require "action_controller/railtie"
-# require "action_mailer/railtie"
-# require "active_resource/railtie"
-# require "sprockets/railtie"
-# require "rails/test_unit/railtie"
+require "helper"
 
 class TestApp < Rails::Application
 end
 Rails.application = TestApp
+Rails.configuration.secret_key_base = "abc123"
 
 class ApplicationController < ActionController::Base; end
 class ModelsController      < ApplicationController;  end
@@ -145,7 +135,7 @@ end
 
 # Nested Admin::WidgetsControllerTest
 module Admin
-  class WidgetsControllerTest < MiniTest::Rails::ActionController::TestCase
+  class WidgetsControllerTest < ActionController::TestCase
     test "exists" do
       assert_kind_of Admin::WidgetsController, @controller
     end
@@ -168,7 +158,7 @@ module Admin
   end
 end
 
-class Admin::WidgetsControllerTest < MiniTest::Rails::ActionController::TestCase
+class Admin::WidgetsControllerTest < ActionController::TestCase
   test "exists here too" do
     assert_kind_of Admin::WidgetsController, @controller
   end

data/test/rails/action_controller/test_spec_type.rb

@@ -1,19 +1,15 @@
-require "minitest/autorun"
-require "rails"
-
-require "minitest/rails/action_controller"
-require "action_controller"
+require "helper"
 
 class ApplicationController < ActionController::Base; end
 class ModelsController      < ApplicationController;  end
 
 class TestApplicationControllerSpecType < MiniTest::Unit::TestCase
   def assert_controller actual
-    assert_equal MiniTest::Rails::ActionController::TestCase, actual
+    assert_equal ActionController::TestCase, actual
   end
 
   def refute_controller actual
-    refute_equal MiniTest::Rails::ActionController::TestCase, actual
+    refute_equal ActionController::TestCase, actual
   end
 
   def test_spec_type_resolves_for_class_constants

data/test/rails/{test_action_dispatch_spec_type.rb → action_dispatch/test_spec_type.rb}

@@ -1,23 +1,24 @@
-require "minitest/autorun"
-require "rails"
-
-require "minitest/rails/action_dispatch"
+require "helper"
 
 class TestActionDispatchSpecType < MiniTest::Unit::TestCase
   def assert_dispatch actual
-    assert_equal MiniTest::Rails::ActionDispatch::IntegrationTest, actual
+    assert_equal ActionDispatch::IntegrationTest, actual
   end
 
   def refute_dispatch actual
-    refute_equal MiniTest::Rails::ActionDispatch::IntegrationTest, actual
+    refute_equal ActionDispatch::IntegrationTest, actual
   end
 
   def test_spec_type_resolves_for_matching_acceptance_strings
     assert_dispatch MiniTest::Spec.spec_type("WidgetAcceptanceTest")
     assert_dispatch MiniTest::Spec.spec_type("Widget Acceptance Test")
+    assert_dispatch MiniTest::Spec.spec_type("WidgetAcceptance")
+    assert_dispatch MiniTest::Spec.spec_type("Widget Acceptance")
     # And is not case sensitive
     assert_dispatch MiniTest::Spec.spec_type("widgetacceptancetest")
     assert_dispatch MiniTest::Spec.spec_type("widget acceptance test")
+    assert_dispatch MiniTest::Spec.spec_type("widgetacceptance")
+    assert_dispatch MiniTest::Spec.spec_type("widget acceptance")
   end
 
   def test_spec_type_wont_match_non_space_characters_acceptance
@@ -32,17 +33,21 @@ class TestActionDispatchSpecType < MiniTest::Unit::TestCase
   def test_spec_type_resolves_for_matching_integration_strings
     assert_dispatch MiniTest::Spec.spec_type("WidgetIntegrationTest")
     assert_dispatch MiniTest::Spec.spec_type("Widget Integration Test")
+    assert_dispatch MiniTest::Spec.spec_type("WidgetIntegration")
+    assert_dispatch MiniTest::Spec.spec_type("Widget Integration")
     # And is not case sensitive
     assert_dispatch MiniTest::Spec.spec_type("widgetintegrationtest")
     assert_dispatch MiniTest::Spec.spec_type("widget integration test")
+    assert_dispatch MiniTest::Spec.spec_type("widgetintegration")
+    assert_dispatch MiniTest::Spec.spec_type("widget integration")
   end
 
   def test_spec_type_wont_match_non_space_characters_integration
-    refute_equal MiniTest::Spec.spec_type("Widget Integration\tTest"), MiniTest::Rails::ActionDispatch::IntegrationTest
-    refute_equal MiniTest::Spec.spec_type("Widget Integration\rTest"), MiniTest::Rails::ActionDispatch::IntegrationTest
+    refute_equal MiniTest::Spec.spec_type("Widget Integration\tTest"), ActionDispatch::IntegrationTest
+    refute_equal MiniTest::Spec.spec_type("Widget Integration\rTest"), ActionDispatch::IntegrationTest
     # TODO: Update regex so that new lines don't match.
-    refute_equal MiniTest::Spec.spec_type("Widget Integration\nTest"), MiniTest::Rails::ActionDispatch::IntegrationTest
-    refute_equal MiniTest::Spec.spec_type("Widget Integration\fTest"), MiniTest::Rails::ActionDispatch::IntegrationTest
-    refute_equal MiniTest::Spec.spec_type("Widget IntegrationXTest"),  MiniTest::Rails::ActionDispatch::IntegrationTest
+    refute_equal MiniTest::Spec.spec_type("Widget Integration\nTest"), ActionDispatch::IntegrationTest
+    refute_equal MiniTest::Spec.spec_type("Widget Integration\fTest"), ActionDispatch::IntegrationTest
+    refute_equal MiniTest::Spec.spec_type("Widget IntegrationXTest"),  ActionDispatch::IntegrationTest
   end
 end

data/test/rails/action_mailer/test_mailers.rb

@@ -0,0 +1,109 @@
+require "helper"
+
+class TestTestMailer < ActionMailer::Base; end
+
+# From Rails...
+class CrazyNameMailerTest < ActionMailer::TestCase
+  tests TestTestMailer
+
+  def test_set_mailer_class_manual
+    assert_equal TestTestMailer, self.class.mailer_class
+  end
+end
+
+class CrazySymbolNameMailerTest < ActionMailer::TestCase
+  tests :test_test_mailer
+
+  def test_set_mailer_class_manual_using_symbol
+    assert_equal TestTestMailer, self.class.mailer_class
+  end
+end if Rails::VERSION::STRING >= "3.2"
+
+class CrazyStringNameMailerTest < ActionMailer::TestCase
+  tests 'test_test_mailer'
+
+  def test_set_mailer_class_manual_using_string
+    assert_equal TestTestMailer, self.class.mailer_class
+  end
+end if Rails::VERSION::STRING >= "3.2"
+
+# New tests...
+describe TestTestMailer do
+  it "gets the mailer from the test name" do
+    assert_equal TestTestMailer, self.class.mailer_class
+  end
+end
+
+describe TestTestMailer, :action do
+  it "gets the mailer from the test name" do
+    assert_equal TestTestMailer, self.class.mailer_class
+  end
+end
+
+describe TestTestMailer do
+  describe "nested" do
+    it "gets the mailer from the test name" do
+      assert_equal TestTestMailer, self.class.mailer_class
+    end
+  end
+end
+
+describe TestTestMailer, :action do
+  describe "nested" do
+    it "gets the mailer from the test name" do
+      assert_equal TestTestMailer, self.class.mailer_class
+    end
+  end
+end
+
+describe "TestTestMailer" do
+  it "gets the mailer from the test name" do
+    assert_equal TestTestMailer, self.class.mailer_class
+  end
+end
+
+describe "TestTestMailerTest" do
+  it "gets the mailer from the test name" do
+    assert_equal TestTestMailer, self.class.mailer_class
+  end
+end
+
+describe "AnotherCrazySymbolNameMailerTest" do
+  tests :test_test_mailer
+
+  it "gets the mailer after setting it with a symbol" do
+    assert_equal TestTestMailer, self.class.mailer_class
+  end
+end if Rails::VERSION::STRING >= "3.2"
+
+describe "AnotherCrazyStringNameMailerTest" do
+  tests 'test_test_mailer'
+
+  it "gets the mailer after setting it with a string" do
+    assert_equal TestTestMailer, self.class.mailer_class
+  end
+end if Rails::VERSION::STRING >= "3.2"
+
+describe "Another Crazy Name Mailer Test" do
+  tests TestTestMailer
+
+  it "gets the mailer after setting it manually" do
+    assert_equal TestTestMailer, self.class.mailer_class
+  end
+end
+
+describe "Another Crazy Symbol Name Mailer Test" do
+  tests :test_test_mailer
+
+  it "gets the mailer after setting it with a symbol" do
+    assert_equal TestTestMailer, self.class.mailer_class
+  end
+end if Rails::VERSION::STRING >= "3.2"
+
+describe "Another Crazy String Name Mailer Test" do
+  tests 'test_test_mailer'
+
+  it "gets the mailer after setting it with a string" do
+    assert_equal TestTestMailer, self.class.mailer_class
+  end
+end if Rails::VERSION::STRING >= "3.2"

data/test/rails/{test_action_mailer_spec_type.rb → action_mailer/test_spec_type.rb}

@@ -1,20 +1,15 @@
-require "minitest/autorun"
-require "rails"
-
-require "action_mailer/test_helper"
-require "minitest/rails/action_mailer"
-require "action_mailer"
+require "helper"
 
 class NotificationMailer < ActionMailer::Base; end
 class Notifications < ActionMailer::Base; end
 
 class TestActionMailerSpecType < MiniTest::Unit::TestCase
   def assert_mailer actual
-    assert_equal MiniTest::Rails::ActionMailer::TestCase, actual
+    assert_equal ActionMailer::TestCase, actual
   end
 
   def refute_mailer actual
-    refute_equal MiniTest::Rails::ActionMailer::TestCase, actual
+    refute_equal ActionMailer::TestCase, actual
   end
 
   def test_spec_type_resolves_for_class_constants

data/test/rails/action_view/test_helpers.rb

@@ -0,0 +1,73 @@
+require "helper"
+
+module PeopleHelper
+  def title(text)
+    content_tag(:h1, text)
+  end
+
+  def homepage_path
+    people_path
+  end
+
+  def homepage_url
+    people_url
+  end
+
+  def link_to_person(person)
+    link_to person.name, person
+  end
+end
+
+# From Rails...
+class CrazyHelperTest < ActionView::TestCase
+  tests PeopleHelper
+
+  def test_helper_class_can_be_set_manually_not_just_inferred
+    assert_equal PeopleHelper, self.class.helper_class
+  end
+end
+
+class CrazySymbolHelperTest < ActionView::TestCase
+  tests :people
+
+  def test_set_helper_class_using_symbol
+    assert_equal PeopleHelper, self.class.helper_class
+  end
+end if Rails::VERSION::STRING >= "3.2"
+
+class CrazyStringHelperTest < ActionView::TestCase
+  tests 'people'
+
+  def test_set_helper_class_using_string
+    assert_equal PeopleHelper, self.class.helper_class
+  end
+end if Rails::VERSION::STRING >= "3.2"
+
+# New tests...
+describe PeopleHelper do
+  it "resolves the right helper_class" do
+    assert_equal PeopleHelper, self.class.helper_class
+  end
+end
+
+describe PeopleHelper, :helper_class do
+  it "resolves the right helper_class" do
+    assert_equal PeopleHelper, self.class.helper_class
+  end
+end
+
+describe PeopleHelper do
+  describe "even while nested" do
+    it "resolves the right helper_class" do
+      assert_equal PeopleHelper, self.class.helper_class
+    end
+  end
+end
+
+describe PeopleHelper, :helper_class do
+  describe "even while nested" do
+    it "resolves the right helper_class" do
+      assert_equal PeopleHelper, self.class.helper_class
+    end
+  end
+end

data/test/rails/{test_action_view_spec_type.rb → action_view/test_spec_type.rb}

@@ -1,15 +1,12 @@
-require "minitest/autorun"
-require "rails"
-
-require "minitest/rails/action_view"
+require "helper"
 
 class TestActionViewSpecType < MiniTest::Unit::TestCase
   def assert_view actual
-    assert_equal MiniTest::Rails::ActionView::TestCase, actual
+    assert_equal ActionView::TestCase, actual
   end
 
   def refute_view actual
-    refute_equal MiniTest::Rails::ActionView::TestCase, actual
+    refute_equal ActionView::TestCase, actual
   end
 
   def test_spec_type_resolves_for_matching_helper_strings
@@ -23,12 +20,8 @@ class TestActionViewSpecType < MiniTest::Unit::TestCase
   end
 
   def test_spec_type_resolves_for_matching_view_strings
-    assert_view MiniTest::Spec.spec_type("WidgetView")
-    assert_view MiniTest::Spec.spec_type("WidgetViewTest")
     assert_view MiniTest::Spec.spec_type("Widget View Test")
     # And is not case sensitive
-    assert_view MiniTest::Spec.spec_type("widgetview")
-    assert_view MiniTest::Spec.spec_type("widgetviewtest")
     assert_view MiniTest::Spec.spec_type("widget view test")
   end
 

data/test/rails/{test_active_support_spec_type.rb → active_support/test_spec_type.rb}

@@ -1,16 +1,11 @@
-require "minitest/autorun"
-require "rails"
-
-require "active_record"
-load "minitest/rails/active_support.rb" # Force reload
-# Not sure why we need to reload, but we do...
+require "helper"
 
 class SomeRandomModel < ActiveRecord::Base; end
 
 class TestActiveSupportSpecType < MiniTest::Unit::TestCase
 
   def assert_support actual
-    assert_equal MiniTest::Rails::ActiveSupport::TestCase, actual
+    assert_equal ActiveSupport::TestCase, actual
   end
 
   def assert_spec actual

data/test/rails/test_constant_lookup.rb

@@ -0,0 +1,58 @@
+require "helper"
+
+class Foo; end
+class Bar < Foo;
+  def index; end
+  def self.index; end
+end
+class Baz < Bar; end
+module FooBar; end
+
+class TestLookup < ActiveSupport::TestCase
+
+  def find_foo(name)
+    self.class.determine_constant_from_test_name(name) do |constant|
+      Class === constant && constant < Foo
+    end
+  end
+
+  def find_module(name)
+    self.class.determine_constant_from_test_name(name) do |constant|
+      Module === constant
+    end
+  end
+
+  def test_find_bar_from_foo
+    assert_equal Bar, find_foo("Bar")
+    assert_equal Bar, find_foo("Bar::index")
+    assert_equal Bar, find_foo("Bar::index::authenticated")
+    assert_equal Bar, find_foo("BarTest")
+    assert_equal Bar, find_foo("BarTest::index")
+    assert_equal Bar, find_foo("BarTest::index::authenticated")
+  end
+
+  def test_find_module
+    assert_equal FooBar, find_module("FooBar")
+    assert_equal FooBar, find_module("FooBar::index")
+    assert_equal FooBar, find_module("FooBar::index::authenticated")
+    assert_equal FooBar, find_module("FooBarTest")
+    assert_equal FooBar, find_module("FooBarTest::index")
+    assert_equal FooBar, find_module("FooBarTest::index::authenticated")
+  end
+
+  def test_returns_nil_when_cant_find_foo
+    assert_nil find_foo("DoesntExist")
+    assert_nil find_foo("DoesntExistTest")
+    assert_nil find_foo("DoesntExist::Nadda")
+    assert_nil find_foo("DoesntExist::Nadda::Nope")
+    assert_nil find_foo("DoesntExist::Nadda::Nope::NotHere")
+  end
+
+  def test_returns_nil_when_cant_find_module
+    assert_nil find_module("DoesntExist")
+    assert_nil find_module("DoesntExistTest")
+    assert_nil find_module("DoesntExist::Nadda")
+    assert_nil find_module("DoesntExist::Nadda::Nope")
+    assert_nil find_module("DoesntExist::Nadda::Nope::NotHere")
+  end
+end

data/test/test_sanity.rb

@@ -1,5 +1,4 @@
-require "minitest/autorun"
-require "minitest-rails"
+require "helper"
 
 class TestMiniTest < MiniTest::Unit::TestCase
   def test_sanity