minitest-spec-rails 5.4.0 → 6.0.3

data/gemfiles/{rails41.gemfile → rails_v6.0.x.gemfile}

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 4.1.0"
+gem "rails", "~> 6.0.0"
+gem "minitest"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_v6.0.x.gemfile.lock

@@ -0,0 +1,152 @@
+PATH
+  remote: ..
+  specs:
+    minitest-spec-rails (6.0.2)
+      minitest (>= 5.0)
+      railties (>= 4.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (6.0.1)
+      actionpack (= 6.0.1)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.0.1)
+      actionpack (= 6.0.1)
+      activejob (= 6.0.1)
+      activerecord (= 6.0.1)
+      activestorage (= 6.0.1)
+      activesupport (= 6.0.1)
+      mail (>= 2.7.1)
+    actionmailer (6.0.1)
+      actionpack (= 6.0.1)
+      actionview (= 6.0.1)
+      activejob (= 6.0.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (6.0.1)
+      actionview (= 6.0.1)
+      activesupport (= 6.0.1)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.1)
+      actionpack (= 6.0.1)
+      activerecord (= 6.0.1)
+      activestorage (= 6.0.1)
+      activesupport (= 6.0.1)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.1)
+      activesupport (= 6.0.1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.1)
+      activesupport (= 6.0.1)
+      globalid (>= 0.3.6)
+    activemodel (6.0.1)
+      activesupport (= 6.0.1)
+    activerecord (6.0.1)
+      activemodel (= 6.0.1)
+      activesupport (= 6.0.1)
+    activestorage (6.0.1)
+      actionpack (= 6.0.1)
+      activejob (= 6.0.1)
+      activerecord (= 6.0.1)
+      marcel (~> 0.3.1)
+    activesupport (6.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    builder (3.2.3)
+    concurrent-ruby (1.1.5)
+    crass (1.0.5)
+    erubi (1.9.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    i18n (1.7.0)
+      concurrent-ruby (~> 1.0)
+    loofah (2.4.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.2)
+    mimemagic (0.3.3)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.13.0)
+    nio4r (2.5.2)
+    nokogiri (1.10.5)
+      mini_portile2 (~> 2.4.0)
+    rack (2.0.7)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (6.0.1)
+      actioncable (= 6.0.1)
+      actionmailbox (= 6.0.1)
+      actionmailer (= 6.0.1)
+      actionpack (= 6.0.1)
+      actiontext (= 6.0.1)
+      actionview (= 6.0.1)
+      activejob (= 6.0.1)
+      activemodel (= 6.0.1)
+      activerecord (= 6.0.1)
+      activestorage (= 6.0.1)
+      activesupport (= 6.0.1)
+      bundler (>= 1.3.0)
+      railties (= 6.0.1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.1)
+      actionpack (= 6.0.1)
+      activesupport (= 6.0.1)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
+    rake (13.0.1)
+    sprockets (4.0.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.4.1)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    websocket-driver (0.7.1)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.4)
+    zeitwerk (2.2.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  minitest
+  minitest-spec-rails!
+  rails (~> 6.0.0)
+  rake
+  sqlite3
+
+BUNDLED WITH
+   1.17.3

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

@@ -1,13 +1,11 @@
 module MiniTestSpecRails
   module DSL
-
     def self.included(klass)
       klass.extend ClassMethods
       remove_method :test if method_defined?(:test)
     end
 
     module ClassMethods
-
       def describe(*args, &block)
         stack = Minitest::Spec.describe_stack
         stack.push self if stack.empty?
@@ -15,27 +13,25 @@ module MiniTestSpecRails
         stack.pop if stack.length == 1
       end
 
-      def before(type = nil, &block)
-        setup { self.instance_eval(&block) }
+      def before(_type = nil, &block)
+        setup { instance_eval(&block) }
       end
 
-      def after(type = nil, &block)
-        teardown { self.instance_eval(&block) }
+      def after(_type = nil, &block)
+        teardown { instance_eval(&block) }
       end
 
       def test(name, &block)
-        it(name) { self.instance_eval(&block) }
+        instance_eval { it(name, &block) }
       end
 
       def described_class
         nil
       end
-      
     end
 
     def described_class
       self.class.described_class
     end
-    
   end
 end

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

@@ -1,24 +1,20 @@
 module MiniTestSpecRails
   module Init
     module ActionControllerBehavior
-
       extend ActiveSupport::Concern
 
       included do
         extend Descriptions
-        register_spec_type(self) { |desc| Class === desc && desc < ActionController::Metal }
+        register_spec_type(self) { |desc| desc.is_a?(Class) && desc < ActionController::Metal }
         register_spec_type(/Controller( ?Test)?\z/, self)
-        register_spec_type(self) { |desc| Class === desc && desc < self }
+        register_spec_type(self) { |desc| desc.is_a?(Class) && desc < self }
       end
-      
-      module Descriptions
 
+      module Descriptions
         def described_class
           determine_default_controller_class(name)
         end
-
       end
-
     end
   end
 end

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

@@ -1,14 +1,12 @@
 module MiniTestSpecRails
   module Init
     module ActionDispatchBehavior
-
       extend ActiveSupport::Concern
 
       included do
         register_spec_type(/(Acceptance|Integration) ?Test\z/, self)
-        register_spec_type(self) { |desc| Class === desc && desc < self }
+        register_spec_type(self) { |desc| desc.is_a?(Class) && desc < self }
       end
-
     end
   end
 end

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

@@ -1,27 +1,22 @@
 module MiniTestSpecRails
   module Init
     module ActionMailerBehavior
-
       extend ActiveSupport::Concern
 
       included do
-        register_spec_type(self) { |desc| Class === desc && desc < ActionMailer::Base }
+        register_spec_type(self) { |desc| desc.is_a?(Class) && desc < ActionMailer::Base }
         register_spec_type(/Mailer( ?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_mailer(name)
         end
-
       end
-
     end
   end
 end
 
 ActionMailer::TestCase.send :include, MiniTestSpecRails::Init::ActionMailerBehavior
-

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/parallelize.rb

@@ -0,0 +1,30 @@
+
+# HACK: stolen and altered from https://github.com/blowmage/minitest-rails/pull/218/files
+# Which was referenced in https://github.com/metaskills/minitest-spec-rails/issues/94
+
+module MiniTestSpecRails
+  ##
+  # This module is a placeholder for all the Test classes created using the
+  # spec DSL. Normally all classes are created but not assigned to a constant.
+  # This module is where constants will be created for these classes.
+  module SpecTests #:nodoc:
+  end
+end
+
+module Kernel #:nodoc:
+  alias describe_before_minitest_spec_constant_fix describe
+  private :describe_before_minitest_spec_constant_fix
+  def describe *args, &block
+    cls = describe_before_minitest_spec_constant_fix(*args, &block)
+    cls_const = "Test__#{cls.name.to_s.split(/\W/).reject(&:empty?).join('_'.freeze)}"
+    if block.source_location
+      source_path, line_num = block.source_location
+      source_path = Pathname.new(source_path).relative_path_from(Rails.root).to_s
+      source_path = source_path.split(/\W/).reject(&:empty?).join("_".freeze)
+      cls_const += "__#{source_path}__#{line_num}"
+    end
+    cls_const += "_1" while MiniTestSpecRails::SpecTests.const_defined? cls_const
+    MiniTestSpecRails::SpecTests.const_set cls_const, cls
+    cls
+  end
+end

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

@@ -1,31 +1,34 @@
 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'
+        require 'minitest-spec-rails/parallelize'
+        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|
+        ActiveSupport.on_load(:action_view) do
+          require 'minitest-spec-rails/init/action_view'
+        end
+      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