minitest-rails 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf6577b6ce6d9da859bf47767f13696600ec474a
-  data.tar.gz: 07223c98e27cc1be07834eb3865fc6c51b461056
+  metadata.gz: 68edb1de24a345b79b62a8e72d7dc4440d50a6cf
+  data.tar.gz: bf11388632659cbdcab89ea106957f27e38ba00f
 SHA512:
-  metadata.gz: dbc04982898fed29de7fd1cace702da2ec6e3b2f60dca3be344545108b1a714425233860d52c4aeb5965e6f0f67b478291318e5898eb4890b4a43e71466e48ba
-  data.tar.gz: 2d5d3654e42f3e4386ee948ba4d1d8eb5568e895679f270596c71da0a9ddbfb4f8be9720667e98cba6c429893134b7b2d831cdeeeb8a1c559a4801982d444a1e
+  metadata.gz: af1b2cba09d025f60ef74a88babcb2170360e87e5c3f151bcae5176b4683b43b8c2f442b1a2e96ad03d5836f7389929d6250a3a74a59198d5061fe7ceb75bc64
+  data.tar.gz: 9be6b040a720d5f91943e251cb7fc74a587e31b63b52d4fe5a2a9fbde92ed104b7e4320081c6dcd7360721c6e3330f3c063fb0e2a95343dcfcb021bf71413cac

data/.travis.yml

@@ -7,12 +7,13 @@ notifications:
   email:
     - mike@blowmage.com
 rvm:
-  - 2.1.1
-  - 2.1.0
-  - 2.0.0
+  - 2.2
+  - 2.1
+  - 2.0
   - 1.9.3
 env:
   - "RAILS_VERSION=4.1"
+  - "RAILS_VERSION=4.2"
 notifications:
   webhooks:
     urls:

data/CHANGELOG.rdoc

@@ -1,3 +1,12 @@
+=== 2.2.0 / 2015-05-29
+
+* Update to Minitest 5.7
+* Use Value Monad for Expectations
+* Active Job support (liseki)
+* Documentation improvements (WendyBeth)
+
+https://github.com/blowmage/minitest-rails/compare/v2.1.1...v2.2.0
+
 === 2.1.1 / 2014-10-28
 
 * Fix scaffold generator to use accessor instead of ivar (isaacsloan)

data/Gemfile

@@ -2,6 +2,6 @@ source "http://rubygems.org"
 
 gemspec
 
-version = ENV["RAILS_VERSION"] || "4.1"
+version = ENV["RAILS_VERSION"] || "4.2"
 
 eval_gemfile File.expand_path("../gemfiles/#{version}.gemfile", __FILE__)

data/Manifest.txt

@@ -8,6 +8,7 @@ Manifest.txt
 README.rdoc
 Rakefile
 gemfiles/4.1.gemfile
+gemfiles/4.2.gemfile
 lib/generators/.document
 lib/generators/minitest.rb
 lib/generators/minitest/controller/controller_generator.rb
@@ -24,6 +25,9 @@ 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/job/job_generator.rb
+lib/generators/minitest/job/templates/job_spec.rb
+lib/generators/minitest/job/templates/job_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
@@ -51,6 +55,7 @@ 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_job_generator.rb
 test/generators/test_mailer_generator.rb
 test/generators/test_model_generator.rb
 test/generators/test_route_generator.rb
@@ -65,6 +70,9 @@ 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_job/test_assertions.rb
+test/rails/active_job/test_expectations.rb
+test/rails/active_job/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

data/Rakefile

@@ -19,7 +19,7 @@ Hoe.spec "minitest-rails" do
 
   license "MIT"
 
-  dependency "minitest", "~> 5.4"
+  dependency "minitest", "~> 5.7"
   dependency "railties", "~> 4.1"
   dependency "fakefs",   "= 0.4.3", :dev
 end

data/gemfiles/4.2.gemfile

@@ -0,0 +1,5 @@
+source "http://rubygems.org"
+
+gem "rails", "~> 4.2.0"
+gem "sqlite3"
+gem "rake"

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

@@ -10,7 +10,7 @@ describe <%= class_name %>Controller do
 <% actions.each do |action| -%>
   it "should get <%= action %>" do
     get :<%= action %>
-    assert_response :success
+    value(response).must_be :success?
   end
 
 <% end -%>

data/lib/generators/minitest/helper/templates/helper_spec.rb

@@ -2,10 +2,8 @@ require "test_helper"
 
 <% module_namespacing do -%>
 describe <%= class_name %>Helper do
-
   it "must be a real test" do
     flunk "Need real tests"
   end
-
 end
 <% end -%>

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

@@ -2,10 +2,8 @@ require "test_helper"
 
 <% module_namespacing do -%>
 class <%= class_name %>HelperTest < ActionView::TestCase
-
   def test_sanity
     flunk "Need real tests"
   end
-
 end
 <% end -%>

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

@@ -3,7 +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"
+      class_option :skip_active_record, type: :boolean, default: false, desc: "Skip Active Record files"
 
       desc <<DESC
 Description:
@@ -17,11 +17,6 @@ DESC
       def copy_minitest_files
         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/minitest/install/templates/test_helper.rb

@@ -11,17 +11,9 @@ 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
+<% unless options[:skip_active_record] -%>
+  # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
   fixtures :all
-
 <% end -%>
   # Add more helper methods to be used by all tests here...
 end

data/lib/generators/minitest/job/job_generator.rb

@@ -0,0 +1,19 @@
+require "generators/minitest"
+
+module Minitest
+  module Generators
+    class JobGenerator < Base
+      check_class_collision suffix: 'JobTest'
+
+      def create_test_files
+        if options[:spec]
+          template_file = "job_spec.rb"
+        else
+          template_file = "job_test.rb"
+        end
+        template template_file,
+                 File.join("test/jobs", class_path, "#{file_name}_job_test.rb")
+      end
+    end
+  end
+end

data/lib/generators/minitest/job/templates/job_spec.rb

@@ -0,0 +1,9 @@
+require "test_helper"
+
+<% module_namespacing do -%>
+describe <%= class_name %>Job do
+  it "must be a real test" do
+    flunk "Need real tests"
+  end
+end
+<% end -%>

data/lib/generators/minitest/job/templates/job_test.rb

@@ -0,0 +1,9 @@
+require "test_helper"
+
+<% module_namespacing do -%>
+class <%= class_name %>JobTest < ActiveJob::TestCase
+  def test_sanity
+    flunk "Need real tests"
+  end
+end
+<% end -%>

data/lib/generators/minitest/mailer/templates/mailer_spec.rb

@@ -5,10 +5,10 @@ describe <%= class_name %> do
 <% actions.each do |action| -%>
   it "<%= action %>" do
     mail = <%= class_name %>.<%= action %>
-    mail.subject.must_equal <%= action.to_s.humanize.inspect %>
-    mail.to.must_equal ["to@example.org"]
-    mail.from.must_equal ["from@example.com"]
-    mail.body.encoded.must_match "Hi"
+    value(mail.subject).must_equal <%= action.to_s.humanize.inspect %>
+    value(mail.to).must_equal ["to@example.org"]
+    value(mail.from).must_equal ["from@example.com"]
+    value(mail.body.encoded).must_match "Hi"
   end
 <% end -%>
 <% if actions.blank? -%>

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

@@ -5,7 +5,7 @@ describe <%= class_name %> do
   let(:<%= file_name %>) { <%= class_name %>.new }
 
   it "must be valid" do
-    <%= file_name %>.must_be :valid?
+    value(<%= file_name %>).must_be :valid?
   end
 end
 <% end -%>

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

@@ -2,7 +2,6 @@ require "test_helper"
 
 <% module_namespacing do -%>
 class <%= class_name %>Test < ActiveSupport::TestCase
-
   def <%= file_name %>
     @<%= file_name %> ||= <%= class_name %>.new
   end
@@ -10,6 +9,5 @@ class <%= class_name %>Test < ActiveSupport::TestCase
   def test_valid
     assert <%= file_name %>.valid?
   end
-
 end
 <% end -%>

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

@@ -1,10 +1,13 @@
 require "test_helper"
 
 # Add the following to your Rake file to test routes by default:
-#   Minitest::Rails::Testing.default_tasks << "routes"
+#   Rails::TestTask.new("test:routes" => "test:prepare") do |t|
+#     t.pattern = "test/routes/**/*_test.rb"
+#   end
+#   Rake::Task["test:run"].enhance ["test:routes"]
 
 describe "Route Integration Test" do
   it "route root" do
-    assert_routing "/", controller: "home", action: "show"
+    must_route "/", controller: "home", action: "show"
   end
 end

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

@@ -1,7 +1,10 @@
 require "test_helper"
 
 # Add the following to your Rake file to test routes by default:
-#   Minitest::Rails::Testing.default_tasks << "routes"
+#   Rails::TestTask.new("test:routes" => "test:prepare") do |t|
+#     t.pattern = "test/routes/**/*_test.rb"
+#   end
+#   Rake::Task["test:run"].enhance ["test:routes"]
 
 class RouteTest < ActionDispatch::IntegrationTest
   def test_root

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

@@ -2,50 +2,48 @@ require "test_helper"
 
 <% module_namespacing do -%>
 describe <%= controller_class_name %>Controller do
-
   let(:<%= singular_table_name %>) { <%= table_name %> :one }
 
   it "gets index" do
     get :index
-    assert_response :success
-    assert_not_nil assigns(:<%= table_name %>)
+    value(response).must_be :success?
+    value(assigns(:<%= table_name %>)).wont_be :nil?
   end
 
   it "gets new" do
     get :new
-    assert_response :success
+    value(response).must_be :success?
   end
 
   it "creates <%= singular_table_name %>" do
-    assert_difference('<%= class_name %>.count') do
+    expect {
       post :create, <%= "#{singular_table_name}: { #{attributes_hash} }" %>
-    end
+    }.must_change "<%= class_name %>.count"
 
-    assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
+    must_redirect_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
   end
 
   it "shows <%= singular_table_name %>" do
     get :show, id: <%= singular_table_name %>
-    assert_response :success
+    value(response).must_be :success?
   end
 
   it "gets edit" do
     get :edit, id: <%= singular_table_name %>
-    assert_response :success
+    value(response).must_be :success?
   end
 
   it "updates <%= singular_table_name %>" do
     put :update, id: <%= singular_table_name %>, <%= "#{singular_table_name}: { #{attributes_hash} }" %>
-    assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
+    must_redirect_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
   end
 
   it "destroys <%= singular_table_name %>" do
-    assert_difference('<%= class_name %>.count', -1) do
+    expect {
       delete :destroy, id: <%= singular_table_name %>
-    end
+    }.must_change "<%= class_name %>.count", -1
 
-    assert_redirected_to <%= index_helper %>_path
+    must_redirect_to <%= index_helper %>_path
   end
-
 end
 <% end -%>

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

@@ -2,7 +2,6 @@ require "test_helper"
 
 <% module_namespacing do -%>
 class <%= controller_class_name %>ControllerTest < ActionController::TestCase
-
   def <%= singular_table_name %>
     @<%= singular_table_name %> ||= <%= table_name %> :one
   end
@@ -19,7 +18,7 @@ class <%= controller_class_name %>ControllerTest < ActionController::TestCase
   end
 
   def test_create
-    assert_difference('<%= class_name %>.count') do
+    assert_difference("<%= class_name %>.count") do
       post :create, <%= "#{singular_table_name}: { #{attributes_hash} }" %>
     end
 
@@ -42,7 +41,7 @@ class <%= controller_class_name %>ControllerTest < ActionController::TestCase
   end
 
   def test_destroy
-    assert_difference('<%= class_name %>.count', -1) do
+    assert_difference("<%= class_name %>.count", -1) do
       delete :destroy, id: <%= singular_table_name %>
     end
 

data/lib/minitest/rails.rb

@@ -75,6 +75,19 @@ class ActionView::TestCase
   end
 end
 
+if defined? ActiveJob
+  class ActiveJob::TestCase
+    # Use AJ::TestCase for the base when describing a job
+    register_spec_type(self) do |desc|
+      desc < ActiveJob::Base if desc.is_a?(Class)
+    end
+    register_spec_type(/Job( ?Test)?\z/i, self)
+    register_spec_type(self) do |desc, *addl|
+      addl.include? :job
+    end
+  end
+end
+
 if defined? ActionMailer
   require "action_mailer/test_helper"
   require "action_mailer/test_case"
@@ -84,9 +97,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|
-    addl.include? :mailer
-  end
+    register_spec_type(self) do |desc, *addl|
+      addl.include? :mailer
+    end
 
     # Resolve the mailer from the test name when using the spec DSL
     def self.determine_default_mailer(name)

data/lib/minitest/rails/assertions.rb

@@ -528,6 +528,74 @@ class ActionController::TestCase
   # :method: refute_tag
   # :call-seq: refute_tag(*opts)
   alias :refute_tag :assert_no_tag
+
+  ##
+  # Simulate a GET request with the given parameters.
+  #
+  # - +action+: The controller action to call.
+  # - +params+: The hash with HTTP parameters that you want to pass. This may be
+  # +nil+.
+  # - +body+: The request body with a string that is appropriately encoded
+  #   (<tt>application/x-www-form-urlencoded</tt> or
+  #   <tt>multipart/form-data</tt>).
+  # - +session+: A hash of parameters to store in the session. This may be
+  # +nil+.
+  # - +flash+: A hash of parameters to store in the flash. This may be +nil+.
+  #
+  # You can also simulate POST, PATCH, PUT, DELETE, and HEAD requests with
+  # +post+, +patch+, +put+, +delete+, and +head+.
+  # Example sending parameters, session and setting a flash message:
+  #
+  #    get :show,
+  #      params: { id: 7 },
+  #      session: { user_id: 1 },
+  #      flash: { notice: 'This is a flash message' }
+  #
+  # Note that the request method is not verified. The different methods are
+  # available to make the tests more expressive.
+  #
+  # :method: get
+  # :call-seq: get(action, *args)
+
+  ##
+  # Simulate a POST request with the given parameters and set/volley the
+  # response.
+  # See +get+ for more details.
+  #
+  # :method: post
+  # :call-seq: post(action, *args)
+
+  ##
+  # Simulate a PATCH request with the given parameters and set/volley the
+  # response.
+  # See +get+ for more details.
+  #
+  # :method: patch
+  # :call-seq: patch(action, *args)
+
+  ##
+  # Simulate a PUT request with the given parameters and set/volley the
+  # response.
+  # See +get+ for more details.
+  #
+  # :method: put
+  # :call-seq: put(action, *args)
+
+  ##
+  # Simulate a DELETE request with the given parameters and set/volley the
+  # response.
+  # See +get+ for more details.
+  #
+  # :method: delete
+  # :call-seq: delete(action, *args)
+
+  ##
+  # Simulate a HEAD request with the given parameters and set/volley the
+  # response.
+  # See +get+ for more details.
+  #
+  # :method: head
+  # :call-seq: head(action, *args)
 end
 
 class ActionView::TestCase
@@ -1592,4 +1660,158 @@ class ActionController::TestCase
   # :method: refute_tag
   # :call-seq: refute_tag(*opts)
   alias :refute_tag :assert_no_tag
-end
+end
+
+if defined? ActiveJob
+  class ActiveJob::TestCase
+    # Asserts that the number of enqueued jobs matches the given number.
+    #
+    #   def test_jobs
+    #     assert_enqueued_jobs 0
+    #     HelloJob.perform_later('david')
+    #     assert_enqueued_jobs 1
+    #     HelloJob.perform_later('abdelkader')
+    #     assert_enqueued_jobs 2
+    #   end
+    #
+    # If a block is passed, that block should cause the specified number of
+    # jobs to be enqueued.
+    #
+    #   def test_jobs_again
+    #     assert_enqueued_jobs 1 do
+    #       HelloJob.perform_later('cristian')
+    #     end
+    #
+    #     assert_enqueued_jobs 2 do
+    #       HelloJob.perform_later('aaron')
+    #       HelloJob.perform_later('rafael')
+    #     end
+    #   end
+    #
+    # See also Minitest::Rails::Expectations#must_enqueue_jobs
+    #
+    # :method: assert_enqueued_jobs
+    # :call-seq: assert_enqueued_jobs(number)
+
+    ##
+    # Asserts that no jobs have been enqueued.
+    #
+    #   def test_jobs
+    #     assert_no_enqueued_jobs
+    #     HelloJob.perform_later('jeremy')
+    #     assert_enqueued_jobs 1
+    #   end
+    #
+    # If a block is passed, that block should not cause any job to be enqueued.
+    #
+    #   def test_jobs_again
+    #     assert_no_enqueued_jobs do
+    #       # No job should be enqueued from this block
+    #     end
+    #   end
+    #
+    # Note: This assertion is simply a shortcut for:
+    #
+    #   assert_enqueued_jobs 0, &block
+    #
+    # See also Minitest::Rails::Expectations#wont_enqueue_jobs
+    #
+    # :method: assert_no_enqueued_jobs
+    # :call-seq: assert_no_enqueued_jobs(number)
+
+    ##
+    # Asserts that the number of performed jobs matches the given number.
+    # If no block is passed, <tt>perform_enqueued_jobs</tt>d
+    # must be called around the job call.
+    #
+    #   def test_jobs
+    #     assert_performed_jobs 0
+    #
+    #     perform_enqueued_jobs do
+    #       HelloJob.perform_later('xavier')
+    #     end
+    #     assert_performed_jobs 1
+    #
+    #     perform_enqueued_jobs do
+    #       HelloJob.perform_later('yves')
+    #       assert_performed_jobs 2
+    #     end
+    #   end
+    #
+    # If a block is passed, that block should cause the specified number of
+    # jobs to be performed.
+    #
+    #   def test_jobs_again
+    #     assert_performed_jobs 1 do
+    #       HelloJob.perform_later('robin')
+    #     end
+    #
+    #     assert_performed_jobs 2 do
+    #       HelloJob.perform_later('carlos')
+    #       HelloJob.perform_later('sean')
+    #     end
+    #   end
+    #
+    # See also Minitest::Rails::Expectations#must_perform_jobs
+    #
+    # :method: assert_performed_jobs
+    # :call-seq: assert_performed_jobs(number)
+
+    ##
+    # Asserts that no jobs have been performed.
+    #
+    #   def test_jobs
+    #     assert_no_performed_jobs
+    #
+    #     perform_enqueued_jobs do
+    #       HelloJob.perform_later('matthew')
+    #       assert_performed_jobs 1
+    #     end
+    #   end
+    #
+    # If a block is passed, that block should not cause any job to be performed.
+    #
+    #   def test_jobs_again
+    #     assert_no_performed_jobs do
+    #       # No job should be performed from this block
+    #     end
+    #   end
+    #
+    # Note: This assertion is simply a shortcut for:
+    #
+    #   assert_performed_jobs 0, &block
+    #
+    # See also Minitest::Rails::Expectations#wont_perform_jobs
+    #
+    # :method: assert_no_performed_jobs
+    # :call-seq: assert_no_performed_jobs(number)
+
+    ##
+    # Asserts that the job passed in the block has been enqueued with the given arguments.
+    #
+    #   def test_assert_enqueued_with
+    #     assert_enqueued_with(job: MyJob, args: [1,2,3], queue: 'low') do
+    #       MyJob.perform_later(1,2,3)
+    #     end
+    #   end
+    #
+    # See also Minitest::Rails::Expectations#must_enqueue_with
+    #
+    # :method: assert_enqueued_with
+    # :call-seq: assert_enqueued_with(args)
+
+    ##
+    # Asserts that the job passed in the block has been performed with the given arguments.
+    #
+    #   def test_assert_performed_with
+    #     assert_performed_with(job: MyJob, args: [1,2,3], queue: 'high') do
+    #       MyJob.perform_later(1,2,3)
+    #     end
+    #   end
+    #
+    # See also Minitest::Rails::Expectations#must_perform_with
+    #
+    # :method: assert_performed_with
+    # :call-seq: assert_performed_with(args)
+  end
+end