minitest-spec-rails 5.4.0 → 5.5.0

data/lib/minitest-spec-rails/init/action_view.rb

@@ -1,24 +1,20 @@
 module MiniTestSpecRails
   module Init
     module ActionViewBehavior
-
       extend ActiveSupport::Concern
 
       included do
         class_attribute :_helper_class
         register_spec_type(/(Helper|View)( ?Test)?\z/, self)
-        register_spec_type(self) { |desc| Class === desc && desc < self }
+        register_spec_type(self) { |desc| desc.is_a?(Class) && desc < self }
         extend Descriptions
       end
 
       module Descriptions
-
         def described_class
           determine_default_helper_class(name)
         end
-
       end
-
     end
   end
 end

data/lib/minitest-spec-rails/init/active_job.rb

@@ -1,29 +1,24 @@
 module MiniTestSpecRails
   module Init
     module ActiveJobBehavior
-
       extend ActiveSupport::Concern
 
       included do
-        register_spec_type(self) { |desc| Class === desc && desc < ActiveJob::Base }
+        register_spec_type(self) { |desc| desc.is_a?(Class) && desc < ActiveJob::Base }
         register_spec_type(/Job( ?Test)?\z/, self)
-        register_spec_type(self) { |desc| Class === desc && desc < self }
+        register_spec_type(self) { |desc| desc.is_a?(Class) && desc < self }
         extend Descriptions
       end
 
       module Descriptions
-
         def described_class
           determine_constant_from_test_name(name) do |constant|
-            Class === constant && constant < ActiveJob::Base
+            constant.is_a?(Class) && constant < ActiveJob::Base
           end
         end
-
       end
-
     end
   end
 end
 
 ActiveJob::TestCase.send :include, MiniTestSpecRails::Init::ActiveJobBehavior
-

data/lib/minitest-spec-rails/init/active_support.rb

@@ -1,7 +1,6 @@
 module MiniTestSpecRails
   module Init
     module ActiveSupportBehavior
-
       extend ActiveSupport::Concern
 
       included do
@@ -9,24 +8,23 @@ module MiniTestSpecRails
         include MiniTestSpecRails::DSL
         include ActiveSupport::Testing::ConstantLookup
         extend Descriptions
-        register_spec_type(self) { |desc| Class === desc }
+        register_spec_type(self) { |desc| desc.is_a?(Class) }
       end
 
       module Descriptions
-
         def described_class
           determine_constant_from_test_name(name) do |constant|
-            Class === constant
+            constant.is_a?(Class)
           end
         end
-
       end
 
-      def initialize(*args)
-        Thread.current[:current_spec] = self
-        super
-      end if Minitest::VERSION < "5.3.3"
-
+      if Minitest::VERSION < '5.3.3'
+        def initialize(*args)
+          Thread.current[:current_spec] = self
+          super
+        end
+      end
     end
   end
 end

data/lib/minitest-spec-rails/init/mini_shoulda.rb

@@ -1,25 +1,21 @@
 module MiniTestSpecRails
   module Init
     module MiniShouldaBehavior
-
       extend ActiveSupport::Concern
 
       included do
         class << self
-          alias :context  :describe
-          alias :should   :it
+          alias_method :context, :describe
+          alias_method :should, :it
         end
         extend ClassMethods
       end
 
       module ClassMethods
-
         def should_eventually(desc)
           it("should eventually #{desc}") { skip("Should eventually #{desc}") }
         end
-
       end
-
     end
   end
 end

data/lib/minitest-spec-rails/railtie.rb

@@ -1,31 +1,31 @@
 module MiniTestSpecRails
   class Railtie < ::Rails::Railtie
-
     config.minitest_spec_rails = ActiveSupport::OrderedOptions.new
     config.minitest_spec_rails.mini_shoulda = false
 
-    config.before_initialize do |app|
-      require 'active_support'
-      require 'minitest-spec-rails/init/active_support'
-      ActiveSupport.on_load(:action_controller) do
-        require 'minitest-spec-rails/init/action_controller'
-        require 'minitest-spec-rails/init/action_dispatch'
-      end
-      ActiveSupport.on_load(:action_mailer) do
-        require 'minitest-spec-rails/init/action_mailer'
-      end
-      ActiveSupport.on_load(:active_job) do
-        require 'minitest-spec-rails/init/active_job'
+    if ENV['RAILS_ENV'] == 'test'
+      config.before_initialize do |_app|
+        require 'active_support'
+        require 'minitest-spec-rails/init/active_support'
+        ActiveSupport.on_load(:action_controller) do
+          require 'minitest-spec-rails/init/action_controller'
+          require 'minitest-spec-rails/init/action_dispatch'
+        end
+        ActiveSupport.on_load(:action_mailer) do
+          require 'minitest-spec-rails/init/action_mailer'
+        end
+        ActiveSupport.on_load(:active_job) do
+          require 'minitest-spec-rails/init/active_job'
+        end
       end
-    end if ENV['RAILS_ENV'] == 'test'
 
-    initializer 'minitest-spec-rails.action_view', :after => 'action_view.setup_action_pack', :group => :all do |app|
-      require 'minitest-spec-rails/init/action_view'
-    end if ENV['RAILS_ENV'] == 'test'
-
-    initializer 'minitest-spec-rails.mini_shoulda', :group => :all do |app|
-      require 'minitest-spec-rails/init/mini_shoulda' if app.config.minitest_spec_rails.mini_shoulda
-    end if ENV['RAILS_ENV'] == 'test'
+      initializer 'minitest-spec-rails.action_view', after: 'action_view.setup_action_pack', group: :all do |_app|
+        require 'minitest-spec-rails/init/action_view'
+      end
 
+      initializer 'minitest-spec-rails.mini_shoulda', group: :all do |app|
+        require 'minitest-spec-rails/init/mini_shoulda' if app.config.minitest_spec_rails.mini_shoulda
+      end
+    end
   end
 end

data/lib/minitest-spec-rails/version.rb

@@ -1,3 +1,3 @@
 module MiniTestSpecRails
-  VERSION = "5.4.0"
+  VERSION = '5.5.0'.freeze
 end

data/minitest-spec-rails.gemspec

@@ -1,6 +1,5 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "minitest-spec-rails/version"
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+require 'minitest-spec-rails/version'
 
 Gem::Specification.new do |gem|
   gem.name        = 'minitest-spec-rails'
@@ -10,11 +9,12 @@ Gem::Specification.new do |gem|
   gem.email       = ['ken@metaskills.net']
   gem.homepage    = 'http://github.com/metaskills/minitest-spec-rails'
   gem.summary     = 'Make Rails Use MiniTest::Spec!'
-  gem.description = 'The minitest-spec-rails gem makes it easy to use the MiniTest::Spec DSL within your existing Rails 3 or 4 test suite.'
+  gem.description = 'The minitest-spec-rails gem makes it easy to use the \
+                     MiniTest::Spec DSL within your existing Rails test suite.'
   gem.license     = 'MIT'
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   gem.require_paths = ['lib']
   gem.add_runtime_dependency     'minitest', '~> 5.0'
   gem.add_runtime_dependency     'rails', '>= 4.1'

data/test/cases/action_controller_test.rb

@@ -3,20 +3,19 @@ require 'test_helper'
 class ModelsController < ApplicationController;  end
 
 class ActionControllerTest < MiniTestSpecRails::TestCase
-
   it 'matches spec type for class constants' do
     assert_controller MiniTest::Spec.spec_type(ApplicationController)
     assert_controller MiniTest::Spec.spec_type(ModelsController)
   end
 
   it 'matches spec type for strings' do
-    assert_controller MiniTest::Spec.spec_type("WidgetController")
-    assert_controller MiniTest::Spec.spec_type("WidgetControllerTest")
-    assert_controller MiniTest::Spec.spec_type("Widget Controller Test")
+    assert_controller MiniTest::Spec.spec_type('WidgetController')
+    assert_controller MiniTest::Spec.spec_type('WidgetControllerTest')
+    assert_controller MiniTest::Spec.spec_type('Widget Controller Test')
     # And is case sensitive
-    refute_controller MiniTest::Spec.spec_type("widgetcontroller")
-    refute_controller MiniTest::Spec.spec_type("widgetcontrollertest")
-    refute_controller MiniTest::Spec.spec_type("widget controller test")
+    refute_controller MiniTest::Spec.spec_type('widgetcontroller')
+    refute_controller MiniTest::Spec.spec_type('widgetcontrollertest')
+    refute_controller MiniTest::Spec.spec_type('widget controller test')
   end
 
   it 'wont match spec type for non space characters' do
@@ -24,10 +23,9 @@ class ActionControllerTest < MiniTestSpecRails::TestCase
     refute_controller MiniTest::Spec.spec_type("Widget Controller\rTest")
     refute_controller MiniTest::Spec.spec_type("Widget Controller\nTest")
     refute_controller MiniTest::Spec.spec_type("Widget Controller\fTest")
-    refute_controller MiniTest::Spec.spec_type("Widget ControllerXTest")
+    refute_controller MiniTest::Spec.spec_type('Widget ControllerXTest')
   end
 
-
   private
 
   def assert_controller(actual)
@@ -37,5 +35,4 @@ class ActionControllerTest < MiniTestSpecRails::TestCase
   def refute_controller(actual)
     refute_equal ActionController::TestCase, actual
   end
-
 end

data/test/cases/action_dispatch_test.rb

@@ -3,13 +3,12 @@ require 'test_helper'
 class ModelsController < ApplicationController;  end
 
 class ActionControllerTest < MiniTestSpecRails::TestCase
-
   it 'resolves spec type for matching acceptance strings' do
-    assert_dispatch MiniTest::Spec.spec_type("WidgetAcceptanceTest")
-    assert_dispatch MiniTest::Spec.spec_type("Widget Acceptance Test")
+    assert_dispatch MiniTest::Spec.spec_type('WidgetAcceptanceTest')
+    assert_dispatch MiniTest::Spec.spec_type('Widget Acceptance Test')
     # And is case sensitive
-    refute_dispatch MiniTest::Spec.spec_type("widgetacceptancetest")
-    refute_dispatch MiniTest::Spec.spec_type("widget acceptance test")
+    refute_dispatch MiniTest::Spec.spec_type('widgetacceptancetest')
+    refute_dispatch MiniTest::Spec.spec_type('widget acceptance test')
   end
 
   it 'wont match spec type for space characters in acceptance strings' do
@@ -17,15 +16,15 @@ class ActionControllerTest < MiniTestSpecRails::TestCase
     refute_dispatch MiniTest::Spec.spec_type("Widget Acceptance\rTest")
     refute_dispatch MiniTest::Spec.spec_type("Widget Acceptance\nTest")
     refute_dispatch MiniTest::Spec.spec_type("Widget Acceptance\fTest")
-    refute_dispatch MiniTest::Spec.spec_type("Widget AcceptanceXTest")
+    refute_dispatch MiniTest::Spec.spec_type('Widget AcceptanceXTest')
   end
 
   it 'resolves spec type for matching integration strings' do
-    assert_dispatch MiniTest::Spec.spec_type("WidgetIntegrationTest")
-    assert_dispatch MiniTest::Spec.spec_type("Widget Integration Test")
+    assert_dispatch MiniTest::Spec.spec_type('WidgetIntegrationTest')
+    assert_dispatch MiniTest::Spec.spec_type('Widget Integration Test')
     # And is case sensitive
-    refute_dispatch MiniTest::Spec.spec_type("widgetintegrationtest")
-    refute_dispatch MiniTest::Spec.spec_type("widget integration test")
+    refute_dispatch MiniTest::Spec.spec_type('widgetintegrationtest')
+    refute_dispatch MiniTest::Spec.spec_type('widget integration test')
   end
 
   it 'wont match spec type for space characters in integration strings' do
@@ -33,10 +32,9 @@ class ActionControllerTest < MiniTestSpecRails::TestCase
     refute_dispatch MiniTest::Spec.spec_type("Widget Integration\rTest")
     refute_dispatch MiniTest::Spec.spec_type("Widget Integration\nTest")
     refute_dispatch MiniTest::Spec.spec_type("Widget Integration\fTest")
-    refute_dispatch MiniTest::Spec.spec_type("Widget IntegrationXTest")
+    refute_dispatch MiniTest::Spec.spec_type('Widget IntegrationXTest')
   end
 
-
   private
 
   def assert_dispatch(actual)
@@ -46,5 +44,4 @@ class ActionControllerTest < MiniTestSpecRails::TestCase
   def refute_dispatch(actual)
     refute_equal ActionDispatch::IntegrationTest, actual
   end
-
 end

data/test/cases/action_mailer_test.rb

@@ -4,20 +4,19 @@ class NotificationMailer < ActionMailer::Base; end
 class Notifications < ActionMailer::Base; end
 
 class ActionMailerTest < MiniTestSpecRails::TestCase
-
   it 'matches spec type for class constants' do
     assert_mailer MiniTest::Spec.spec_type(NotificationMailer)
     assert_mailer MiniTest::Spec.spec_type(Notifications)
   end
 
   it 'matches spec type for strings' do
-    assert_mailer MiniTest::Spec.spec_type("WidgetMailer")
-    assert_mailer MiniTest::Spec.spec_type("WidgetMailerTest")
-    assert_mailer MiniTest::Spec.spec_type("Widget Mailer Test")
+    assert_mailer MiniTest::Spec.spec_type('WidgetMailer')
+    assert_mailer MiniTest::Spec.spec_type('WidgetMailerTest')
+    assert_mailer MiniTest::Spec.spec_type('Widget Mailer Test')
     # And is case sensitive
-    refute_mailer MiniTest::Spec.spec_type("widgetmailer")
-    refute_mailer MiniTest::Spec.spec_type("widgetmailertest")
-    refute_mailer MiniTest::Spec.spec_type("widget mailer test")
+    refute_mailer MiniTest::Spec.spec_type('widgetmailer')
+    refute_mailer MiniTest::Spec.spec_type('widgetmailertest')
+    refute_mailer MiniTest::Spec.spec_type('widget mailer test')
   end
 
   it 'wont match spec type for non space characters' do
@@ -25,10 +24,9 @@ class ActionMailerTest < MiniTestSpecRails::TestCase
     refute_mailer MiniTest::Spec.spec_type("Widget Mailer\rTest")
     refute_mailer MiniTest::Spec.spec_type("Widget Mailer\nTest")
     refute_mailer MiniTest::Spec.spec_type("Widget Mailer\fTest")
-    refute_mailer MiniTest::Spec.spec_type("Widget MailerXTest")
+    refute_mailer MiniTest::Spec.spec_type('Widget MailerXTest')
   end
 
-
   private
 
   def assert_mailer(actual)
@@ -38,5 +36,4 @@ class ActionMailerTest < MiniTestSpecRails::TestCase
   def refute_mailer(actual)
     refute_equal ActionMailer::TestCase, actual
   end
-
 end

data/test/cases/action_view_test.rb

@@ -1,25 +1,24 @@
 require 'test_helper'
 
 class ActionViewTest < MiniTestSpecRails::TestCase
-
   it 'resolves spec type for matching helper strings' do
-    assert_view MiniTest::Spec.spec_type("WidgetHelper")
-    assert_view MiniTest::Spec.spec_type("WidgetHelperTest")
-    assert_view MiniTest::Spec.spec_type("Widget Helper Test")
+    assert_view MiniTest::Spec.spec_type('WidgetHelper')
+    assert_view MiniTest::Spec.spec_type('WidgetHelperTest')
+    assert_view MiniTest::Spec.spec_type('Widget Helper Test')
     # And is case sensitive
-    refute_view MiniTest::Spec.spec_type("widgethelper")
-    refute_view MiniTest::Spec.spec_type("widgethelpertest")
-    refute_view MiniTest::Spec.spec_type("widget helper test")
+    refute_view MiniTest::Spec.spec_type('widgethelper')
+    refute_view MiniTest::Spec.spec_type('widgethelpertest')
+    refute_view MiniTest::Spec.spec_type('widget helper test')
   end
 
   it 'resolves spec type for matching view strings' do
-    assert_view MiniTest::Spec.spec_type("WidgetView")
-    assert_view MiniTest::Spec.spec_type("WidgetViewTest")
-    assert_view MiniTest::Spec.spec_type("Widget View Test")
+    assert_view MiniTest::Spec.spec_type('WidgetView')
+    assert_view MiniTest::Spec.spec_type('WidgetViewTest')
+    assert_view MiniTest::Spec.spec_type('Widget View Test')
     # And is case sensitive
-    refute_view MiniTest::Spec.spec_type("widgetview")
-    refute_view MiniTest::Spec.spec_type("widgetviewtest")
-    refute_view MiniTest::Spec.spec_type("widget view test")
+    refute_view MiniTest::Spec.spec_type('widgetview')
+    refute_view MiniTest::Spec.spec_type('widgetviewtest')
+    refute_view MiniTest::Spec.spec_type('widget view test')
   end
 
   it 'wont match spec type for non space characters' do
@@ -27,10 +26,9 @@ class ActionViewTest < MiniTestSpecRails::TestCase
     refute_view MiniTest::Spec.spec_type("Widget Helper\rTest")
     refute_view MiniTest::Spec.spec_type("Widget Helper\nTest")
     refute_view MiniTest::Spec.spec_type("Widget Helper\fTest")
-    refute_view MiniTest::Spec.spec_type("Widget HelperXTest")
+    refute_view MiniTest::Spec.spec_type('Widget HelperXTest')
   end
 
-
   private
 
   def assert_view(actual)
@@ -40,5 +38,4 @@ class ActionViewTest < MiniTestSpecRails::TestCase
   def refute_view(actual)
     refute_equal ActionView::TestCase, actual
   end
-
 end

data/test/cases/active_job_test.rb

@@ -1,44 +1,46 @@
 require 'test_helper'
 
 if defined?(ActiveJob)
-class MyJob < ActiveJob::Base ; def perform(record) ; true ; end end
-class TrashableCleanupJob < MyJob ; end
-
-class ActiveJobTest < MiniTestSpecRails::TestCase
-
-  it 'matches spec type for class constants' do
-    assert_job MiniTest::Spec.spec_type(MyJob)
-    assert_job MiniTest::Spec.spec_type(TrashableCleanupJob)
+  class MyJob < ActiveJob::Base
+    def perform(_record)
+      true
+    end
   end
-
-  it 'matches spec type for strings' do
-    assert_job MiniTest::Spec.spec_type("WidgetJob")
-    assert_job MiniTest::Spec.spec_type("WidgetJobTest")
-    assert_job MiniTest::Spec.spec_type("Widget Job Test")
-    # And is case sensitive
-    refute_job MiniTest::Spec.spec_type("widgetmailer")
-    refute_job MiniTest::Spec.spec_type("widgetmailertest")
-    refute_job MiniTest::Spec.spec_type("widget mailer test")
+  class TrashableCleanupJob < MyJob
   end
 
-  it 'wont match spec type for non space characters' do
-    refute_job MiniTest::Spec.spec_type("Widget Job\tTest")
-    refute_job MiniTest::Spec.spec_type("Widget Job\rTest")
-    refute_job MiniTest::Spec.spec_type("Widget Job\nTest")
-    refute_job MiniTest::Spec.spec_type("Widget Job\fTest")
-    refute_job MiniTest::Spec.spec_type("Widget JobXTest")
+  class ActiveJobTest < MiniTestSpecRails::TestCase
+    it 'matches spec type for class constants' do
+      assert_job MiniTest::Spec.spec_type(MyJob)
+      assert_job MiniTest::Spec.spec_type(TrashableCleanupJob)
+    end
+
+    it 'matches spec type for strings' do
+      assert_job MiniTest::Spec.spec_type('WidgetJob')
+      assert_job MiniTest::Spec.spec_type('WidgetJobTest')
+      assert_job MiniTest::Spec.spec_type('Widget Job Test')
+      # And is case sensitive
+      refute_job MiniTest::Spec.spec_type('widgetmailer')
+      refute_job MiniTest::Spec.spec_type('widgetmailertest')
+      refute_job MiniTest::Spec.spec_type('widget mailer test')
+    end
+
+    it 'wont match spec type for non space characters' do
+      refute_job MiniTest::Spec.spec_type("Widget Job\tTest")
+      refute_job MiniTest::Spec.spec_type("Widget Job\rTest")
+      refute_job MiniTest::Spec.spec_type("Widget Job\nTest")
+      refute_job MiniTest::Spec.spec_type("Widget Job\fTest")
+      refute_job MiniTest::Spec.spec_type('Widget JobXTest')
+    end
+
+    private
+
+    def assert_job(actual)
+      assert_equal ActiveJob::TestCase, actual
+    end
+
+    def refute_job(actual)
+      refute_equal ActiveJob::TestCase, actual
+    end
   end
-
-
-  private
-
-  def assert_job(actual)
-    assert_equal ActiveJob::TestCase, actual
-  end
-
-  def refute_job(actual)
-    refute_equal ActiveJob::TestCase, actual
-  end
-
-end
 end