mcmire-shoulda-matchers 2.5.0 → 2.6.1.docs.1

data/lib/shoulda/matchers/integrations/nunit_test_case_detection.rb

@@ -0,0 +1,38 @@
+module Shoulda
+  module Matchers
+    module Integrations
+      # @private
+      module NUnitTestCaseDetection
+        def self.possible_test_case_constants
+          [
+            -> { ActiveSupport::TestCase },
+            -> { Minitest::Test },
+            -> { MiniTest::Unit::TestCase },
+            -> { Test::Unit::TestCase }
+          ]
+        end
+
+        def self.resolve_constant(future_constant)
+          future_constant.call
+        rescue NameError
+          nil
+        end
+
+        def self.detected_test_case_constants
+          possible_test_case_constants.
+            map { |future_constant| resolve_constant(future_constant) }.
+            compact
+        end
+
+        def self.test_case_constants
+          @_test_case_constants ||= detected_test_case_constants
+        end
+      end
+    end
+
+    # @private
+    def self.nunit_test_case_constants
+      Integrations::NUnitTestCaseDetection.test_case_constants
+    end
+  end
+end

data/lib/shoulda/matchers/integrations/rspec.rb

@@ -1,20 +1,19 @@
 # :enddoc:
-require 'rspec/core'
 
-RSpec.configure do |config|
-  if defined?(::ActiveRecord)
-    require 'shoulda/matchers/active_record'
-    require 'shoulda/matchers/active_model'
-    config.include Shoulda::Matchers::ActiveRecord
-    config.include Shoulda::Matchers::ActiveModel
+if RSpec.respond_to?(:configure)
+  RSpec.configure do |config|
+    config.include Shoulda::Matchers::Independent
 
-  elsif defined?(::ActiveModel)
-    require 'shoulda/matchers/active_model'
-    config.include Shoulda::Matchers::ActiveModel
-  end
+    if defined?(ActiveRecord)
+      config.include Shoulda::Matchers::ActiveRecord
+    end
+
+    if defined?(ActiveModel)
+      config.include Shoulda::Matchers::ActiveModel
+    end
 
-  if defined?(::ActionController)
-    require 'shoulda/matchers/action_controller'
-    config.include Shoulda::Matchers::ActionController
+    if defined?(ActionController)
+      config.include Shoulda::Matchers::ActionController
+    end
   end
 end

data/lib/shoulda/matchers/integrations/test_unit.rb

@@ -1,6 +1,14 @@
-if defined?(ActionController) && defined?(ActionController::TestCase)
-  require 'shoulda/matchers/action_controller'
+# :enddoc:
+require 'shoulda/matchers/integrations/nunit_test_case_detection'
 
+Shoulda::Matchers.nunit_test_case_constants.each do |constant|
+  constant.class_eval do
+    include Shoulda::Matchers::Independent
+    extend Shoulda::Matchers::Independent
+  end
+end
+
+if defined?(ActionController::TestCase)
   ActionController::TestCase.class_eval do
     include Shoulda::Matchers::ActionController
     extend Shoulda::Matchers::ActionController
@@ -11,20 +19,16 @@ if defined?(ActionController) && defined?(ActionController::TestCase)
   end
 end
 
-if defined?(ActiveRecord) && defined?(ActiveSupport::TestCase)
-  require 'shoulda/matchers/active_record'
-
+if defined?(ActiveSupport::TestCase)
   ActiveSupport::TestCase.class_eval do
-    include Shoulda::Matchers::ActiveRecord
-    extend Shoulda::Matchers::ActiveRecord
-  end
-end
-
-if defined?(ActiveModel) && defined?(ActiveSupport::TestCase)
-  require 'shoulda/matchers/active_model'
+    if defined?(Shoulda::Matchers::ActiveRecord)
+      include Shoulda::Matchers::ActiveRecord
+      extend Shoulda::Matchers::ActiveRecord
+    end
 
-  ActiveSupport::TestCase.class_eval do
-    include Shoulda::Matchers::ActiveModel
-    extend Shoulda::Matchers::ActiveModel
+    if defined?(Shoulda::Matchers::ActiveModel)
+      include Shoulda::Matchers::ActiveModel
+      extend Shoulda::Matchers::ActiveModel
+    end
   end
 end

data/lib/shoulda/matchers/integrations.rb

@@ -0,0 +1,13 @@
+module Shoulda
+  module Matchers
+    # @private
+    module Integrations
+    end
+  end
+end
+
+if defined?(RSpec)
+  require 'shoulda/matchers/integrations/rspec'
+end
+
+require 'shoulda/matchers/integrations/test_unit'

data/lib/shoulda/matchers/rails_shim.rb

@@ -34,6 +34,14 @@ module Shoulda
         end
       end
 
+      def self.verb_for_update
+        if action_pack_gte_4_1?
+          :patch
+        else
+          :put
+        end
+      end
+
       def self.active_record_major_version
         ::ActiveRecord::VERSION::MAJOR
       end
@@ -45,6 +53,14 @@ module Shoulda
       def self.action_pack_major_version
         ::ActionPack::VERSION::MAJOR
       end
+
+      def self.action_pack_gte_4_1?
+        Gem::Requirement.new('>= 4.1').satisfied_by?(action_pack_version)
+      end
+
+      def self.action_pack_version
+        Gem::Version.new(::ActionPack::VERSION::STRING)
+      end
     end
   end
 end

data/lib/shoulda/matchers/version.rb

@@ -1,6 +1,6 @@
 module Shoulda
   module Matchers
     # @private
-    VERSION = '2.5.0'.freeze
+    VERSION = '2.6.1.docs.1'.freeze
   end
 end

data/lib/shoulda/matchers.rb

@@ -1,11 +1,23 @@
 require 'shoulda/matchers/assertion_error'
+require 'shoulda/matchers/doublespeak'
 require 'shoulda/matchers/error'
 require 'shoulda/matchers/rails_shim'
 require 'shoulda/matchers/warn'
 require 'shoulda/matchers/version'
 
-if defined?(RSpec)
-  require 'shoulda/matchers/integrations/rspec'
+require 'shoulda/matchers/independent'
+
+if defined?(ActiveModel)
+  require 'shoulda/matchers/active_model'
+end
+
+if defined?(ActiveRecord)
+  require 'shoulda/matchers/active_record'
 end
 
-require 'shoulda/matchers/integrations/test_unit'
+if defined?(ActionController)
+  require 'shoulda/matchers/action_controller'
+end
+
+require 'shoulda/matchers/integrations'
+

data/spec/shoulda/matchers/action_controller/callback_matcher_spec.rb

@@ -0,0 +1,82 @@
+require 'spec_helper'
+
+describe Shoulda::Matchers::ActionController::CallbackMatcher do
+  shared_examples 'CallbackMatcher' do |kind, callback_type|
+    let(:kind) { kind }
+    let(:callback_type) { callback_type }
+    let(:method_name) { :authenticate_user! }
+    let(:matcher) { described_class.new(method_name, kind, callback_type) }
+    let(:controller) { define_controller('HookController').new }
+
+    def match
+      __send__("use_#{kind}_#{callback_type}", method_name)
+    end
+
+    it "matches when a #{kind} hook is in place" do
+      add_callback(kind, callback_type, method_name)
+
+      expect(controller).to match
+    end
+
+    it "does not match when a #{kind} hook is missing" do
+      expect(controller).not_to match
+    end
+
+    describe 'description' do
+      it 'includes the filter kind and name' do
+        expect(matcher.description).to eq "have #{method_name.inspect} as a #{kind}_#{callback_type}"
+      end
+    end
+
+    describe 'failure message' do
+      it 'includes the filter kind and name that was expected' do
+        message = "Expected that HookController would have #{method_name.inspect} as a #{kind}_#{callback_type}"
+
+        expect {
+          expect(controller).to send("use_#{kind}_#{callback_type}", method_name)
+        }.to fail_with_message(message)
+      end
+    end
+
+    describe 'failure message when negated' do
+      it 'includes the filter kind and name that was expected' do
+        add_callback(kind, callback_type, method_name)
+        message = "Expected that HookController would not have #{method_name.inspect} as a #{kind}_#{callback_type}"
+
+        expect { expect(controller).not_to match }.to fail_with_message(message)
+      end
+    end
+
+    private
+
+    def add_callback(kind, callback_type, callback)
+      controller.class.__send__("#{kind}_#{callback_type}", callback)
+    end
+  end
+
+  describe '#use_before_filter' do
+    it_behaves_like 'CallbackMatcher', :before, :filter
+  end
+
+  describe '#use_after_filter' do
+    it_behaves_like 'CallbackMatcher', :after, :filter
+  end
+
+  describe '#use_around_filter' do
+    it_behaves_like 'CallbackMatcher', :around, :filter
+  end
+
+  if rails_4_x?
+    describe '#use_before_action' do
+      it_behaves_like 'CallbackMatcher', :before, :action
+    end
+
+    describe '#use_after_action' do
+      it_behaves_like 'CallbackMatcher', :after, :action
+    end
+
+    describe '#use_around_action' do
+      it_behaves_like 'CallbackMatcher', :around, :action
+    end
+  end
+end

data/spec/shoulda/matchers/action_controller/redirect_to_matcher_spec.rb

@@ -22,13 +22,13 @@ describe Shoulda::Matchers::ActionController::RedirectToMatcher do
     end
 
     def controller_redirecting_to(url)
-      build_response { redirect_to url }
+      build_fake_response { redirect_to url }
     end
   end
 
   context 'a controller that does not redirect' do
     it 'rejects redirecting to a url' do
-      controller = build_response { render text: 'hello' }
+      controller = build_fake_response { render text: 'hello' }
 
       expect(controller).not_to redirect_to('/some/url')
     end

data/spec/shoulda/matchers/action_controller/render_template_matcher_spec.rb

@@ -21,7 +21,7 @@ describe Shoulda::Matchers::ActionController::RenderTemplateMatcher do
     end
 
     def controller_with_show
-      build_response(action: 'show') { render }
+      build_fake_response(action: 'show') { render }
     end
   end
 
@@ -47,13 +47,13 @@ describe Shoulda::Matchers::ActionController::RenderTemplateMatcher do
     end
 
     def controller_with_customer_partial
-      build_response(partial: '_customer') { render partial: 'customer' }
+      build_fake_response(partial: '_customer') { render partial: 'customer' }
     end
   end
 
   context 'a controller that does not render partials' do
     it 'accepts not rendering a partial' do
-      controller = build_response(action: 'show') { render }
+      controller = build_fake_response(action: 'show') { render }
 
       expect(controller).to render_template(partial: false)
     end
@@ -61,7 +61,7 @@ describe Shoulda::Matchers::ActionController::RenderTemplateMatcher do
 
   context 'a controller that renders a partial several times' do
     it 'accepts rendering that partial twice' do
-      controller = build_response(partial: '_customer') do
+      controller = build_fake_response(partial: '_customer') do
         render partial: 'customer', collection: [1,2]
       end
 
@@ -71,7 +71,7 @@ describe Shoulda::Matchers::ActionController::RenderTemplateMatcher do
 
   context 'a controller that does not render a template' do
     it 'rejects rendering a template' do
-      expect(build_response { render nothing: true }).
+      expect(build_fake_response { render nothing: true }).
         not_to render_template(:show)
     end
   end

data/spec/shoulda/matchers/action_controller/render_with_layout_matcher_spec.rb

@@ -18,14 +18,14 @@ describe Shoulda::Matchers::ActionController::RenderWithLayoutMatcher do
 
     def controller_with_wide_layout
       create_view('layouts/wide.html.erb', 'some content, <%= yield %>')
-      build_response { render layout: 'wide' }
+      build_fake_response { render layout: 'wide' }
     end
   end
 
   context 'a controller that renders without a layout' do
 
     it 'rejects rendering with a layout' do
-      controller_without_layout = build_response { render layout: false }
+      controller_without_layout = build_fake_response { render layout: false }
 
       expect(controller_without_layout).not_to render_with_layout
     end
@@ -33,7 +33,7 @@ describe Shoulda::Matchers::ActionController::RenderWithLayoutMatcher do
 
   context 'a controller that renders a partial' do
     it 'rejects rendering with a layout' do
-      controller_with_partial = build_response { render partial: 'partial' }
+      controller_with_partial = build_fake_response { render partial: 'partial' }
 
       expect(controller_with_partial).not_to render_with_layout
     end
@@ -57,7 +57,7 @@ describe Shoulda::Matchers::ActionController::RenderWithLayoutMatcher do
     end
 
     def controller_without_layout
-      build_response { render layout: false }
+      build_fake_response { render layout: false }
     end
   end
 end

data/spec/shoulda/matchers/action_controller/rescue_from_matcher_spec.rb

@@ -2,20 +2,31 @@ require 'spec_helper'
 
 describe Shoulda::Matchers::ActionController::RescueFromMatcher do
   context 'a controller that rescues from RuntimeError' do
-    it "asserts controller is setup with rescue_from" do
+    it 'asserts controller is setup with rescue_from' do
       expect(controller_with_rescue_from).to rescue_from RuntimeError
     end
 
     context 'with a handler method' do
-      it "asserts rescue_from was set up with handler method" do
-        expect(controller_with_rescue_from_and_method).to rescue_from(RuntimeError).with(:error_method)
+      it 'asserts rescue_from can find the handler when it is public' do
+        controller = controller_with_rescue_from_and_method(:public)
+        check_rescue_with_method_for(controller)
       end
 
-      it "asserts rescue_from was not set up with incorrect handler method" do
+      it 'asserts rescue_from can find the handler when it is protected' do
+        controller = controller_with_rescue_from_and_method(:protected)
+        check_rescue_with_method_for(controller)
+      end
+
+      it 'asserts rescue_from can find the handler when it is private' do
+        controller = controller_with_rescue_from_and_method(:private)
+        check_rescue_with_method_for(controller)
+      end
+
+      it 'asserts rescue_from was not set up with incorrect handler method' do
         expect(controller_with_rescue_from_and_method).not_to rescue_from(RuntimeError).with(:other_method)
       end
 
-      it "asserts the controller responds to the handler method" do
+      it 'asserts the controller responds to the handler method' do
         matcher = rescue_from(RuntimeError).with(:error_method)
         expect(matcher.matches?(controller_with_rescue_from_and_invalid_method)).to eq false
         expect(matcher.failure_message).to match(/does not respond to/)
@@ -23,7 +34,7 @@ describe Shoulda::Matchers::ActionController::RescueFromMatcher do
     end
 
     context 'without a handler method' do
-      it "the handler method is not included in the description" do
+      it 'the handler method is not included in the description' do
         matcher = rescue_from(RuntimeError)
         expect(matcher.matches?(controller_with_rescue_from)).to eq true
         expect(matcher.description).not_to match(/with #/)
@@ -32,32 +43,48 @@ describe Shoulda::Matchers::ActionController::RescueFromMatcher do
   end
 
   context 'a controller that does not rescue from RuntimeError' do
-    it "asserts controller is not setup with rescue_from" do
+    it 'asserts controller is not setup with rescue_from' do
       matcher = rescue_from RuntimeError
-      expect(define_controller("RandomController")).not_to matcher
+      expect(define_controller('RandomController')).not_to matcher
       expect(matcher.failure_message_when_negated).to match(/Did not expect \w+ to rescue from/)
     end
   end
 
+  def check_rescue_with_method_for(controller)
+    expect(controller).to rescue_from(RuntimeError).with(:error_method)
+  end
+
   def controller_with_rescue_from
-    define_controller "RescueRuntimeError" do
+    define_controller 'RescueRuntimeError' do
       rescue_from(RuntimeError) {}
     end
   end
 
   def controller_with_rescue_from_and_invalid_method
-    define_controller "RescueRuntimeErrorWithMethod" do
+    define_controller 'RescueRuntimeErrorWithMethod' do
       rescue_from RuntimeError, with: :error_method
     end
   end
 
-  def controller_with_rescue_from_and_method
+  def controller_with_rescue_from_and_method(access = :public)
     controller = controller_with_rescue_from_and_invalid_method
     class << controller
       def error_method
         true
       end
     end
+
+    case access
+    when :protected
+      class << controller
+        protected :error_method
+      end
+    when :private
+      class << controller
+        private :error_method
+      end
+    end
+
     controller
   end
 end

data/spec/shoulda/matchers/action_controller/respond_with_matcher_spec.rb

@@ -24,7 +24,7 @@ describe Shoulda::Matchers::ActionController::RespondWithMatcher do
   end
 
   def controller_with_status(status)
-    build_response do
+    build_fake_response do
       render text: 'text', status: status
     end
   end

data/spec/shoulda/matchers/action_controller/set_session_matcher_spec.rb

@@ -41,7 +41,7 @@ describe Shoulda::Matchers::ActionController::SetSessionMatcher do
     end
 
     def controller_with_session(session_hash)
-      build_response do
+      build_fake_response do
         session_hash.each do |key, value|
           session[key] = value
         end

data/spec/shoulda/matchers/action_controller/set_the_flash_matcher_spec.rb

@@ -95,7 +95,7 @@ describe Shoulda::Matchers::ActionController::SetTheFlashMatcher do
 
   context 'a controller that sets flash and flash.now' do
     it 'accepts setting any flash.now message' do
-      controller = build_response do
+      controller = build_fake_response do
         flash.now[:notice] = 'value'
         flash[:success] = 'great job'
       end
@@ -105,7 +105,7 @@ describe Shoulda::Matchers::ActionController::SetTheFlashMatcher do
     end
 
     it 'accepts setting a matched flash.now message' do
-      controller = build_response do
+      controller = build_fake_response do
         flash.now[:notice] = 'value'
         flash[:success] = 'great job'
       end
@@ -115,7 +115,7 @@ describe Shoulda::Matchers::ActionController::SetTheFlashMatcher do
     end
 
     it 'rejects setting a different flash.now message' do
-      controller = build_response do
+      controller = build_fake_response do
         flash.now[:notice] = 'value'
         flash[:success] = 'great job'
       end
@@ -132,11 +132,11 @@ describe Shoulda::Matchers::ActionController::SetTheFlashMatcher do
   end
 
   def controller_with_no_flashes
-    build_response
+    build_fake_response
   end
 
   def controller_with_flash(flash_hash)
-    build_response do
+    build_fake_response do
       flash_hash.each do |key, value|
         flash[key] = value
       end
@@ -144,7 +144,7 @@ describe Shoulda::Matchers::ActionController::SetTheFlashMatcher do
   end
 
   def controller_with_flash_now(flash_hash = { notice: 'hi' })
-    build_response do
+    build_fake_response do
       flash_hash.each do |key, value|
         flash.now[key] = value
       end