minitest-rails 0.1.1 → 0.2

data/.travis.yml

@@ -0,0 +1,19 @@
+---
+before_script:
+- gem install hoe-travis --no-rdoc --no-ri
+- ruby gemfiles/minitest_tu_shim.rb
+- rake travis:before -t
+language: ruby
+notifications:
+  email:
+  - mike@blowmage.com
+rvm:
+- 1.9.3
+- ruby-head
+- 1.8.7
+- ree
+gemfile:
+- gemfiles/3.0.gemfile
+- gemfiles/3.1.gemfile
+- gemfiles/3.2.gemfile
+script: rake travis

data/CHANGELOG.rdoc

@@ -1,4 +1,36 @@
-=== 0.1.0 / 2012-07-09
+=== 0.2 / 2012-09-19
+
+* Add support for Autotest (closes #64)
+* Override default rake task (closes #67)
+* Add support for matching view specs names (closes #70)
+* Fixed travis builds (closes #69)
+* Fix bug with registering AS:TestCase (closes #73)
+
+https://github.com/blowmage/minitest-rails/compare/v0.1.3...v0.2
+
+=== 0.1.3 / 2012-08-02
+
+* Significant improvements to nested describe blocks (closes #58)
+* Tests no longer need write permission to the filesystem
+
+https://github.com/blowmage/minitest-rails/compare/v0.1.2...v0.1.3
+
+=== 0.1.2 / 2012-07-26
+
+* Fix bug when ActionMailer isn't loaded (closes #66)
+* Allow specs to use strings in `describe` blocks
+
+https://github.com/blowmage/minitest-rails/compare/v0.1.1...v0.1.2
+
+=== 0.1.1 / 2012-07-17
+
+* Improved rake tasks
+* Improved Rails 3.0 support
+* Fixed bug with nested describes
+
+https://github.com/blowmage/minitest-rails/compare/v0.1...v0.1.1
+
+=== 0.1 / 2012-07-09
 
 This is a major change. The approach used is the same approach used in Rails 4. This version is very different than the 0.0.x versions.
 

data/Manifest.txt

@@ -1,10 +1,22 @@
 .autotest
 .gemtest
+.travis.yml
 CHANGELOG.rdoc
 LICENSE
 Manifest.txt
 README.rdoc
 Rakefile
+gemfiles/3.0.gemfile
+gemfiles/3.0.gemfile.lock
+gemfiles/3.1.gemfile
+gemfiles/3.1.gemfile.lock
+gemfiles/3.2.gemfile
+gemfiles/3.2.gemfile.lock
+gemfiles/minitest_tu_shim.rb
+lib/autotest/discover.rb
+lib/autotest/fixtures.rb
+lib/autotest/migrate.rb
+lib/autotest/minitest_rails.rb
 lib/generators/mini_test.rb
 lib/generators/mini_test/controller/controller_generator.rb
 lib/generators/mini_test/controller/templates/controller_spec.rb
@@ -39,10 +51,17 @@ lib/minitest/rails/mochaing.rb
 lib/minitest/rails/tasks/minitest.rake
 lib/minitest/rails/tasks/sub_test_task.rb
 minitest-rails.gemspec
-test/test_controller_generator.rb
-test/test_helper_generator.rb
-test/test_install_generator.rb
-test/test_mailer_generator.rb
-test/test_minitest.rb
-test/test_model_generator.rb
-test/test_scaffold_generator.rb
+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_scaffold_generator.rb
+test/rails/action_controller/test_controller_lookup.rb
+test/rails/action_controller/test_controllers.rb
+test/rails/action_controller/test_spec_type.rb
+test/rails/test_action_dispatch_spec_type.rb
+test/rails/test_action_mailer_spec_type.rb
+test/rails/test_action_view_spec_type.rb
+test/rails/test_active_support_spec_type.rb
+test/test_sanity.rb

data/README.rdoc

@@ -2,6 +2,8 @@
 
 MiniTest integration for Rails 3.x
 
+{<img src="https://secure.travis-ci.org/blowmage/minitest-rails.png" alt="Build Status" />}[http://travis-ci.org/blowmage/minitest-rails]
+
 == Install
 
     gem install minitest-rails
@@ -87,6 +89,23 @@ https://groups.google.com/group/minitest-rails
 
 == License
 
-Copyright © 2012 Mike Moore.
-
-Released under the MIT license. See `LICENSE` for details.
+Copyright (c) 2012 Mike Moore
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -5,6 +5,7 @@ require 'hoe'
 
 Hoe.plugin :git
 Hoe.plugin :gemspec
+Hoe.plugin :travis
 Hoe.plugins.delete :rubyforge
 
 Hoe.spec 'minitest-rails' do
@@ -18,8 +19,9 @@ Hoe.spec 'minitest-rails' do
   self.readme_file  = "README.rdoc"
   self.testlib      = :minitest
 
-  extra_deps << ['minitest',  '~> 3.0']
-  extra_deps << ['rails',     '~> 3.0']
+  dependency 'minitest',  '~> 3.4'
+  dependency 'rails',     '~> 3.0'
+  dependency 'fakefs',    '~> 0.4', :dev
 end
 
 # vim: syntax=ruby

data/gemfiles/3.0.gemfile

@@ -0,0 +1,9 @@
+source "http://rubygems.org"
+
+gem "rails", "~> 3.0.15"
+gem "minitest", "~> 3.0"
+gem "rdoc", "~> 3.10"
+gem "hoe", "~> 3.0"
+gem "fakefs", "~> 0.4"
+
+gemspec :path=>"../"

data/gemfiles/3.0.gemfile.lock

@@ -0,0 +1,92 @@
+PATH
+  remote: /Users/blowmage/codez/minitest-rails
+  specs:
+    minitest-rails (0.1.2.20120728124510)
+      minitest (~> 3.0)
+      rails (~> 3.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.16)
+      actionpack (= 3.0.16)
+      mail (~> 2.2.19)
+    actionpack (3.0.16)
+      activemodel (= 3.0.16)
+      activesupport (= 3.0.16)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.5)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.16)
+      activesupport (= 3.0.16)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.16)
+      activemodel (= 3.0.16)
+      activesupport (= 3.0.16)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.16)
+      activemodel (= 3.0.16)
+      activesupport (= 3.0.16)
+    activesupport (3.0.16)
+    arel (2.0.10)
+    builder (2.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    fakefs (0.4.0)
+    hoe (3.0.6)
+      rake (~> 0.8)
+    i18n (0.5.0)
+    json (1.7.4)
+    mail (2.2.19)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.19)
+    minitest (3.3.0)
+    polyglot (0.3.3)
+    rack (1.2.5)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.16)
+      actionmailer (= 3.0.16)
+      actionpack (= 3.0.16)
+      activerecord (= 3.0.16)
+      activeresource (= 3.0.16)
+      activesupport (= 3.0.16)
+      bundler (~> 1.0)
+      railties (= 3.0.16)
+    railties (3.0.16)
+      actionpack (= 3.0.16)
+      activesupport (= 3.0.16)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.4)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    thor (0.14.6)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.33)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fakefs (~> 0.4)
+  hoe (~> 3.0)
+  minitest (~> 3.0)
+  minitest-rails!
+  rails (~> 3.0.15)
+  rdoc (~> 3.10)

data/gemfiles/3.1.gemfile

@@ -0,0 +1,9 @@
+source "http://rubygems.org"
+
+gem "rails", "~> 3.1.6"
+gem "minitest", "~> 3.0"
+gem "rdoc", "~> 3.10"
+gem "hoe", "~> 3.0"
+gem "fakefs", "~> 0.4"
+
+gemspec :path=>"../"

data/gemfiles/3.1.gemfile.lock

@@ -0,0 +1,103 @@
+PATH
+  remote: /Users/blowmage/codez/minitest-rails
+  specs:
+    minitest-rails (0.1.2.20120728124510)
+      minitest (~> 3.0)
+      rails (~> 3.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.1.7)
+      actionpack (= 3.1.7)
+      mail (~> 2.3.3)
+    actionpack (3.1.7)
+      activemodel (= 3.1.7)
+      activesupport (= 3.1.7)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.6)
+      rack-cache (~> 1.2)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.4)
+    activemodel (3.1.7)
+      activesupport (= 3.1.7)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.7)
+      activemodel (= 3.1.7)
+      activesupport (= 3.1.7)
+      arel (~> 2.2.3)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.7)
+      activemodel (= 3.1.7)
+      activesupport (= 3.1.7)
+    activesupport (3.1.7)
+      multi_json (>= 1.0, < 1.3)
+    arel (2.2.3)
+    builder (3.0.0)
+    erubis (2.7.0)
+    fakefs (0.4.0)
+    hike (1.2.1)
+    hoe (3.0.6)
+      rake (~> 0.8)
+    i18n (0.6.0)
+    json (1.7.4)
+    mail (2.3.3)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.19)
+    minitest (3.3.0)
+    multi_json (1.2.0)
+    polyglot (0.3.3)
+    rack (1.3.6)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.1.7)
+      actionmailer (= 3.1.7)
+      actionpack (= 3.1.7)
+      activerecord (= 3.1.7)
+      activeresource (= 3.1.7)
+      activesupport (= 3.1.7)
+      bundler (~> 1.0)
+      railties (= 3.1.7)
+    railties (3.1.7)
+      actionpack (= 3.1.7)
+      activesupport (= 3.1.7)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    sprockets (2.0.4)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.33)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fakefs (~> 0.4)
+  hoe (~> 3.0)
+  minitest (~> 3.0)
+  minitest-rails!
+  rails (~> 3.1.6)
+  rdoc (~> 3.10)

data/gemfiles/3.2.gemfile

@@ -0,0 +1,9 @@
+source "http://rubygems.org"
+
+gem "rails", "~> 3.2.6"
+gem "minitest", "~> 3.0"
+gem "rdoc", "~> 3.10"
+gem "hoe", "~> 3.0"
+gem "fakefs", "~> 0.4"
+
+gemspec :path=>"../"

data/gemfiles/3.2.gemfile.lock

@@ -0,0 +1,101 @@
+PATH
+  remote: /Users/blowmage/codez/minitest-rails
+  specs:
+    minitest-rails (0.1.2.20120728124510)
+      minitest (~> 3.0)
+      rails (~> 3.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.2.7)
+      actionpack (= 3.2.7)
+      mail (~> 2.4.4)
+    actionpack (3.2.7)
+      activemodel (= 3.2.7)
+      activesupport (= 3.2.7)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.7)
+      activesupport (= 3.2.7)
+      builder (~> 3.0.0)
+    activerecord (3.2.7)
+      activemodel (= 3.2.7)
+      activesupport (= 3.2.7)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.7)
+      activemodel (= 3.2.7)
+      activesupport (= 3.2.7)
+    activesupport (3.2.7)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.0)
+    erubis (2.7.0)
+    fakefs (0.4.0)
+    hike (1.2.1)
+    hoe (3.0.6)
+      rake (~> 0.8)
+    i18n (0.6.0)
+    journey (1.0.4)
+    json (1.7.4)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.19)
+    minitest (3.3.0)
+    multi_json (1.3.6)
+    polyglot (0.3.3)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.2.7)
+      actionmailer (= 3.2.7)
+      actionpack (= 3.2.7)
+      activerecord (= 3.2.7)
+      activeresource (= 3.2.7)
+      activesupport (= 3.2.7)
+      bundler (~> 1.0)
+      railties (= 3.2.7)
+    railties (3.2.7)
+      actionpack (= 3.2.7)
+      activesupport (= 3.2.7)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    sprockets (2.1.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.15.4)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.33)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fakefs (~> 0.4)
+  hoe (~> 3.0)
+  minitest (~> 3.0)
+  minitest-rails!
+  rails (~> 3.2.6)
+  rdoc (~> 3.10)

data/gemfiles/minitest_tu_shim.rb

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

data/lib/autotest/discover.rb

@@ -0,0 +1,5 @@
+Autotest.add_discovery do
+  style = []
+  style = ["minitest", "rails"] if File.exist? 'config/application.rb'
+  style
+end

data/lib/autotest/fixtures.rb

@@ -0,0 +1,7 @@
+module Autotest::Fixtures
+  Autotest.add_hook :initialize do  |at|
+    at.test_mappings['^test/fixtures/(.*)s.yml'] = proc { |filename, matches|
+      at.files_matching(/test\/\w+\/#{matches[1]}(_\w+)?.*_test.rb$/)
+    }
+  end
+end

data/lib/autotest/migrate.rb

@@ -0,0 +1,5 @@
+module Autotest::Migrate
+  Autotest.add_hook(:run) do |autotest|
+    system "rake db:migrate" if autotest.class.to_s == "MinitestRails"
+  end
+end

data/lib/autotest/minitest_rails.rb

@@ -0,0 +1,62 @@
+require 'autotest'
+
+class Autotest::MinitestRails < Autotest
+  VERSION = "0.2"
+
+  def initialize # :nodoc:
+    super
+
+    add_exception %r%^\./(?:db|doc|log|public|script|tmp|vendor)%
+
+    clear_mappings
+
+    add_mapping %r%^app/models/(.*)\.rb$% do |_, m|
+      files_matching %r%^test/models/#{m[1]}.*_test.rb$%
+    end
+
+    add_mapping %r%^app/controllers/(.*)_controller\.rb$% do |_, m|
+      if m[1] == "application" then
+        files_matching %r%^test/(controllers|views)/.*_test\.rb$%
+      else
+        files_matching %r%^test/(controllers|views)/#{m[1]}.*_test.rb$%
+      end
+    end
+
+    add_mapping %r%^app/helpers/(.*)_helper.rb% do |_, m|
+      if m[1] == "application" then
+        files_matching %r%^test/(helpers|views|controllers)/.*_test\.rb$%
+      else
+        files_matching %r%^test/(helpers|views|controllers)/#{m[1]}.*_test.rb$%
+      end
+    end
+
+    add_mapping %r%^app/views/(.*)/% do |_, m|
+      files_matching %r%^test/(controllers|views)/#{m[1]}.*_test.rb$%
+    end
+
+    add_mapping %r%^app/mailers/(.*)\.rb$% do |_, m|
+      files_matching %r%^test/mailers/#{m[1]}.*_test.rb$%
+    end
+
+
+    add_mapping %r%^app/lib/(.*)\.rb$% do |_, m|
+      files_matching %r%^test/lib/#{m[1]}.*_test.rb$%
+    end
+
+    add_mapping %r%^test/.*_test\.rb$% do |filename, _|
+      filename
+    end
+
+    add_mapping %r%^test/fixtures/(.*)s.yml% do |_, m|
+      files_matching %r%^test/(models|controllers|views)/#{m[1]}.*_test.rb$%
+    end
+
+    add_mapping %r%^config/routes.rb$% do # FIX:
+      files_matching %r%^test/(controllers|views|acceptance)/.*_test\.rb$%
+    end
+
+    add_mapping %r%^test/*_helper.rb|config/((boot|environment(s/test)?).rb|database.yml)% do
+      files_matching %r%^test/(models|controllers|views|lib|acceptance)/.*_test\.rb$%
+    end
+  end
+end

data/lib/generators/mini_test.rb

@@ -7,12 +7,20 @@ module MiniTest
         @_minitest_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'mini_test', generator_name, 'templates'))
       end
 
-      begin
-        # This method doesn't exist in Rails 3.0
+      if ::Rails.version.to_f < 3.1
+        protected
+        # These methods don't exist in Rails 3.0
         def module_namespacing(&block)
           yield if block_given?
         end
-      end unless respond_to?(:module_namespacing)
+        def key_value(key, value)
+          if options[:old_style_hash] || RUBY_VERSION < '1.9'
+            ":#{key} => #{value}"
+          else
+            "#{key}: #{value}"
+          end
+        end
+      end
     end
   end
 end

data/lib/minitest/rails/action_controller.rb

@@ -9,10 +9,52 @@ module MiniTest
 
         # Use AC::TestCase for the base class when describing a controller
         register_spec_type(self) do |desc|
-          desc < ::ActionController::Base
+          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)
+          # Override this method to support nested describes
+          #
+          # describe WidgetsController do
+          #   describe "index" do
+          #     it "is successful" do
+          #       assert_response :success
+          #     end
+          #   end
+          # end
+          #
+          # Original implementation:
+          # name.sub(/Test$/, '').safe_constantize
+          # safe_constantize is not supported in Rails 3.0...
+          ControllerLookup.find name
+        end
+      end
+
+      module ControllerLookup
+        def self.find controller
+          # HACK: I don't love this implementation
+          # Please suggest a better one!
+          names = controller.split "::"
+          controller = while names.size > 0 do
+            # Remove "Test" if present
+            names.last.sub! /Test$/, ''
+            begin
+              constant = names.join("::").constantize
+              break(constant) if constant
+            rescue NameError
+              # do nothing
+            ensure
+              names.pop
+            end
+          end
+          if controller.nil?
+            raise ::NameError.new("Unable to resolve controller for #{name}")
+          end
+          controller
+        end
       end
     end
   end

data/lib/minitest/rails/action_dispatch.rb

@@ -1,5 +1,7 @@
 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
@@ -24,13 +26,11 @@ module MiniTest
         def app
           super || ::ActionDispatch::IntegrationTest.app
         end
+
+        # Register by name
+        register_spec_type(/Acceptance ?Test\z/i, self)
+        register_spec_type(/Integration ?Test\z/i, self)
       end
     end
   end
 end
-
-# Register by name
-MiniTest::Spec.register_spec_type(/AcceptanceTest$/,   MiniTest::Rails::ActionDispatch::IntegrationTest)
-MiniTest::Spec.register_spec_type(/Acceptance Test$/,  MiniTest::Rails::ActionDispatch::IntegrationTest)
-MiniTest::Spec.register_spec_type(/IntegrationTest$/,  MiniTest::Rails::ActionDispatch::IntegrationTest)
-MiniTest::Spec.register_spec_type(/Integration Test$/, MiniTest::Rails::ActionDispatch::IntegrationTest)