minitest-rails 5.1.0 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1104f99ae200b725d2b60309b6ee1868f2bf15075386cc16073f39e24d3aaf3
-  data.tar.gz: c4bda57b55878bcf5fb0a057ca7f7f888b60108eb4ae47d4b1db1098b5ae6d63
+  metadata.gz: 12dd18b8d1565450f168529368e96087db538ed383b72d0f246c6c6303587cd5
+  data.tar.gz: b1887d75856ca2908921d78060b0eb08a7b822d4c848ee9b86b07b82e34d08f2
 SHA512:
-  metadata.gz: f8ba06eab31eeabe204b9fb51e87594d33dd10964f95952510b04dee8089c38b883cd19979d2d6604e296a19a4d9afbec3aee2da33332ead155416465a628288
-  data.tar.gz: 2d0c87af3c79e3774c1467b9811660ed0c6eef5101f2805d0b93fc90486fce1a2bb8610496db696e0b78dff7a4cb512a684817c7173c6575908603809349b3e9
+  metadata.gz: cb9f831b0073ce58154763cf71b9f2f2ea60be3b150395ab13ad3ce1230424b2facd00e4e165c6505f41dae738190846d257feed1838608a374383ed13971ea0
+  data.tar.gz: ae95f363639484e1669464fc46fafd690d76cfb4db18274c72c609f5eaae4b7d63e828ec7a2519bb10be988626b9ea1365410a86e54918e770a7a3b5fec3aea9

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changes
 
-### 5.1.0 / upcoming...
+### 7.1.0 / 2023-10-26
 
-* ...
+Support Rails 7.1.
+
+### 7.0.0 / 2022-04-25
+
+Support Rails 7.0.
+
+### 6.1.0 / 2020-12-14
+
+Support Rails 6.1.

data/README.md

@@ -1,8 +1,8 @@
 # minitest-rails
 
-Minitest integration for Rails 5.1
+Minitest integration for Rails 7.1
 
-[![Build Status](https://secure.travis-ci.org/blowmage/minitest-rails.png)](http://travis-ci.org/blowmage/minitest-rails)
+[![CI](https://github.com/blowmage/minitest-rails/actions/workflows/ci.yml/badge.svg)](https://github.com/blowmage/minitest-rails/actions/workflows/ci.yml)
 [![Code Climate](https://codeclimate.com/github/blowmage/minitest-rails.png)](https://codeclimate.com/github/blowmage/minitest-rails)
 
 ## Install
@@ -19,13 +19,54 @@ Create a new rails app:
 
 `rails new MyApp`
 
-### Update Gemfile
+### Choosing a version
 
-This version is for Rails 5.1 applications. Update your application to use the
-gem by adding the following to your Gemfile:
+This gem follows the versioning of Rails.
+If you are running Rails 7.1, specify the corresponding 7.1 release in the Gemfile.
+For example:
 
 ```ruby
-gem "minitest-rails", "~> 5.1.0"
+gem "minitest-rails", "~> 7.1.0"
+```
+
+If you are running Rails 7.0, specify the corresponding 7.0 release in the Gemfile.
+For example, if you are using Rails 6.1 you will specify:
+
+```ruby
+gem "minitest-rails", "~> 7.0.0"
+```
+
+If you are running Rails 6.x, specify the corresponding 6.x release in the Gemfile.
+For example, if you are using Rails 6.1 you will specify:
+
+```ruby
+gem "minitest-rails", "~> 6.1.0"
+```
+
+If you are running Rails 5.x, specify the corresponding 5.x release in the Gemfile.
+For example, if you are using Rails 5.2 you will specify:
+
+```ruby
+gem "minitest-rails", "~> 5.2.0"
+```
+
+Or, if you prefer to run the previous release for Rails 5.x, specify the 3.x release in the Gemfile:
+
+```ruby
+gem "minitest-rails", "~> 3.0"
+```
+
+If you are running Rails 4.1 or 4.2, specify the 2.x release in the Gemfile:
+
+```ruby
+gem "minitest-rails", "~> 2.0"
+```
+
+If you are running Rails 4.0 or earlier, you really need to upgrade.
+But if you are you need to specify the 1.x release in the Gemfile:
+
+```ruby
+gem "minitest-rails", "~> 1.0"
 ```
 
 ### Installing

data/lib/generators/minitest/controller/controller_generator.rb

@@ -6,6 +6,8 @@ module Minitest # :nodoc:
   module Generators # :nodoc:
     class ControllerGenerator < Base # :nodoc:
       argument :actions, type: :array, default: [], banner: "action action"
+      class_option :skip_routes, type: :boolean
+
       check_class_collision suffix: "ControllerTest"
 
       def create_test_files

data/lib/generators/minitest/controller/templates/functional_spec.rb.tt

@@ -12,11 +12,11 @@ describe <%= class_name %>Controller do
   # end
 <% else -%>
 <% actions.each do |action| -%>
-  it "must get <%= action %>" do
+  it "gets <%= action %>" do
     get <%= url_helper_prefix %>_<%= action %>_url
     must_respond_with :success
   end
-
+<%= "\n" unless action == actions.last -%>
 <% end -%>
 <% end -%>
 end

data/lib/generators/minitest/controller/templates/functional_test.rb.tt

@@ -16,7 +16,7 @@ class <%= class_name %>ControllerTest < ActionDispatch::IntegrationTest
     get <%= url_helper_prefix %>_<%= action %>_url
     assert_response :success
   end
-
+<%= "\n" unless action == actions.last -%>
 <% end -%>
 <% end -%>
 end

data/lib/generators/minitest/generator/generator_generator.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require "generators/minitest"
 
-module Minitest
-  module Generators
+module Minitest # :nodoc:
+  module Generators # :nodoc:
     class GeneratorGenerator < Base # :nodoc:
       check_class_collision suffix: "GeneratorTest"
 

data/lib/generators/minitest/generator/templates/generator_spec.rb.tt

@@ -2,8 +2,8 @@ require "test_helper"
 require "<%= generator_path %>"
 
 <% module_namespacing do -%>
-describe <%= class_name %>Generator do
-  #tests <%= class_name %>Generator
+describe <%= class_name %>Generator, :generator do
+  tests <%= class_name %>Generator
   destination Rails.root.join("tmp/generators")
   setup :prepare_destination
 

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

@@ -26,6 +26,7 @@ module Minitest
         empty_directory_with_keep_file "test/helpers"
         empty_directory_with_keep_file "test/integration"
 
+        template "test/channels/application_cable/connection_test.rb"
         template "test/application_system_test_case.rb"
         template "test/test_helper.rb"
       end

data/lib/generators/minitest/install/templates/test/channels/application_cable/connection_test.rb.tt

@@ -0,0 +1,25 @@
+require "test_helper"
+
+<%- if options[:spec] -%>
+describe "ApplicationCable Connection", :connection do
+  # it "connects with cookies" do
+  #   cookies.signed[:user_id] = 42
+  #
+  #   connect
+  #
+  #   connection.user_id.must_equal "42"
+  # end
+end
+<%- else -%>
+module ApplicationCable
+  class ConnectionTest < ActionCable::Connection::TestCase
+    # test "connects with cookies" do
+    #   cookies.signed[:user_id] = 42
+    #
+    #   connect
+    #
+    #   assert_equal connection.user_id, "42"
+    # end
+  end
+end
+<%- end -%>

data/lib/generators/minitest/install/templates/test/test_helper.rb.tt

@@ -1,16 +1,24 @@
 ENV["RAILS_ENV"] ||= "test"
+# Consider setting MT_NO_EXPECTATIONS to not add expectations to Object.
+# ENV["MT_NO_EXPECTATIONS"] = "true"
 require_relative "../config/environment"
 require "rails/test_help"
 require "minitest/rails"
 
-# Consider setting MT_NO_EXPECTATIONS to not add expectations to Object.
-# ENV["MT_NO_EXPECTATIONS"] = true
+module ActiveSupport
+  class TestCase
+    # Run tests in parallel with specified workers
+<% if Process.respond_to?(:fork) && !Gem.win_platform? -%>
+    parallelize(workers: :number_of_processors)
+<%- else -%>
+    parallelize(workers: :number_of_processors, with: :threads)
+<% end -%>
 
-class ActiveSupport::TestCase
 <% unless options[:skip_active_record] -%>
-  # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
-  fixtures :all
+    # 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...
+    # Add more helper methods to be used by all tests here...
+  end
 end

data/lib/generators/minitest/integration/templates/integration_spec.rb.tt

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 <% module_namespacing do -%>
 describe "<%= human_name %>", :integration do

data/lib/generators/minitest/integration/templates/integration_test.rb.tt

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 <% module_namespacing do -%>
 class <%= class_name %>Test < ActionDispatch::IntegrationTest

data/lib/generators/minitest/job/templates/unit_spec.rb.tt

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 <% module_namespacing do -%>
 describe <%= class_name %>Job do

data/lib/generators/minitest/job/templates/unit_test.rb.tt

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 <% module_namespacing do -%>
 class <%= class_name %>JobTest < ActiveJob::TestCase

data/lib/generators/minitest/mailer/templates/functional_test.rb.tt

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 <% module_namespacing do -%>
 class <%= class_name %>MailerTest < ActionMailer::TestCase

data/lib/generators/minitest/model/templates/unit_test.rb.tt

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 <% module_namespacing do -%>
 class <%= class_name %>Test < ActiveSupport::TestCase

data/lib/generators/minitest/plugin/templates/%file_name%_test.rb.tt

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 <%- if options[:spec] -%>
 describe <%= class_name %> do

data/lib/generators/minitest/scaffold/scaffold_generator.rb

@@ -11,7 +11,7 @@ module Minitest # :nodoc:
       check_class_collision suffix: "ControllerTest"
 
       class_option :api, type: :boolean,
-                         desc: "Generates API functional tests"
+                         desc: "Generate API functional tests"
 
       class_option :system_tests, type: :string,
                                   desc: "Skip system test files"
@@ -46,10 +46,10 @@ module Minitest # :nodoc:
       def attributes_hash
         return {} if attributes_names.empty?
 
-        attributes_names.map do |name|
+        attributes_names.filter_map do |name|
           if %w[password password_confirmation].include?(name) && attributes.any?(&:password_digest?)
-            [name.to_s, "'secret'"]
-          else
+            [name.to_s, '"secret"']
+          elsif !virtual?(name)
             [name.to_s, "@#{singular_table_name}.#{name}"]
           end
         end.sort.to_h
@@ -59,6 +59,11 @@ module Minitest # :nodoc:
         attribute = attributes.find { |attr| attr.name == name }
         attribute&.type == :boolean
       end
+
+      def virtual? name
+        attribute = attributes.find { |attr| attr.name == name }
+        attribute&.virtual?
+      end
     end
   end
 end

data/lib/generators/minitest/scaffold/templates/api_functional_spec.rb.tt

@@ -18,7 +18,7 @@ describe <%= controller_class_name %>Controller do
       post <%= index_helper %>_url, params: { <%= "#{singular_table_name}: { #{attributes_string} }" %> }, as: :json
     end.must_differ "<%= class_name %>.count"
 
-    must_respond_with 201
+    must_respond_with :created
   end
 
   it "should show <%= singular_table_name %>" do
@@ -28,7 +28,7 @@ describe <%= controller_class_name %>Controller do
 
   it "should update <%= singular_table_name %>" do
     patch <%= show_helper %>, params: { <%= "#{singular_table_name}: { #{attributes_string} }" %> }, as: :json
-    must_respond_with 200
+    must_respond_with :success
   end
 
   it "should destroy <%= singular_table_name %>" do
@@ -36,7 +36,7 @@ describe <%= controller_class_name %>Controller do
       delete <%= show_helper %>, as: :json
     end.must_differ "<%= class_name %>.count", -1
 
-    must_respond_with 204
+    must_respond_with :no_content
   end
 end
 <% end -%>

data/lib/generators/minitest/scaffold/templates/api_functional_test.rb.tt

@@ -20,7 +20,7 @@ class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTe
       post <%= index_helper %>_url, params: { <%= "#{singular_table_name}: { #{attributes_string} }" %> }, as: :json
     end
 
-    assert_response 201
+    assert_response :created
   end
 
   def test_show_<%= singular_table_name %>
@@ -30,7 +30,7 @@ class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTe
 
   def test_update_<%= singular_table_name %>
     patch <%= show_helper %>, params: { <%= "#{singular_table_name}: { #{attributes_string} }" %> }, as: :json
-    assert_response 200
+    assert_response :success
   end
 
   def test_destroy_<%= singular_table_name %>
@@ -38,7 +38,7 @@ class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTe
       delete <%= show_helper %>, as: :json
     end
 
-    assert_response 204
+    assert_response :no_content
   end
 end
 <% end -%>

data/lib/generators/minitest/scaffold/templates/functional_spec.rb.tt

@@ -9,7 +9,7 @@ describe <%= controller_class_name %>Controller do
   let(:<%= singular_table_name %>) { <%= fixture_name %>(:one) }
 
   it "should get index" do
-    get <%= index_helper %>_url
+    get <%= index_helper(type: :url) %>
     must_respond_with :success
   end
 
@@ -20,10 +20,10 @@ describe <%= controller_class_name %>Controller do
 
   it "should create <%= singular_table_name %>" do
     assert_difference("<%= class_name %>.count") do
-      post <%= index_helper %>_url, params: { <%= "#{singular_table_name}: { #{attributes_string} }" %> }
+      post <%= index_helper(type: :url) %>, params: { <%= "#{singular_table_name}: { #{attributes_string} }" %> }
     end
 
-    must_redirect_to <%= singular_table_name %>_url(<%= class_name %>.last)
+    must_redirect_to <%= show_helper("#{class_name}.last") %>
   end
 
   it "should show <%= singular_table_name %>" do
@@ -38,7 +38,7 @@ describe <%= controller_class_name %>Controller do
 
   it "should update <%= singular_table_name %>" do
     patch <%= show_helper %>, params: { <%= "#{singular_table_name}: { #{attributes_string} }" %> }
-    must_redirect_to <%= singular_table_name %>_url(<%= "#{singular_table_name}" %>)
+    must_redirect_to <%= show_helper %>
   end
 
   it "should destroy <%= singular_table_name %>" do
@@ -46,7 +46,7 @@ describe <%= controller_class_name %>Controller do
       delete <%= show_helper %>
     end
 
-    must_redirect_to <%= index_helper %>_url
+    must_redirect_to <%= index_helper(type: :url) %>
   end
 end
 <% end -%>

data/lib/generators/minitest/scaffold/templates/functional_test.rb.tt

@@ -11,7 +11,7 @@ class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTe
   end
 
   def test_get_index
-    get <%= index_helper %>_url
+    get <%= index_helper(type: :url) %>
     assert_response :success
   end
 
@@ -22,10 +22,10 @@ class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTe
 
   def test_create_<%= singular_table_name %>
     assert_difference("<%= class_name %>.count") do
-      post <%= index_helper %>_url, params: { <%= "#{singular_table_name}: { #{attributes_string} }" %> }
+      post <%= index_helper(type: :url) %>, params: { <%= "#{singular_table_name}: { #{attributes_string} }" %> }
     end
 
-    assert_redirected_to <%= singular_table_name %>_url(<%= class_name %>.last)
+    assert_redirected_to <%= show_helper("#{class_name}.last") %>
   end
 
   def test_show_<%= singular_table_name %>
@@ -40,7 +40,7 @@ class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTe
 
   def test_update_<%= singular_table_name %>
     patch <%= show_helper %>, params: { <%= "#{singular_table_name}: { #{attributes_string} }" %> }
-    assert_redirected_to <%= singular_table_name %>_url(<%= "@#{singular_table_name}" %>)
+    assert_redirected_to <%= show_helper %>
   end
 
   def test_destroy_<%= singular_table_name %>
@@ -48,7 +48,7 @@ class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTe
       delete <%= show_helper %>
     end
 
-    assert_redirected_to <%= index_helper %>_url
+    assert_redirected_to <%= index_helper(type: :url) %>
   end
 end
 <% end -%>

data/lib/generators/minitest/scaffold/templates/system_spec.rb.tt

@@ -4,14 +4,14 @@ require "application_system_test_case"
 describe "<%= class_name.pluralize %>", :system do
   let(:<%= singular_table_name %>) { <%= fixture_name %>(:one) }
 
-  it "visiting the index" do
+  it "visits the index" do
     visit <%= plural_table_name %>_url
-    assert_selector "h1", text: "<%= class_name.pluralize.titleize %>"
+    assert_selector "h1", text: "<%= human_name.pluralize %>"
   end
 
-  it "creating a <%= human_name %>" do
+  it "creates a <%= human_name %>" do
     visit <%= plural_table_name %>_url
-    click_on "New <%= class_name.titleize %>"
+    click_on "New <%= human_name.downcase %>"
 
     <%- attributes_hash.each do |attr, value| -%>
     <%- if boolean?(attr) -%>
@@ -26,9 +26,9 @@ describe "<%= class_name.pluralize %>", :system do
     click_on "Back"
   end
 
-  it "updating a <%= human_name %>" do
-    visit <%= plural_table_name %>_url
-    click_on "Edit", match: :first
+  it "updates a <%= human_name %>" do
+    visit <%= singular_table_name %>_url(@<%= singular_table_name %>)
+    click_on "Edit this <%= human_name.downcase %>", match: :first
 
     <%- attributes_hash.each do |attr, value| -%>
     <%- if boolean?(attr) -%>
@@ -43,11 +43,9 @@ describe "<%= class_name.pluralize %>", :system do
     click_on "Back"
   end
 
-  it "destroying a <%= human_name %>" do
-    visit <%= plural_table_name %>_url
-    page.accept_confirm do
-      click_on "Destroy", match: :first
-    end
+  it "destroys a <%= human_name %>" do
+    visit <%= singular_table_name %>_url(@<%= singular_table_name %>)
+    click_on "Destroy this <%= human_name.downcase %>", match: :first
 
     assert_text "<%= human_name %> was successfully destroyed"
   end

data/lib/generators/minitest/scaffold/templates/system_test.rb.tt

@@ -8,12 +8,12 @@ class <%= class_name.pluralize %>Test < ApplicationSystemTestCase
 
   def test_visiting_index
     visit <%= plural_table_name %>_url
-    assert_selector "h1", text: "<%= class_name.pluralize.titleize %>"
+    assert_selector "h1", text: "<%= human_name.pluralize %>"
   end
 
   def test_creating_<%= human_name %>
     visit <%= plural_table_name %>_url
-    click_on "New <%= class_name.titleize %>"
+    click_on "New <%= human_name.downcase %>"
 
     <%- attributes_hash.each do |attr, value| -%>
     <%- if boolean?(attr) -%>
@@ -29,8 +29,8 @@ class <%= class_name.pluralize %>Test < ApplicationSystemTestCase
   end
 
   def test_updating_<%= human_name %>
-    visit <%= plural_table_name %>_url
-    click_on "Edit", match: :first
+    visit <%= singular_table_name %>_url(@<%= singular_table_name %>)
+    click_on "Edit this <%= human_name.downcase %>", match: :first
 
     <%- attributes_hash.each do |attr, value| -%>
     <%- if boolean?(attr) -%>
@@ -46,10 +46,8 @@ class <%= class_name.pluralize %>Test < ApplicationSystemTestCase
   end
 
   def test_destroying_<%= human_name %>
-    visit <%= plural_table_name %>_url
-    page.accept_confirm do
-      click_on "Destroy", match: :first
-    end
+    visit <%= singular_table_name %>_url(@<%= singular_table_name %>)
+    click_on "Destroy this <%= human_name.downcase %>", match: :first
 
     assert_text "<%= human_name %> was successfully destroyed"
   end

data/lib/generators/minitest/system/templates/system_spec.rb.tt

@@ -1,9 +1,8 @@
 require "application_system_test_case"
 
-class <%= class_name.pluralize %>Test < ApplicationSystemTestCase
-  # test "visiting the index" do
+describe <%= class_name.pluralize %>, :system do
+  # it "visits the index" do
   #   visit <%= plural_table_name %>_url
-  #
-  #   assert_selector "h1", text: "<%= class_name %>"
+  #   assert_selector "h1", text: "<%= human_name.pluralize %>"
   # end
 end

data/lib/generators/minitest/system/templates/system_test.rb.tt

@@ -1,9 +1,8 @@
 require "application_system_test_case"
 
 class <%= class_name.pluralize %>Test < ApplicationSystemTestCase
-  # test "visiting the index" do
+  # def test_visiting_index
   #   visit <%= plural_table_name %>_url
-  #
-  #   assert_selector "h1", text: "<%= class_name %>"
+  #   assert_selector "h1", text: "<%= human_name.pluralize %>"
   # end
 end

data/lib/generators/minitest.rb

@@ -4,7 +4,7 @@ require "rails/generators/named_base"
 
 module Minitest
   module Generators
-    class Base < ::Rails::Generators::NamedBase #:nodoc:
+    class Base < ::Rails::Generators::NamedBase # :nodoc:
       class_option :spec, type: :boolean, default: true,
                           desc: "Use Minitest::Spec DSL"
       class_option :spec_expectation_monad, type: :string, default: "value",