minitest-rails 3.0.0 → 5.0.0

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

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+<% module_namespacing do -%>
+describe <%= class_name %>Job do
+  # it "does a thing" do
+  #   <%= spec_expectation_monad %>(1+1).must_equal 2
+  # end
+end
+<% end -%>

data/lib/generators/minitest/job/templates/{job_test.rb → unit_test.rb.tt}

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

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

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require "generators/minitest"
 
-module Minitest
-  module Generators
-    class MailerGenerator < Base
+module Minitest # :nodoc:
+  module Generators # :nodoc:
+    class MailerGenerator < Base # :nodoc:
       argument :actions, type: :array, default: [], banner: "method method"
 
       def check_class_collision
@@ -10,22 +12,17 @@ module Minitest
       end
 
       def create_test_files
-        if options[:spec]
-          template_file = "mailer_spec.rb"
-        else
-          template_file = "mailer_test.rb"
-        end
-        template template_file, File.join("test/mailers", class_path, "#{file_name}_mailer_test.rb")
+        template "functional_#{test_file_type}.rb", File.join("test/mailers", class_path, "#{file_name}_mailer_test.rb")
       end
 
       def create_preview_files
         template "preview.rb", File.join("test/mailers/previews", class_path, "#{file_name}_mailer_preview.rb")
       end
 
-      protected
+      private
 
       def file_name
-        @_file_name ||= super.gsub(/_mailer/i, "")
+        @_file_name ||= super.sub(/_mailer\z/i, "")
       end
     end
   end

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

@@ -0,0 +1,21 @@
+require "test_helper"
+
+<% module_namespacing do -%>
+describe <%= class_name %>Mailer do
+<% actions.each do |action| -%>
+  it "creates <%= action %> email" do
+    mail = <%= class_name %>Mailer.<%= 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_equal "Hi"
+  end
+
+<% end -%>
+<% if actions.blank? -%>
+  # it "does a thing" do
+  #   <%= spec_expectation_monad %>(1+1).must_equal 2
+  # end
+<% end -%>
+end
+<% end -%>

data/lib/generators/minitest/mailer/templates/{mailer_test.rb → functional_test.rb.tt}

@@ -1,4 +1,4 @@
-require "test_helper"
+require 'test_helper'
 
 <% module_namespacing do -%>
 class <%= class_name %>MailerTest < ActionMailer::TestCase
@@ -13,8 +13,8 @@ class <%= class_name %>MailerTest < ActionMailer::TestCase
 
 <% end -%>
 <% if actions.blank? -%>
-  # def test_sanity
-  #   flunk "Need real tests"
+  # def test_truth
+  #   assert true
   # end
 <% end -%>
 end

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

@@ -1,22 +1,19 @@
+# frozen_string_literal: true
+
 require "generators/minitest"
 
-module Minitest
-  module Generators
-    class ModelGenerator < Base
-      RESERVED_YAML_KEYWORDS = %w(y yes n no true false on off null)
+module Minitest # :nodoc:
+  module Generators # :nodoc:
+    class ModelGenerator < Base # :nodoc:
+      RESERVED_YAML_KEYWORDS = %w[y yes n no true false on off null].freeze
 
       argument :attributes, type: :array, default: [], banner: "field:type field:type"
-      class_option :fixture, type: :boolean, default: true, desc: "Create fixture file"
+      class_option :fixture, type: :boolean
 
       check_class_collision suffix: "Test"
 
       def create_test_file
-        if options[:spec]
-          template_file = "model_spec.rb"
-        else
-          template_file = "model_test.rb"
-        end
-        template template_file, File.join("test/models", class_path, "#{file_name}_test.rb")
+        template "unit_#{test_file_type}.rb", File.join("test/models", class_path, "#{file_name}_test.rb")
       end
 
       hook_for :fixture_replacement
@@ -29,7 +26,7 @@ module Minitest
 
       private
 
-      def yaml_key_value(key, value)
+      def yaml_key_value key, value
         if RESERVED_YAML_KEYWORDS.include?(key.downcase)
           "'#{key}': #{value}"
         else

data/lib/generators/minitest/model/templates/{fixtures.yml → fixtures.yml.tt}

@@ -4,9 +4,9 @@
 <%= name %>:
 <% attributes.each do |attribute| -%>
   <%- if attribute.password_digest? -%>
-  password_digest: <%%= BCrypt::Password.create("secret") %>
+  password_digest: <%%= BCrypt::Password.create('secret') %>
   <%- elsif attribute.reference? -%>
-  <%= yaml_key_value(attribute.column_name.sub(/_id$/, ""), attribute.default || name) %>
+  <%= yaml_key_value(attribute.column_name.sub(/_id$/, ''), attribute.default || name) %>
   <%- else -%>
   <%= yaml_key_value(attribute.column_name, attribute.default) %>
   <%- end -%>
@@ -18,7 +18,7 @@
 <% else -%>
 
 # This model initially had no columns defined. If you add columns to the
-# model remove the "{}" from the fixture names and add the columns immediately
+# model remove the '{}' from the fixture names and add the columns immediately
 # below each fixture, per the syntax in the comments below
 #
 one: {}

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

@@ -0,0 +1,9 @@
+require "test_helper"
+
+<% module_namespacing do -%>
+describe <%= class_name %> do
+  # it "does a thing" do
+  #   <%= spec_expectation_monad %>(1+1).must_equal 2
+  # end
+end
+<% end -%>

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

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+<% module_namespacing do -%>
+class <%= class_name %>Test < ActiveSupport::TestCase
+  # def test_truth
+  #   assert true
+  # end
+end
+<% end -%>

data/lib/generators/minitest/plugin/plugin_generator.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "generators/minitest"
+
+module Minitest # :nodoc:
+  module Generators # :nodoc:
+    class PluginGenerator < Base # :nodoc:
+      check_class_collision suffix: "Test"
+
+      def create_test_files
+        directory ".", "test"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+require 'test_helper'
+
+<%- if options[:spec] -%>
+describe <%= class_name %> do
+  # it "does a thing" do
+  #   <%= spec_expectation_monad %>(1+1).must_equal 2
+  # end
+end
+<%- else -%>
+class <%= class_name %>Test < ActiveSupport::TestCase
+  # def test_truth
+  #   assert true
+  # end
+end
+<%- end -%>

data/lib/generators/minitest/plugin/templates/test_helper.rb

@@ -0,0 +1,2 @@
+require "active_support/testing/autorun"
+require "active_support"

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require "generators/minitest"
 require "rails/generators/resource_helpers"
 
-module Minitest
-  module Generators
-    class ScaffoldGenerator < Base
+module Minitest # :nodoc:
+  module Generators # :nodoc:
+    class ScaffoldGenerator < Base # :nodoc:
       include ::Rails::Generators::ResourceHelpers
 
       check_class_collision suffix: "ControllerTest"
@@ -14,19 +16,7 @@ module Minitest
       argument :attributes, type: :array, default: [], banner: "field:type field:type"
 
       def create_test_files
-        if options.api?
-          if options[:spec]
-            template_file = "api_controller_spec.rb"
-          else
-            template_file = "api_controller_test.rb"
-          end
-        else
-          if options[:spec]
-            template_file = "controller_spec.rb"
-          else
-            template_file = "controller_test.rb"
-          end
-        end
+        template_file = options.api? ? "api_functional_#{test_file_type}.rb" : "functional_#{test_file_type}.rb"
         template template_file,
                  File.join("test/controllers", controller_class_path, "#{controller_file_name}_controller_test.rb")
       end
@@ -34,7 +24,7 @@ module Minitest
       def fixture_name
         @fixture_name ||=
           if mountable_engine?
-            "%s_%s" % [namespaced_path, table_name]
+            (namespace_dirs + [table_name]).join("_")
           else
             table_name
           end
@@ -42,17 +32,25 @@ module Minitest
 
       private
 
+      def attributes_string
+        attributes_hash.map { |k, v| "#{k}: #{v}" }.join(", ")
+      end
+
       def attributes_hash
-        return if attributes_names.empty?
+        return {} if attributes_names.empty?
 
         attributes_names.map do |name|
-          if %w(password password_confirmation).include?(name) && attributes.any?(&:password_digest?)
-            "#{name}: 'secret'"
+          if %w[password password_confirmation].include?(name) && attributes.any?(&:password_digest?)
+            [name.to_s, "'secret'"]
           else
-            # don't use the ivar, use the accessor method
-            "#{name}: #{singular_table_name}.#{name}"
+            [name.to_s, "@#{singular_table_name}.#{name}"]
           end
-        end.sort.join(", ")
+        end.sort.to_h
+      end
+
+      def boolean? name
+        attribute = attributes.find { |attr| attr.name == name }
+        attribute&.type == :boolean
       end
     end
   end

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

@@ -0,0 +1,42 @@
+require "test_helper"
+
+<% module_namespacing do -%>
+describe <%= controller_class_name %>Controller do
+  <%- if mountable_engine? -%>
+  include Engine.routes.url_helpers
+
+  <%- end -%>
+  let(:<%= singular_table_name %>) { <%= fixture_name %>(:one) }
+
+  it "should get index" do
+    get <%= index_helper %>_url, as: :json
+    must_respond_with :success
+  end
+
+  it "should create <%= singular_table_name %>" do
+    <%= spec_expectation_monad %> do
+      post <%= index_helper %>_url, params: { <%= "#{singular_table_name}: { #{attributes_string} }" %> }, as: :json
+    end.must_differ "<%= class_name %>.count"
+
+    must_respond_with 201
+  end
+
+  it "should show <%= singular_table_name %>" do
+    get <%= show_helper %>, as: :json
+    must_respond_with :success
+  end
+
+  it "should update <%= singular_table_name %>" do
+    patch <%= show_helper %>, params: { <%= "#{singular_table_name}: { #{attributes_string} }" %> }, as: :json
+    must_respond_with 200
+  end
+
+  it "should destroy <%= singular_table_name %>" do
+    <%= spec_expectation_monad %> do
+      delete <%= show_helper %>, as: :json
+    end.must_differ "<%= class_name %>.count", -1
+
+    must_respond_with 204
+  end
+end
+<% end -%>

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

@@ -0,0 +1,44 @@
+require "test_helper"
+
+<% module_namespacing do -%>
+class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTest
+  <%- if mountable_engine? -%>
+  include Engine.routes.url_helpers
+
+  <%- end -%>
+  setup do
+    @<%= singular_table_name %> = <%= fixture_name %>(:one)
+  end
+
+  def test_get_index
+    get <%= index_helper %>_url, as: :json
+    assert_response :success
+  end
+
+  def test_create_<%= singular_table_name %>
+    assert_difference("<%= class_name %>.count") do
+      post <%= index_helper %>_url, params: { <%= "#{singular_table_name}: { #{attributes_string} }" %> }, as: :json
+    end
+
+    assert_response 201
+  end
+
+  def test_show_<%= singular_table_name %>
+    get <%= show_helper %>, as: :json
+    assert_response :success
+  end
+
+  def test_update_<%= singular_table_name %>
+    patch <%= show_helper %>, params: { <%= "#{singular_table_name}: { #{attributes_string} }" %> }, as: :json
+    assert_response 200
+  end
+
+  def test_destroy_<%= singular_table_name %>
+    assert_difference("<%= class_name %>.count", -1) do
+      delete <%= show_helper %>, as: :json
+    end
+
+    assert_response 204
+  end
+end
+<% end -%>

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

@@ -0,0 +1,52 @@
+require "test_helper"
+
+<% module_namespacing do -%>
+describe <%= controller_class_name %>Controller do
+  <%- if mountable_engine? -%>
+  include Engine.routes.url_helpers
+
+  <%- end -%>
+  let(:<%= singular_table_name %>) { <%= fixture_name %>(:one) }
+
+  it "should get index" do
+    get <%= index_helper %>_url
+    must_respond_with :success
+  end
+
+  it "should get new" do
+    get <%= new_helper %>
+    must_respond_with :success
+  end
+
+  it "should create <%= singular_table_name %>" do
+    assert_difference("<%= class_name %>.count") do
+      post <%= index_helper %>_url, params: { <%= "#{singular_table_name}: { #{attributes_string} }" %> }
+    end
+
+    must_redirect_to <%= singular_table_name %>_url(<%= class_name %>.last)
+  end
+
+  it "should show <%= singular_table_name %>" do
+    get <%= show_helper %>
+    must_respond_with :success
+  end
+
+  it "should get edit" do
+    get <%= edit_helper %>
+    must_respond_with :success
+  end
+
+  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}" %>)
+  end
+
+  it "should destroy <%= singular_table_name %>" do
+    assert_difference("<%= class_name %>.count", -1) do
+      delete <%= show_helper %>
+    end
+
+    must_redirect_to <%= index_helper %>_url
+  end
+end
+<% end -%>

data/lib/generators/minitest/scaffold/templates/{controller_test.rb → functional_test.rb.tt}

@@ -6,49 +6,49 @@ class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTe
   include Engine.routes.url_helpers
 
   <%- end -%>
-  def <%= singular_table_name %>
-    @<%= singular_table_name %> ||= <%= fixture_name %> :one
+  setup do
+    @<%= singular_table_name %> = <%= fixture_name %>(:one)
   end
 
-  def test_index
+  def test_get_index
     get <%= index_helper %>_url
     assert_response :success
   end
 
-  def test_new
+  def test_get_new
     get <%= new_helper %>
     assert_response :success
   end
 
-  def test_create
-    assert_difference "<%= class_name %>.count" do
-      post <%= index_helper %>_url, params: { <%= "#{singular_table_name}: { #{attributes_hash} }" %> }
+  def test_create_<%= singular_table_name %>
+    assert_difference("<%= class_name %>.count") do
+      post <%= index_helper %>_url, params: { <%= "#{singular_table_name}: { #{attributes_string} }" %> }
     end
 
-    assert_redirected_to <%= singular_table_name %>_path(<%= class_name %>.last)
+    assert_redirected_to <%= singular_table_name %>_url(<%= class_name %>.last)
   end
 
-  def test_show
+  def test_show_<%= singular_table_name %>
     get <%= show_helper %>
     assert_response :success
   end
 
-  def test_edit
+  def test_get_edit
     get <%= edit_helper %>
     assert_response :success
   end
 
-  def test_update
-    patch <%= show_helper %>, params: { <%= "#{singular_table_name}: { #{attributes_hash} }" %> }
-    assert_redirected_to <%= singular_table_name %>_path(<%= "#{singular_table_name}" %>)
+  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}" %>)
   end
 
-  def test_destroy
-    assert_difference "<%= class_name %>.count", -1  do
+  def test_destroy_<%= singular_table_name %>
+    assert_difference("<%= class_name %>.count", -1) do
       delete <%= show_helper %>
     end
 
-    assert_redirected_to <%= index_helper %>_path
+    assert_redirected_to <%= index_helper %>_url
   end
 end
 <% end -%>