minitest-rails 0.9.2 → 1.0.0.beta1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b5f87e7032f8578fdc6543551231f08849a377be
+  data.tar.gz: 263f20f6ba31323cdedad548ab6e4690876e5715
+SHA512:
+  metadata.gz: 31bdd76b8d6329b0b7f64c5a92e772969a3b2128839b4cd331dd045b0afcbf2dced8f40eaf209ef57e8b00d7e2bdf3cce8c5e24220ce4464b1817d98a4264be8
+  data.tar.gz: 44c812ec2e71d3fdeb1d324efd113e043f56d2e0f29ae3a5a17167898eab6def9be5a589371d790ea51017cc02bcf7061ee9c9663fc06e6e5cb9da8d927c2186

data/.travis.yml

@@ -1,24 +1,22 @@
 ---
 before_install:
-- gem install hoe-travis bundler --no-rdoc --no-ri
-- ruby gemfiles/minitest_tu_shim.rb
-before_script:
-- rake travis:before -t
+  - gem update --system
+  - gem --version
+  - ruby gemfiles/minitest_tu_shim.rb
 language: ruby
 notifications:
   email:
-  - mike@blowmage.com
+    - mike@blowmage.com
 rvm:
-- 1.8.7
-- 1.9.3
-- 2.0.0
-gemfile:
-- gemfiles/3.0.gemfile
-- gemfiles/3.1.gemfile
-- gemfiles/3.2.gemfile
-- gemfiles/4.0.gemfile
-script: rake travis
+  - 2.0.0
+  - 1.9.3
+  - 1.8.7
+env:
+  - "RAILS_VERSION=4.0"
+  - "RAILS_VERSION=3.2"
+  - "RAILS_VERSION=3.1"
+  - "RAILS_VERSION=3.0"
 matrix:
   exclude:
-  - rvm: 1.8.7
-    gemfile: gemfiles/4.0.gemfile
+    - rvm: 1.8.7
+      env: "RAILS_VERSION=4.0"

data/Gemfile

@@ -0,0 +1,7 @@
+source "http://rubygems.org"
+
+gemspec
+
+version = ENV["RAILS_VERSION"] || "4.0"
+
+eval_gemfile File.expand_path("../gemfiles/#{version}.gemfile", __FILE__)

data/Manifest.txt

@@ -2,23 +2,17 @@
 .gemtest
 .travis.yml
 CHANGELOG.rdoc
+Gemfile
 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/4.0.gemfile
-gemfiles/4.0.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/.document
 lib/generators/mini_test.rb
 lib/generators/mini_test/controller/controller_generator.rb
 lib/generators/mini_test/controller/templates/controller_spec.rb
@@ -46,19 +40,22 @@ 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/deprecated/action_controller.rb
 lib/minitest/rails/deprecated/action_dispatch.rb
 lib/minitest/rails/deprecated/action_mailer.rb
 lib/minitest/rails/deprecated/action_view.rb
 lib/minitest/rails/deprecated/active_support.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/gemfiles.rake
 tasks/test.rake
 test/generators/test_controller_generator.rb
 test/generators/test_helper_generator.rb
@@ -68,13 +65,19 @@ 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

data/README.rdoc

@@ -3,7 +3,7 @@
 MiniTest integration for Rails 3 and 4
 
 {<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/badge.png" />}[https://codeclimate.com/github/blowmage/minitest-rails]
+{<img src="https://codeclimate.com/github/blowmage/minitest-rails.png" />}[https://codeclimate.com/github/blowmage/minitest-rails]
 
 == Install
 
@@ -50,6 +50,14 @@ You can also set these as defaults by adding the following to the <tt>config/app
     config.generators do |g|
       g.test_framework :mini_test, :spec => true, :fixture => false
     end
+    
+To run your tests, minitest-rails provides multiple rake tasks by default, for a complete list, simply run <tt>rake -T</tt>.
+
+You can also add any directories under <tt>test/</tt> and minitest-rails will automatically create the associated rake task for it. So let say you add a <tt>test/api/</tt> directory, <tt>rake minitest:api</tt> will automagically be available.
+
+If you want to automatically run <tt>rake minitest:api</tt> when you call <tt>rake minitest</tt>, add this line to a new .rake file under <tt>lib/tasks/</tt>:
+
+    MiniTest::Rails::Testing.default_tasks << 'api'
 
 == Running on Ruby 1.8
 
@@ -67,6 +75,10 @@ The 0.9 release marks a new direction for minitest-rails. Deprecations have been
 
 Existing tests that call <tt>describe</tt> will not work, since <tt>describe</tt> is used by <tt>MiniTest::Spec</tt> blocks.
 
+RSpec and minitest's spec DSL are incompatible and cannot both 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

@@ -5,8 +5,6 @@ require 'hoe'
 
 Hoe.plugin :git
 Hoe.plugin :gemspec
-Hoe.plugin :travis
-Hoe.plugins.delete :rubyforge
 
 Hoe.spec 'minitest-rails' do
   developer 'Mike Moore', 'mike@blowmage.com'
@@ -19,9 +17,12 @@ Hoe.spec 'minitest-rails' do
   self.readme_file  = "README.rdoc"
   self.testlib      = :minitest
 
-  dependency 'minitest',  '~> 4.7'
-  dependency 'rails',     '>= 3.0'
-  dependency 'fakefs',    '~> 0.4', :dev
+  license "MIT"
+
+  dependency 'minitest',      '~> 4.7'
+  dependency 'minitest-test', '~> 1.0'
+  dependency 'railties',      '>= 3.0'
+  dependency 'fakefs',        '~> 0.4', :dev
 end
 
 Dir["tasks/**/*.rake"].each { |t| load t }

data/gemfiles/3.0.gemfile

@@ -1,8 +1,5 @@
 source "http://rubygems.org"
 
-gem "rails", "~> 3.0.19"
+gem "rails", "~> 3.0.20"
+gem "rake"
 gem "rdoc", "~> 3.10"
-gem "hoe", "~> 3.0"
-gem "fakefs", "~> 0.4"
-
-gemspec :path=>"../"

data/gemfiles/3.1.gemfile

@@ -1,8 +1,5 @@
 source "http://rubygems.org"
 
-gem "rails", "~> 3.1.10"
+gem "rails", "~> 3.1.11"
+gem "rake"
 gem "rdoc", "~> 3.10"
-gem "hoe", "~> 3.0"
-gem "fakefs", "~> 0.4"
-
-gemspec :path=>"../"

data/gemfiles/3.2.gemfile

@@ -1,8 +1,5 @@
 source "http://rubygems.org"
 
-gem "rails", "~> 3.2.11"
+gem "rails", "~> 3.2.13"
+gem "rake"
 gem "rdoc", "~> 3.10"
-gem "hoe", "~> 3.0"
-gem "fakefs", "~> 0.4"
-
-gemspec :path=>"../"

data/gemfiles/4.0.gemfile

@@ -1,8 +1,4 @@
 source "http://rubygems.org"
 
-gem "rails", "4.0.0.beta1"
-gem "rdoc", "~> 3.10"
-gem "hoe", "~> 3.0"
-gem "fakefs", "~> 0.4"
-
-gemspec :path=>"../"
+gem "rails", "~> 4.0.0"
+gem "rake"

data/lib/generators/mini_test/controller/templates/controller_spec.rb

@@ -3,9 +3,9 @@ require "test_helper"
 <% module_namespacing do -%>
 describe <%= class_name %>Controller do
 <% if actions.empty? -%>
-  # it "must be a real test" do
-  #   flunk "Need real tests"
-  # end
+  it "must be a real test" do
+    flunk "Need real tests"
+  end
 <% else -%>
 <% actions.each do |action| -%>
   it "should get <%= action %>" do

data/lib/generators/mini_test/controller/templates/controller_test.rb

@@ -3,12 +3,12 @@ require "test_helper"
 <% module_namespacing do -%>
 class <%= class_name %>ControllerTest < ActionController::TestCase
 <% if actions.empty? -%>
-  # test "the truth" do
-  #   assert true
-  # end
+  def test_sanity
+    flunk "Need real tests"
+  end
 <% else -%>
 <% actions.each do |action| -%>
-  test "should get <%= action %>" do
+  def test_<%= action %>
     get :<%= action %>
     assert_response :success
   end

data/lib/generators/mini_test/helper/templates/helper_test.rb

@@ -4,7 +4,7 @@ require "test_helper"
 class <%= class_name %>HelperTest < ActionView::TestCase
 
   def test_sanity
-    assert true
+    flunk "Need real tests"
   end
 
 end

data/lib/generators/mini_test/install/install_generator.rb

@@ -3,6 +3,7 @@ require 'rails/generators'
 module MiniTest
   module Generators
     class InstallGenerator < ::Rails::Generators::Base
+      class_option :active_record, :type => :boolean, :default => true, :desc => "Add ActiveRecord configuration"
 
       desc <<DESC
 Description:
@@ -17,6 +18,10 @@ DESC
         template 'test_helper.rb', File.join("test", "test_helper.rb")
       end
 
+      def add_migration_check
+        ::Rails::VERSION::STRING >= "4.0"
+      end
+
     end
   end
 end

data/lib/generators/mini_test/install/templates/test_helper.rb

@@ -11,8 +11,17 @@ require "minitest/rails"
 # require "minitest/pride"
 
 class ActiveSupport::TestCase
+<% if options[:active_record] -%>
+  <% if add_migration_check -%>
+  ActiveRecord::Migration.check_pending!
+
+  <% end -%>
   # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
+  #
+  # Note: You'll currently still have to declare fixtures explicitly in integration tests
+  # -- they do not yet inherit this setting
   fixtures :all
 
+<% end -%>
   # Add more helper methods to be used by all tests here...
 end

data/lib/generators/mini_test/integration/templates/integration_spec.rb

@@ -2,7 +2,7 @@ require "test_helper"
 
 # To be handled correctly this spec must end with "Integration Test"
 describe "<%= class_name %> Integration Test" do
-  # it "must be a real test" do
-  #   flunk "Need real tests"
-  # end
+  it "must be a real test" do
+    flunk "Need real tests"
+  end
 end

data/lib/generators/mini_test/integration/templates/integration_test.rb

@@ -1,7 +1,7 @@
 require "test_helper"
 
 class <%= class_name %>Test < ActionDispatch::IntegrationTest
-  # test "the truth" do
-  #   assert true
-  # end
+  def test_sanity
+    flunk "Need real tests"
+  end
 end

data/lib/generators/mini_test/mailer/mailer_generator.rb

@@ -9,9 +9,9 @@ module MiniTest
 
       def create_test_files
         if options[:spec]
-          template "mailer_spec.rb", "test/mailers/#{file_name}_test.rb"
+          template "mailer_spec.rb", File.join("test","mailers", class_path, "#{file_name}_test.rb")
         else
-          template "mailer_test.rb", "test/mailers/#{file_name}_test.rb"
+          template "mailer_test.rb", File.join("test","mailers", class_path, "#{file_name}_test.rb")
         end
       end
     end

data/lib/generators/mini_test/mailer/templates/mailer_test.rb

@@ -3,7 +3,7 @@ require "test_helper"
 <% module_namespacing do -%>
 class <%= class_name %>Test < ActionMailer::TestCase
 <% actions.each do |action| -%>
-  test "<%= action %>" do
+  def test_<%= action %>
     mail = <%= class_name %>.<%= action %>
     assert_equal <%= action.to_s.humanize.inspect %>, mail.subject
     assert_equal ["to@example.org"], mail.to
@@ -13,9 +13,9 @@ class <%= class_name %>Test < ActionMailer::TestCase
 
 <% end -%>
 <% if actions.blank? -%>
-  # test "the truth" do
-  #   assert true
-  # end
+  def test_sanity
+    flunk "Need real tests"
+  end
 <% end -%>
 end
 <% end -%>

data/lib/generators/mini_test/model/model_generator.rb

@@ -10,9 +10,9 @@ module MiniTest
 
       def create_test_file
         if options[:spec]
-          template "model_spec.rb", "test/models/#{file_name}_test.rb"
+          template "model_spec.rb", File.join("test","models", class_path, "#{file_name}_test.rb")
         else
-          template "model_test.rb", "test/models/#{file_name}_test.rb"
+          template "model_test.rb", File.join("test","models", class_path, "#{file_name}_test.rb")
         end
       end
 
@@ -20,7 +20,7 @@ module MiniTest
 
       def create_fixture_file
         if options[:fixture] && options[:fixture_replacement].nil?
-          template "fixtures.yml", "test/fixtures/#{plural_file_name}.yml"
+          template "fixtures.yml", File.join("test","fixtures", class_path, "#{plural_file_name}.yml")
         end
       end
     end

data/lib/generators/mini_test/model/templates/model_spec.rb

@@ -2,12 +2,10 @@ require "test_helper"
 
 <% module_namespacing do -%>
 describe <%= class_name %> do
-  before do
-    @<%= file_name %> = <%= class_name %>.new
-  end
+  let(:<%= file_name %>) { <%= class_name %>.new }
 
   it "must be valid" do
-    @<%= file_name %>.valid?.must_equal true
+    <%= file_name %>.must_be :valid?
   end
 end
 <% end -%>

data/lib/generators/mini_test/model/templates/model_test.rb

@@ -2,8 +2,14 @@ require "test_helper"
 
 <% module_namespacing do -%>
 class <%= class_name %>Test < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
+
+  def <%= file_name %>
+    @<%= file_name %> ||= <%= class_name %>.new
+  end
+
+  def test_valid
+    assert <%= file_name %>.valid?
+  end
+
 end
 <% end -%>

data/lib/generators/mini_test/route/templates/route_spec.rb

@@ -5,6 +5,6 @@ require "test_helper"
 
 describe "Route Integration Test" do
   it "route root" do
-    assert_routing "/", class: "home", action: "show"
+    assert_routing "/", controller: "home", action: "show"
   end
 end

data/lib/generators/mini_test/route/templates/route_test.rb

@@ -5,6 +5,6 @@ require "test_helper"
 
 class RouteTest < ActionDispatch::IntegrationTest
   def test_root
-    assert_routing "/", class: "home", action: "show"
+    assert_routing "/", controller: "home", action: "show"
   end
 end

data/lib/generators/mini_test/scaffold/templates/controller_spec.rb

@@ -3,22 +3,20 @@ require "test_helper"
 <% module_namespacing do -%>
 describe <%= controller_class_name %>Controller do
 
-  before do
-    @<%= singular_table_name %> = <%= table_name %>(:one)
-  end
+  let(:<%= singular_table_name %>) { <%= table_name %> :one }
 
-  it "must get index" do
+  it "gets index" do
     get :index
     assert_response :success
     assert_not_nil assigns(:<%= table_name %>)
   end
 
-  it "must get new" do
+  it "gets new" do
     get :new
     assert_response :success
   end
 
-  it "must create <%= singular_table_name %>" do
+  it "creates <%= singular_table_name %>" do
     assert_difference('<%= class_name %>.count') do
       post :create, <%= "#{singular_table_name}: { #{attributes_hash} }" %>
     end
@@ -26,24 +24,24 @@ describe <%= controller_class_name %>Controller do
     assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
   end
 
-  it "must show <%= singular_table_name %>" do
-    get :show, <%= key_value :id, "@#{singular_table_name}" %>
+  it "shows <%= singular_table_name %>" do
+    get :show, <%= key_value :id, "#{singular_table_name}" %>
     assert_response :success
   end
 
-  it "must get edit" do
-    get :edit, <%= key_value :id, "@#{singular_table_name}" %>
+  it "gets edit" do
+    get :edit, <%= key_value :id, "#{singular_table_name}" %>
     assert_response :success
   end
 
-  it "must update <%= singular_table_name %>" do
-    put :update, <%= key_value :id, "@#{singular_table_name}" %>, <%= "#{singular_table_name}: { #{attributes_hash} }" %>
+  it "updates <%= singular_table_name %>" do
+    put :update, <%= key_value :id, "#{singular_table_name}" %>, <%= "#{singular_table_name}: { #{attributes_hash} }" %>
     assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
   end
 
-  it "must destroy <%= singular_table_name %>" do
+  it "destroys <%= singular_table_name %>" do
     assert_difference('<%= class_name %>.count', -1) do
-      delete :destroy, <%= key_value :id, "@#{singular_table_name}" %>
+      delete :destroy, <%= key_value :id, "#{singular_table_name}" %>
     end
 
     assert_redirected_to <%= index_helper %>_path

data/lib/generators/mini_test/scaffold/templates/controller_test.rb

@@ -3,8 +3,8 @@ require "test_helper"
 <% module_namespacing do -%>
 class <%= controller_class_name %>ControllerTest < ActionController::TestCase
 
-  before do
-    @<%= singular_table_name %> = <%= table_name %>(:one)
+  def <%= singular_table_name %>
+    @<%= singular_table_name %> ||= <%= table_name %> :one
   end
 
   def test_index
@@ -27,23 +27,23 @@ class <%= controller_class_name %>ControllerTest < ActionController::TestCase
   end
 
   def test_show
-    get :show, <%= key_value :id, "@#{singular_table_name}" %>
+    get :show, <%= key_value :id, singular_table_name %>
     assert_response :success
   end
 
   def test_edit
-    get :edit, <%= key_value :id, "@#{singular_table_name}" %>
+    get :edit, <%= key_value :id, singular_table_name %>
     assert_response :success
   end
 
   def test_update
-    put :update, <%= key_value :id, "@#{singular_table_name}" %>, <%= "#{singular_table_name}: { #{attributes_hash} }" %>
+    put :update, <%= key_value :id, singular_table_name %>, <%= "#{singular_table_name}: { #{attributes_hash} }" %>
     assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
   end
 
   def test_destroy
     assert_difference('<%= class_name %>.count', -1) do
-      delete :destroy, <%= key_value :id, "@#{singular_table_name}" %>
+      delete :destroy, <%= key_value :id, singular_table_name %>
     end
 
     assert_redirected_to <%= index_helper %>_path