minitest-rails 2.2.1 → 3.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9a0575b74e31e8c8be87b70924d2d21c4a937ff
-  data.tar.gz: f88ee78502a3451ac3fcba1f02ab24fea16cb64f
+  metadata.gz: 2688d8c89f8d51e4741631acb4405cbdce0d4b3f
+  data.tar.gz: 72969593b7e65122627b2e4287aff919d605a1d2
 SHA512:
-  metadata.gz: 98e4864bb5d0d06bd41c1ff147d57f075689d7de04a4ae9b961214523a7eb0d55606dec61b787d870b0469503c1e53b473fc650d54b59a65b0a4469c25cd7b34
-  data.tar.gz: 2bf40731369b63900624e8853d7599db02f6822eda32b28ad820516ab3884026986103f9c0268ba6722fab62da40c1da20a93b6129750a06896b011fd93372a0
+  metadata.gz: 3bf3b58bec282d666d52d12148a529e24006a4ff640546d8ca526d5367850ce6dc5dc90da3daf1e375c99e9b576981be45d50f0e1f550c30ec9645f9c78371b5
+  data.tar.gz: 7f135465d0b16375cfb4bd9085b2669836e90c438c63b3ddd80bd0011ec6515527cdfdfeba03b2a7b60371b5c8c06e14aa95edb35e7e2ff67d945e9175cbdee8

data/.travis.yml

@@ -7,13 +7,15 @@ notifications:
   email:
     - mike@blowmage.com
 rvm:
-  - 2.2
-  - 2.1
-  - 2.0
-  - 1.9.3
+  - 2.3.1
+  - 2.3.0
+  - 2.2.4
+  - 2.2.3
+  - 2.2.2
+  - head
 env:
-  - "RAILS_VERSION=4.1"
-  - "RAILS_VERSION=4.2"
+  - "RAILS_VERSION=5.0"
+  - "RAILS_VERSION=head"
 notifications:
   webhooks:
     urls:

data/CHANGELOG.rdoc

@@ -1,9 +1,3 @@
-=== 2.2.1 / 2016-05-07
-
-* Fix missing docs and aliases methods on ActionView::TestCase and
-  ActionDispatch::IntegrationTest
-* Fix link to fixtures documentation (trosborn)
-
 === 2.2.0 / 2015-05-29
 
 * Update to Minitest 5.7

data/Gemfile

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

data/Manifest.txt

@@ -7,8 +7,8 @@ LICENSE
 Manifest.txt
 README.rdoc
 Rakefile
-gemfiles/4.1.gemfile
-gemfiles/4.2.gemfile
+gemfiles/5.0.gemfile
+gemfiles/head.gemfile
 lib/generators/.document
 lib/generators/minitest.rb
 lib/generators/minitest/controller/controller_generator.rb
@@ -18,8 +18,6 @@ lib/generators/minitest/generator/generator_generator.rb
 lib/generators/minitest/generator/templates/generator_spec.rb
 lib/generators/minitest/generator/templates/generator_test.rb
 lib/generators/minitest/helper/helper_generator.rb
-lib/generators/minitest/helper/templates/helper_spec.rb
-lib/generators/minitest/helper/templates/helper_test.rb
 lib/generators/minitest/install/install_generator.rb
 lib/generators/minitest/install/templates/test_helper.rb
 lib/generators/minitest/integration/integration_generator.rb
@@ -36,10 +34,9 @@ lib/generators/minitest/model/model_generator.rb
 lib/generators/minitest/model/templates/fixtures.yml
 lib/generators/minitest/model/templates/model_spec.rb
 lib/generators/minitest/model/templates/model_test.rb
-lib/generators/minitest/route/route_generator.rb
-lib/generators/minitest/route/templates/route_spec.rb
-lib/generators/minitest/route/templates/route_test.rb
 lib/generators/minitest/scaffold/scaffold_generator.rb
+lib/generators/minitest/scaffold/templates/api_controller_spec.rb
+lib/generators/minitest/scaffold/templates/api_controller_test.rb
 lib/generators/minitest/scaffold/templates/controller_spec.rb
 lib/generators/minitest/scaffold/templates/controller_test.rb
 lib/minitest-rails.rb
@@ -58,13 +55,10 @@ 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
 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_assertions.rb
+test/rails/action_dispatch/test_expectations.rb
 test/rails/action_dispatch/test_spec_type.rb
 test/rails/action_mailer/test_mailers.rb
 test/rails/action_mailer/test_spec_type.rb
@@ -77,6 +71,5 @@ 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/Rakefile

@@ -19,9 +19,10 @@ Hoe.spec "minitest-rails" do
 
   license "MIT"
 
-  dependency "minitest", "~> 5.7"
-  dependency "railties", "~> 4.1"
-  dependency "fakefs",   "= 0.4.3", :dev
+  dependency "minitest",       "~> 5.8"
+  dependency "railties",       "~> 5.0.0.rc1"
+  dependency "fakefs",         "= 0.4.3", :dev
+  dependency "minitest-focus", "~> 1.1", :dev
 end
 
 Dir["tasks/**/*.rake"].each { |t| load t }

data/gemfiles/5.0.gemfile

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

data/gemfiles/head.gemfile

@@ -0,0 +1,5 @@
+source "http://rubygems.org" do
+  gem "rails", github: "rails/rails"
+  gem "sqlite3"
+  gem "rake"
+end

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

@@ -2,18 +2,22 @@ require "test_helper"
 
 <% module_namespacing do -%>
 describe <%= class_name %>Controller do
+<% if mountable_engine? -%>
+  include Engine.routes.url_helpers
+
+<% end -%>
 <% 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
-    get :<%= action %>
+    get <%= url_helper_prefix %>_<%= action %>_url
     value(response).must_be :success?
   end
 
 <% end -%>
 <% end -%>
 end
-<% end -%>
+<% end -%>

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

@@ -1,15 +1,19 @@
 require "test_helper"
 
 <% module_namespacing do -%>
-class <%= class_name %>ControllerTest < ActionController::TestCase
+class <%= class_name %>ControllerTest < ActionDispatch::IntegrationTest
+<% if mountable_engine? -%>
+  include Engine.routes.url_helpers
+
+<% end -%>
 <% if actions.empty? -%>
-  def test_sanity
-    flunk "Need real tests"
-  end
+  # def test_sanity
+  #   flunk "Need real tests"
+  # end
 <% else -%>
 <% actions.each do |action| -%>
   def test_<%= action %>
-    get :<%= action %>
+    get <%= url_helper_prefix %>_<%= action %>_url
     assert_response :success
   end
 

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

@@ -14,8 +14,7 @@ module Minitest
         else
           template_file = "generator_test.rb"
         end
-        template template_file,
-                 File.join("test/lib/generators", class_path, "#{file_name}_generator_test.rb")
+        template template_file, File.join("test/lib/generators", class_path, "#{file_name}_generator_test.rb")
       end
 
       protected
@@ -29,4 +28,4 @@ module Minitest
       end
     end
   end
-end
+end

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

@@ -11,4 +11,4 @@ describe <%= class_name %>Generator do
   #   run_generator ["arguments"]
   # end
 end
-<% end -%>
+<% end -%>

data/lib/generators/minitest/generator/templates/generator_test.rb

@@ -12,4 +12,4 @@ class <%= class_name %>GeneratorTest < Rails::Generators::TestCase
   #   run_generator ["arguments"]
   # end
 end
-<% end -%>
+<% end -%>

data/lib/generators/minitest/helper/helper_generator.rb

@@ -3,17 +3,7 @@ require "generators/minitest"
 module Minitest
   module Generators
     class HelperGenerator < Base
-      check_class_collision suffix: "HelperTest"
-
-      def create_helper_files
-        if options[:spec]
-          template_file = "helper_spec.rb"
-        else
-          template_file = "helper_test.rb"
-        end
-        template template_file,
-                 File.join("test/helpers", class_path, "#{file_name}_helper_test.rb")
-      end
+      # Rails does not generate anything here.
     end
   end
 end

data/lib/generators/minitest/integration/integration_generator.rb

@@ -11,8 +11,7 @@ module Minitest
         else
           template_file = "integration_test.rb"
         end
-        template template_file,
-                 File.join("test/integration", class_path, "#{file_name}_test.rb")
+        template template_file, File.join("test/integration", class_path, "#{file_name}_test.rb")
       end
     end
   end

data/lib/generators/minitest/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/minitest/integration/templates/integration_test.rb

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

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

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

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

@@ -2,8 +2,8 @@ require "test_helper"
 
 <% module_namespacing do -%>
 describe <%= class_name %>Job 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
 <% end -%>

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

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

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

@@ -6,7 +6,7 @@ module Minitest
       argument :actions, type: :array, default: [], banner: "method method"
 
       def check_class_collision
-        class_collisions "#{class_name}Test", "#{class_name}Preview"
+        class_collisions "#{class_name}MailerTest", "#{class_name}MailerPreview"
       end
 
       def create_test_files
@@ -15,12 +15,17 @@ module Minitest
         else
           template_file = "mailer_test.rb"
         end
-        template template_file,
-                 File.join("test/mailers", class_path, "#{file_name}_test.rb")
+        template template_file, 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}_preview.rb")
+        template "preview.rb", File.join("test/mailers/previews", class_path, "#{file_name}_mailer_preview.rb")
+      end
+
+      protected
+
+      def file_name
+        @_file_name ||= super.gsub(/_mailer/i, "")
       end
     end
   end

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

@@ -1,7 +1,7 @@
 require "test_helper"
 
 <% module_namespacing do -%>
-describe <%= class_name %> do
+describe <%= class_name %>Mailer do
 <% actions.each do |action| -%>
   it "<%= action %>" do
     mail = <%= class_name %>.<%= action %>
@@ -12,9 +12,9 @@ describe <%= class_name %> do
   end
 <% end -%>
 <% if actions.blank? -%>
-  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 -%>
 end
 <% end -%>

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

@@ -1,10 +1,10 @@
 require "test_helper"
 
 <% module_namespacing do -%>
-class <%= class_name %>Test < ActionMailer::TestCase
+class <%= class_name %>MailerTest < ActionMailer::TestCase
 <% actions.each do |action| -%>
   def test_<%= action %>
-    mail = <%= class_name %>.<%= action %>
+    mail = <%= class_name %>Mailer.<%= action %>
     assert_equal <%= action.to_s.humanize.inspect %>, mail.subject
     assert_equal ["to@example.org"], mail.to
     assert_equal ["from@example.com"], mail.from
@@ -13,9 +13,9 @@ class <%= class_name %>Test < ActionMailer::TestCase
 
 <% end -%>
 <% if actions.blank? -%>
-  def test_sanity
-    flunk "Need real tests"
-  end
+  # def test_sanity
+  #   flunk "Need real tests"
+  # end
 <% end -%>
 end
 <% end -%>

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

@@ -1,13 +1,13 @@
 <% module_namespacing do -%>
-# Preview all emails at http://localhost:3000/rails/mailers/<%= file_path %>
-class <%= class_name %>Preview < ActionMailer::Preview
+# Preview all emails at http://localhost:3000/rails/mailers/<%= file_path %>_mailer
+class <%= class_name %>MailerPreview < ActionMailer::Preview
 <% actions.each do |action| -%>
 
-  # Preview this email at http://localhost:3000/rails/mailers/<%= file_path %>/<%= action %>
+  # Preview this email at http://localhost:3000/rails/mailers/<%= file_path %>_mailer/<%= action %>
   def <%= action %>
-    <%= class_name %>.<%= action %>
+    <%= class_name %>Mailer.<%= action %>
   end
 <% end -%>
 
 end
-<% end -%>
+<% end -%>

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

@@ -6,7 +6,7 @@ module Minitest
       RESERVED_YAML_KEYWORDS = %w(y yes n no true false on off null)
 
       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, default: true, desc: "Create fixture file"
 
       check_class_collision suffix: "Test"
 
@@ -16,15 +16,14 @@ module Minitest
         else
           template_file = "model_test.rb"
         end
-        template template_file,
-                 File.join("test/models", class_path, "#{file_name}_test.rb")
+        template template_file, File.join("test/models", class_path, "#{file_name}_test.rb")
       end
 
       hook_for :fixture_replacement
 
       def create_fixture_file
         if options[:fixture] && options[:fixture_replacement].nil?
-          template "fixtures.yml", File.join("test/fixtures", class_path, "#{plural_file_name}.yml")
+          template "fixtures.yml", File.join("test/fixtures", class_path, "#{fixture_file_name}.yml")
         end
       end