minitest-rails 0.3 → 0.5

data/test/rails/action_mailer/test_mailers.rb

@@ -1,13 +1,9 @@
-require "minitest/autorun"
-require "rails"
-
-require "action_mailer"
-require "minitest/rails/action_mailer"
+require "helper"
 
 class TestTestMailer < ActionMailer::Base; end
 
 # From Rails...
-class CrazyNameMailerTest < MiniTest::Rails::ActionMailer::TestCase
+class CrazyNameMailerTest < ActionMailer::TestCase
   tests TestTestMailer
 
   def test_set_mailer_class_manual
@@ -15,7 +11,7 @@ class CrazyNameMailerTest < MiniTest::Rails::ActionMailer::TestCase
   end
 end
 
-class CrazySymbolNameMailerTest < MiniTest::Rails::ActionMailer::TestCase
+class CrazySymbolNameMailerTest < ActionMailer::TestCase
   tests :test_test_mailer
 
   def test_set_mailer_class_manual_using_symbol
@@ -23,7 +19,7 @@ class CrazySymbolNameMailerTest < MiniTest::Rails::ActionMailer::TestCase
   end
 end if Rails::VERSION::STRING >= "3.2"
 
-class CrazyStringNameMailerTest < MiniTest::Rails::ActionMailer::TestCase
+class CrazyStringNameMailerTest < ActionMailer::TestCase
   tests 'test_test_mailer'
 
   def test_set_mailer_class_manual_using_string

data/test/rails/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

@@ -1,7 +1,4 @@
-require "minitest/autorun"
-require "rails"
-
-require "minitest/rails/action_view"
+require "helper"
 
 module PeopleHelper
   def title(text)
@@ -22,7 +19,7 @@ module PeopleHelper
 end
 
 # From Rails...
-class CrazyHelperTest < MiniTest::Rails::ActionView::TestCase
+class CrazyHelperTest < ActionView::TestCase
   tests PeopleHelper
 
   def test_helper_class_can_be_set_manually_not_just_inferred
@@ -30,7 +27,7 @@ class CrazyHelperTest < MiniTest::Rails::ActionView::TestCase
   end
 end
 
-class CrazySymbolHelperTest < MiniTest::Rails::ActionView::TestCase
+class CrazySymbolHelperTest < ActionView::TestCase
   tests :people
 
   def test_set_helper_class_using_symbol
@@ -38,7 +35,7 @@ class CrazySymbolHelperTest < MiniTest::Rails::ActionView::TestCase
   end
 end if Rails::VERSION::STRING >= "3.2"
 
-class CrazyStringHelperTest < MiniTest::Rails::ActionView::TestCase
+class CrazyStringHelperTest < ActionView::TestCase
   tests 'people'
 
   def test_set_helper_class_using_string

data/test/rails/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/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

@@ -1,7 +1,4 @@
-require "minitest/autorun"
-require "rails"
-
-require "minitest/rails/active_support"
+require "helper"
 
 class Foo; end
 class Bar < Foo;
@@ -11,7 +8,7 @@ end
 class Baz < Bar; end
 module FooBar; end
 
-class TestLookup < MiniTest::Rails::ActiveSupport::TestCase
+class TestLookup < ActiveSupport::TestCase
 
   def find_foo(name)
     self.class.determine_constant_from_test_name(name) do |constant|

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

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: minitest-rails
 version: !ruby/object:Gem::Version
-  version: '0.3'
   prerelease: 
+  version: '0.5'
 platform: ruby
 authors:
 - Mike Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-02 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :runtime
   name: minitest
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :runtime
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :development
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.10'
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :development
   name: fakefs
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :development
   name: hoe
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: '3.4'
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
-description: Adds MiniTest as the default testing library in Rails 3.x
+        version: '3.4'
+description: Adds MiniTest as the default testing library in Rails 3 and 4
 email:
 - mike@blowmage.com
 executables: []
@@ -115,7 +115,8 @@ files:
 - gemfiles/3.1.gemfile.lock
 - gemfiles/3.2.gemfile
 - gemfiles/3.2.gemfile.lock
-- gemfiles/minitest_tu_shim.rb
+- gemfiles/4.0.gemfile
+- gemfiles/4.0.gemfile.lock
 - lib/autotest/discover.rb
 - lib/autotest/fixtures.rb
 - lib/autotest/migrate.rb
@@ -144,16 +145,11 @@ files:
 - lib/generators/mini_test/scaffold/templates/controller_test.rb
 - lib/minitest-rails.rb
 - lib/minitest/rails.rb
-- lib/minitest/rails/action_controller.rb
-- lib/minitest/rails/action_dispatch.rb
-- lib/minitest/rails/action_mailer.rb
-- lib/minitest/rails/action_view.rb
-- lib/minitest/rails/active_support.rb
 - lib/minitest/rails/constant_lookup.rb
-- lib/minitest/rails/declarative.rb
-- lib/minitest/rails/mochaing.rb
 - lib/minitest/rails/tasks/minitest.rake
 - lib/minitest/rails/tasks/sub_test_task.rb
+- lib/minitest/rails/test_case.rb
+- lib/minitest/rails/testing.rb
 - lib/minitest/rails/version.rb
 - minitest-rails.gemspec
 - tasks/gemfiles.rake
@@ -164,6 +160,7 @@ files:
 - test/generators/test_mailer_generator.rb
 - test/generators/test_model_generator.rb
 - test/generators/test_scaffold_generator.rb
+- test/helper.rb
 - test/rails/action_controller/test_controllers.rb
 - test/rails/action_controller/test_spec_type.rb
 - test/rails/action_dispatch/test_spec_type.rb
@@ -199,7 +196,7 @@ rubyforge_project: minitest-rails
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: MiniTest integration for Rails 3.x
+summary: MiniTest integration for Rails 3 and 4
 test_files:
 - test/generators/test_controller_generator.rb
 - test/generators/test_helper_generator.rb

data/gemfiles/minitest_tu_shim.rb

@@ -1,4 +0,0 @@
-if RUBY_VERSION < "1.9"
-  `gem install minitest_tu_shim`
-  `use_minitest yes`
-end

data/lib/minitest/rails/action_controller.rb

@@ -1,28 +0,0 @@
-require "minitest/rails/active_support"
-require "action_controller/test_case"
-
-module MiniTest
-  module Rails
-    module ActionController
-      class TestCase < MiniTest::Rails::ActiveSupport::TestCase
-        RaiseActionExceptions = ::ActionController::TestCase::RaiseActionExceptions
-
-        # Use AC::TestCase for the base class when describing a controller
-        register_spec_type(self) do |desc|
-          desc < ::ActionController::Base if desc.is_a?(Class)
-        end
-        register_spec_type(/Controller( ?Test)?\z/i, self)
-
-        include ::ActionController::TestCase::Behavior
-
-        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
-  end
-end

data/lib/minitest/rails/action_dispatch.rb

@@ -1,41 +0,0 @@
-require 'minitest/rails/active_support'
-require 'action_dispatch/testing/integration'
-require 'action_controller/test_case'
-require 'action_dispatch/routing/url_for'
-
-module MiniTest
-  module Rails
-    module ActionDispatch
-      class IntegrationTest < MiniTest::Rails::ActiveSupport::TestCase
-        include ::ActionDispatch::Integration::Runner
-        include ::ActionController::TemplateAssertions
-        include ::ActionDispatch::Routing::UrlFor
-
-        @@app = nil
-
-        def self.app
-          # DEPRECATE Rails application fallback
-          # This should be set by the initializer
-          @@app || (defined?(::Rails.application) && ::Rails.application) || nil
-        end
-
-        def self.app=(app)
-          @@app = app
-        end
-
-        def app
-          super || ::ActionDispatch::IntegrationTest.app
-        end
-        
-        def url_options
-          reset! unless integration_session
-          integration_session.url_options
-        end
-
-        # Register by name
-        register_spec_type(/Acceptance ?Test\z/i, self)
-        register_spec_type(/Integration ?Test\z/i, self)
-      end
-    end
-  end
-end

data/lib/minitest/rails/action_mailer.rb

@@ -1,26 +0,0 @@
-require "minitest/rails/active_support"
-require "action_mailer/test_case"
-
-module MiniTest
-  module Rails
-    module ActionMailer
-      class TestCase < MiniTest::Rails::ActiveSupport::TestCase
-        # Use AM::TestCase for the base class when describing a mailer
-        register_spec_type(self) do |desc|
-          desc < ::ActionMailer::Base if desc.is_a?(Class)
-        end
-        register_spec_type(/Mailer( ?Test)?\z/i, self)
-
-        include ::ActionMailer::TestCase::Behavior
-
-        def self.determine_default_mailer(name)
-          mailer = determine_constant_from_test_name(name) do |constant|
-            Class === constant && constant < ::ActionMailer::Base
-          end
-          raise ::ActionMailer::NonInferrableMailerError.new(name) if mailer.nil?
-          mailer
-        end
-      end
-    end
-  end
-end