minitest-spec-rails 4.3.4 → 4.3.5

data/CHANGELOG.md

@@ -1,4 +1,9 @@
 
+## v4.3.5
+
+* Make sure #described_class works in ActiveSupport::TestCase class level.
+
+
 ## v4.3.4
 
 * Add mini_should support and talk about matchers.

data/gemfiles/rails30.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/kencollins/Repositories/minitest-spec-rails
   specs:
-    minitest-spec-rails (4.3.3)
+    minitest-spec-rails (4.3.4)
       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.3)
+    minitest-spec-rails (4.3.4)
       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.3)
+    minitest-spec-rails (4.3.5)
       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.3)
+    minitest-spec-rails (4.3.5)
       minitest (~> 4.3)
       rails (>= 3.0)
 

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

@@ -8,6 +8,7 @@ module MiniTestSpecRails
         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 }
+        register_rails_test_case self
       end
 
       private

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

@@ -7,6 +7,7 @@ module MiniTestSpecRails
       included do
         register_spec_type(/(Acceptance|Integration) ?Test\z/i, self)
         register_spec_type(self) { |desc| Class === desc && desc < self }
+        register_rails_test_case self
       end
 
     end

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

@@ -8,6 +8,7 @@ module MiniTestSpecRails
         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 }
+        register_rails_test_case self
         before { setup_minitest_spec_rails_mailer_class }
       end
 

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

@@ -8,6 +8,7 @@ module MiniTestSpecRails
         class_attribute :_helper_class
         register_spec_type(/(Helper|View)( ?Test)?\z/i, self)
         register_spec_type(self) { |desc| Class === desc && desc < self }
+        register_rails_test_case self
         before { setup_minitest_spec_rails_helper_class }
       end
 

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

@@ -1,15 +1,21 @@
-ActiveSupport::TestCase.instance_eval do
+module MiniTestSpecRails
+  module Init
+    module ActiveSupportBehavior
 
-  class << self
-    remove_method :describe
-  end
+      extend ActiveSupport::Concern
 
-  register_spec_type(self) do |desc|
-    Class === desc && desc < ActiveRecord::Base      
-  end
+      included do
+        singleton_class.send :remove_method, :describe
+        register_spec_type(self) { |desc| Class === desc && desc < ActiveRecord::Base }
+        register_rails_test_case self
+      end
 
+    end
+  end
 end
 
+ActiveSupport::TestCase.send :include, MiniTestSpecRails::Init::ActiveSupportBehavior
+
 # The AbstractController::Helpers#default_helper_module! blows up using
 # ActiveSupport's modified LoadError class under Ruby 1.8 because describe
 # blocks with spaces for their names have a `module_path` of something like 

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

@@ -1,3 +1,3 @@
 module MiniTestSpecRails
-  VERSION = "4.3.4"
+  VERSION = "4.3.5"
 end

data/lib/test/unit/testcase.rb

@@ -29,8 +29,19 @@ module Test
 
       # MiniTestSpecRails Additions
 
+      RAILS_TEST_CASES = []
+
+      def self.rails_test_cases
+        RAILS_TEST_CASES
+      end
+
+      def self.register_rails_test_case(test_case)
+        return if RAILS_TEST_CASES.include?(test_case)
+        RAILS_TEST_CASES.unshift(test_case)
+      end
+
       def self.describing_class
-        ancestors.detect { |a| Class === a && a.superclass == spec_type(self) }
+        ancestors.detect { |a| Class === a && rails_test_cases.include?(a.superclass) }
       end
 
       def describing_class

data/test/dummy_tests/application_controller_test.rb

@@ -46,22 +46,22 @@ end
 
 class ApplicationControllerTest < ActionController::TestCase
   include ApplicationControllerTests
-  it 'reflects' do
-    self.class.spec_type(self.class).must_equal ActionController::TestCase
+    it 'reflects' do
     describing_class.must_equal ApplicationControllerTest
     described_class.must_equal ApplicationController
+    self.class.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
+      self.class.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
+        self.class.described_class.must_equal ApplicationController
       end
     end
   end
@@ -69,19 +69,23 @@ end
 
 describe ApplicationController do
   include ApplicationControllerTests
+  it 'class reflects' do
+    described_class.must_equal ApplicationController
+    self.class.described_class.must_equal ApplicationController
+  end
   it 'reflects' do
-    self.class.spec_type(self.class).must_equal ActionController::TestCase
     described_class.must_equal ApplicationController
+    self.class.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
+      self.class.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
+        self.class.described_class.must_equal ApplicationController
       end
     end
   end

data/test/dummy_tests/user_mailer_test.rb

@@ -49,21 +49,21 @@ 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
+    self.class.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
+      self.class.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
+        self.class.described_class.must_equal UserMailer
       end
     end
   end
@@ -72,18 +72,18 @@ end
 describe UserMailer do
   include UserMailerTests
   it 'reflects' do
-    self.class.spec_type(self.class).must_equal ActionMailer::TestCase
     described_class.must_equal UserMailer
+    self.class.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
+      self.class.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
+        self.class.described_class.must_equal UserMailer
       end
     end
   end

data/test/dummy_tests/user_test.rb

@@ -29,8 +29,43 @@ end
 
 class UserTest < ActiveSupport::TestCase
   include UserTests
+  it 'reflects' do
+    describing_class.must_equal UserTest
+    described_class.must_equal User
+    self.class.described_class.must_equal User
+  end
+  describe 'level 1' do
+    it 'reflects' do
+      describing_class.must_equal UserTest
+      described_class.must_equal  User
+      self.class.described_class.must_equal User
+    end
+    describe 'level 2' do
+      it 'reflects' do
+        describing_class.must_equal UserTest
+        described_class.must_equal  User
+        self.class.described_class.must_equal User
+      end
+    end
+  end
 end
 
 describe User do
   include UserTests
+  it 'reflects' do
+    described_class.must_equal User
+    self.class.described_class.must_equal User
+  end
+  describe 'level 1' do
+    it 'reflects' do
+      described_class.must_equal User
+      self.class.described_class.must_equal User
+    end
+    describe 'level 2' do
+      it 'reflects' do
+        described_class.must_equal User
+        self.class.described_class.must_equal User
+      end
+    end
+  end
 end

data/test/dummy_tests/users_helper_test.rb

@@ -39,21 +39,21 @@ 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
+    self.class.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
+      self.class.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
+        self.class.described_class.must_equal UsersHelper
       end
     end
   end
@@ -62,18 +62,18 @@ end
 describe UsersHelper do
   include UsersHelperTests
   it 'reflects' do
-    self.class.spec_type(self.class).must_equal ActionView::TestCase
     described_class.must_equal UsersHelper
+    self.class.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
+      self.class.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
+        self.class.described_class.must_equal UsersHelper
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-spec-rails
 version: !ruby/object:Gem::Version
-  version: 4.3.4
+  version: 4.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-19 00:00:00.000000000 Z
+date: 2013-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -188,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1500693276380796618
+      hash: -3446977262078357422
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -197,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1500693276380796618
+      hash: -3446977262078357422
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24