minitest-spec-rails 4.3.1 → 4.3.2

data/CHANGELOG.md

@@ -1,4 +1,9 @@
 
+## v4.3.2
+
+* Way better support for controller_class, mailer_class, and helper_class reflection.
+
+
 ## v4.3.1
 
 * Eager load controller_class, mailer_class, and helper_class.

data/gemfiles/rails30.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/kencollins/Repositories/minitest-spec-rails
   specs:
-    minitest-spec-rails (4.3.0)
+    minitest-spec-rails (4.3.1)
       minitest (~> 4.3)
       rails (>= 3.0)
 

data/gemfiles/rails31.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/kencollins/Repositories/minitest-spec-rails
   specs:
-    minitest-spec-rails (4.3.0)
+    minitest-spec-rails (4.3.1)
       minitest (~> 4.3)
       rails (>= 3.0)
 

data/gemfiles/rails32.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/kencollins/Repositories/minitest-spec-rails
   specs:
-    minitest-spec-rails (4.3.0)
+    minitest-spec-rails (4.3.1)
       minitest (~> 4.3)
       rails (>= 3.0)
 

data/gemfiles/rails40.gemfile.lock

@@ -43,7 +43,7 @@ GIT
 PATH
   remote: /Users/kencollins/Repositories/minitest-spec-rails
   specs:
-    minitest-spec-rails (4.3.0)
+    minitest-spec-rails (4.3.1)
       minitest (~> 4.3)
       rails (>= 3.0)
 

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

@@ -1,18 +1,24 @@
-ActionController::TestCase.instance_eval do
+module MiniTestSpecRails
+  module Init
+    module ActionControllerBehavior
 
-  register_spec_type(self) do |desc|
-    Class === desc && desc < ActionController::Metal
-  end
-
-  register_spec_type(/Controller( ?Test)?\z/i, self)
-
-  before { self.class.controller_class }
+      extend ActiveSupport::Concern
 
-end
+      included do
+        register_spec_type(self) { |desc| Class === desc && desc < ActionController::Metal }
+        register_spec_type(/Controller( ?Test)?\z/i, self)
+        register_spec_type(self) { |desc| Class === desc && desc < self }
+      end
 
-require 'action_dispatch/testing/integration' # For Rails 3.0 loading.
-ActionDispatch::IntegrationTest.instance_eval do
+      private
 
-  register_spec_type(/(Acceptance|Integration) ?Test\z/i, self)
+      def setup_controller_request_and_response
+        describing_class.tests described_class
+        super
+      end
 
+    end
+  end
 end
+
+ActionController::TestCase.send :include, MiniTestSpecRails::Init::ActionControllerBehavior

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

@@ -0,0 +1,16 @@
+module MiniTestSpecRails
+  module Init
+    module ActionDispatchBehavior
+
+      extend ActiveSupport::Concern
+
+      included do
+        register_spec_type(/(Acceptance|Integration) ?Test\z/i, self)
+        register_spec_type(self) { |desc| Class === desc && desc < self }
+      end
+
+    end
+  end
+end
+
+ActionDispatch::IntegrationTest.send :include, MiniTestSpecRails::Init::ActionDispatchBehavior

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

@@ -1,11 +1,25 @@
-ActionMailer::TestCase.instance_eval do
+module MiniTestSpecRails
+  module Init
+    module ActionMailerBehavior
 
-  register_spec_type(self) do |desc|
-    Class === desc && desc < ActionMailer::Base
-  end
+      extend ActiveSupport::Concern
+
+      included do
+        register_spec_type(self) { |desc| Class === desc && desc < ActionMailer::Base }
+        register_spec_type(/Mailer( ?Test)?\z/i, self)
+        register_spec_type(self) { |desc| Class === desc && desc < self }
+        before { setup_minitest_spec_rails_mailer_class }
+      end
 
-  register_spec_type(/Mailer( ?Test)?\z/i, self)
+      private
 
-  before { self.class.mailer_class unless MiniTestSpecRails::Util.rails30? }
+      def setup_minitest_spec_rails_mailer_class
+        describing_class.tests described_class
+      end
 
+    end
+  end
 end
+
+ActionMailer::TestCase.send :include, MiniTestSpecRails::Init::ActionMailerBehavior
+

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

@@ -1,21 +1,36 @@
-ActionView::TestCase.instance_eval do
+module MiniTestSpecRails
+  module Init
+    module ActionViewBehavior
 
-  register_spec_type(/(Helper|View)( ?Test)?\z/i, self)
+      extend ActiveSupport::Concern
 
-  # Properly allow the parent class to memoize this for subclasses.
-  # Just like ActionController::TestCase does.
-  class_attribute :_helper_class
-  def helper_class=(new_class)
-    self._helper_class = new_class
-  end
-  def helper_class
-    if current_helper_class = self._helper_class
-      current_helper_class
-    else
-      self.helper_class = determine_default_helper_class(name)
-    end
-  end
+      included do
+        class_attribute :_helper_class
+        register_spec_type(/(Helper|View)( ?Test)?\z/i, self)
+        register_spec_type(self) { |desc| Class === desc && desc < self }
+        before { setup_minitest_spec_rails_helper_class }
+      end
+
+      private
 
-  before { self.class.helper_class }
+      def helper_class=(new_class)
+        self._helper_class = new_class
+      end
+      
+      def helper_class
+        if current_helper_class = self._helper_class
+          current_helper_class
+        else
+          self.helper_class = determine_default_helper_class(name)
+        end
+      end
 
+      def setup_minitest_spec_rails_helper_class
+        self.class.helper_class = described_class
+      end
+
+    end
+  end
 end
+
+ActionView::TestCase.send :include, MiniTestSpecRails::Init::ActionViewBehavior

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

@@ -4,9 +4,17 @@ module MiniTestSpecRails
     config.minitest_spec_rails = ActiveSupport::OrderedOptions.new
     
     config.before_initialize do |app| 
-      ActiveSupport.on_load(:action_view)       { require 'minitest-spec-rails/init/action_view' }
-      ActiveSupport.on_load(:action_controller) { require 'minitest-spec-rails/init/action_controller' }
-      ActiveSupport.on_load(:action_mailer)     { require 'minitest-spec-rails/init/action_mailer' }
+      ActiveSupport.on_load(:action_view) do
+        require 'minitest-spec-rails/init/action_view'
+      end
+      ActiveSupport.on_load(:action_controller) do 
+        require 'minitest-spec-rails/init/action_controller'
+        require 'action_dispatch/testing/integration' # For Rails 3.0 loading.
+        require 'minitest-spec-rails/init/action_dispatch'
+      end
+      ActiveSupport.on_load(:action_mailer) do
+        require 'minitest-spec-rails/init/action_mailer'
+      end
     end
 
     initializer 'minitest-spec-rails.after.load_active_support', :after => :load_active_support, :group => :all do |app|

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

@@ -1,3 +1,3 @@
 module MiniTestSpecRails
-  VERSION = "4.3.1"
+  VERSION = "4.3.2"
 end

data/lib/test/unit/testcase.rb

@@ -8,8 +8,12 @@ module Test
     remove_const(:TestCase) if defined?(self::TestCase)
     class TestCase < ::MiniTest::Spec
       
+      # Let Others Know
+
       MINITEST_SPEC_RAILS = true
 
+      # Test::Unit Compatability 
+
       def mu_pp(obj)
         obj.pretty_inspect.chomp
       end
@@ -22,10 +26,32 @@ module Test
         template &&= template.chomp
         template.gsub(/\G((?:[^\\]|\\.)*?)(\\)?\?/) { $1 + ($2 ? "?" : mu_pp(arguments.shift)) }
       end
+
+      # MiniTestSpecRails Additions
+
+      def self.describing_class
+        ancestors.detect { |a| Class === a && a.superclass == spec_type(self) }
+      end
+
+      def describing_class
+        self.class.describing_class
+      end
+
+      def self.described_class
+        begin
+          describing_class.name.gsub(/Test$/, '').constantize
+        rescue NameError
+          nil
+        end
+      end
+
+      def described_class
+        self.class.described_class
+      end
       
     end
     
   end
 end
 
-silence_warnings { MiniTest::Unit::TestCase = MiniTest::Spec }
+silence_warnings { MiniTest::Unit::TestCase = Test::Unit::TestCase }

data/test/dummy_tests/application_controller_test.rb

@@ -46,8 +46,43 @@ end
 
 class ApplicationControllerTest < ActionController::TestCase
   include ApplicationControllerTests
+  it 'reflects' do
+    self.class.spec_type(self.class).must_equal ActionController::TestCase
+    describing_class.must_equal ApplicationControllerTest
+    described_class.must_equal ApplicationController
+  end
+  describe 'level 1' do
+    it 'reflects' do
+      self.class.spec_type(self.class).must_equal ActionController::TestCase
+      describing_class.must_equal ApplicationControllerTest
+      described_class.must_equal  ApplicationController
+    end
+    describe 'level 2' do
+      it 'reflects' do
+        self.class.spec_type(self.class).must_equal ActionController::TestCase
+        describing_class.must_equal ApplicationControllerTest
+        described_class.must_equal  ApplicationController
+      end
+    end
+  end
 end
 
 describe ApplicationController do
   include ApplicationControllerTests
+  it 'reflects' do
+    self.class.spec_type(self.class).must_equal ActionController::TestCase
+    described_class.must_equal ApplicationController
+  end
+  describe 'level 1' do
+    it 'reflects' do
+      self.class.spec_type(self.class).must_equal ActionController::TestCase
+      described_class.must_equal ApplicationController
+    end
+    describe 'level 2' do
+      it 'reflects' do
+        self.class.spec_type(self.class).must_equal ActionController::TestCase
+        described_class.must_equal ApplicationController
+      end
+    end
+  end
 end

data/test/dummy_tests/user_mailer_test.rb

@@ -48,8 +48,43 @@ end
 
 class UserMailerTest < ActionMailer::TestCase
   include UserMailerTests
+  it 'reflects' do
+    self.class.spec_type(self.class).must_equal ActionMailer::TestCase
+    describing_class.must_equal UserMailerTest
+    described_class.must_equal UserMailer
+  end
+  describe 'level 1' do
+    it 'reflects' do
+      self.class.spec_type(self.class).must_equal ActionMailer::TestCase
+      describing_class.must_equal UserMailerTest
+      described_class.must_equal  UserMailer
+    end
+    describe 'level 2' do
+      it 'reflects' do
+        self.class.spec_type(self.class).must_equal ActionMailer::TestCase
+        describing_class.must_equal UserMailerTest
+        described_class.must_equal  UserMailer
+      end
+    end
+  end
 end
 
 describe UserMailer do
   include UserMailerTests
+  it 'reflects' do
+    self.class.spec_type(self.class).must_equal ActionMailer::TestCase
+    described_class.must_equal UserMailer
+  end
+  describe 'level 1' do
+    it 'reflects' do
+      self.class.spec_type(self.class).must_equal ActionMailer::TestCase
+      described_class.must_equal UserMailer
+    end
+    describe 'level 2' do
+      it 'reflects' do
+        self.class.spec_type(self.class).must_equal ActionMailer::TestCase
+        described_class.must_equal UserMailer
+      end
+    end
+  end
 end

data/test/dummy_tests/users_helper_test.rb

@@ -38,8 +38,43 @@ end
 
 class UsersHelperTest < ActionView::TestCase
   include UsersHelperTests
+  it 'reflects' do
+    self.class.spec_type(self.class).must_equal ActionView::TestCase
+    describing_class.must_equal UsersHelperTest
+    described_class.must_equal UsersHelper
+  end
+  describe 'level 1' do
+    it 'reflects' do
+      self.class.spec_type(self.class).must_equal ActionView::TestCase
+      describing_class.must_equal UsersHelperTest
+      described_class.must_equal  UsersHelper
+    end
+    describe 'level 2' do
+      it 'reflects' do
+        self.class.spec_type(self.class).must_equal ActionView::TestCase
+        describing_class.must_equal UsersHelperTest
+        described_class.must_equal  UsersHelper
+      end
+    end
+  end
 end
 
 describe UsersHelper do
   include UsersHelperTests
+  it 'reflects' do
+    self.class.spec_type(self.class).must_equal ActionView::TestCase
+    described_class.must_equal UsersHelper
+  end
+  describe 'level 1' do
+    it 'reflects' do
+      self.class.spec_type(self.class).must_equal ActionView::TestCase
+      described_class.must_equal UsersHelper
+    end
+    describe 'level 2' do
+      it 'reflects' do
+        self.class.spec_type(self.class).must_equal ActionView::TestCase
+        described_class.must_equal UsersHelper
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-spec-rails
 version: !ruby/object:Gem::Version
-  version: 4.3.1
+  version: 4.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -133,6 +133,7 @@ files:
 - gemfiles/rails40.gemfile.lock
 - lib/minitest-spec-rails.rb
 - lib/minitest-spec-rails/init/action_controller.rb
+- lib/minitest-spec-rails/init/action_dispatch.rb
 - lib/minitest-spec-rails/init/action_mailer.rb
 - lib/minitest-spec-rails/init/action_view.rb
 - lib/minitest-spec-rails/init/active_support.rb
@@ -184,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -825537953231626350
+      hash: 1476361485121424446
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -193,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -825537953231626350
+      hash: 1476361485121424446
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24