Fix test suite to properly tag example groups

When running unit tests we need to ensure that we are simulating how
other people will use the matchers as best we can. This means, for
instance, tagging any example groups that test controller matchers as
controller example groups.

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

@@ -1,6 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActionController::CallbackMatcher do
+describe Shoulda::Matchers::ActionController::CallbackMatcher, type: :controller do
   shared_examples 'CallbackMatcher' do |kind, callback_type|
     let(:kind) { kind }
     let(:callback_type) { callback_type }

spec/unit/shoulda/matchers/action_controller/filter_param_matcher_spec.rb

@@ -1,6 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActionController::FilterParamMatcher do
+describe Shoulda::Matchers::ActionController::FilterParamMatcher, type: :controller do
   it 'accepts filtering a filtered parameter' do
     filter(:secret)
 

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

@@ -1,6 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActionController::RedirectToMatcher do
+describe Shoulda::Matchers::ActionController::RedirectToMatcher, type: :controller do
   context 'a controller that redirects' do
     it 'accepts redirecting to that url' do
       expect(controller_redirecting_to('/some/url')).to redirect_to('/some/url')

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

@@ -1,6 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActionController::RenderTemplateMatcher do
+describe Shoulda::Matchers::ActionController::RenderTemplateMatcher, type: :controller do
   include ActionController::TemplateAssertions
 
   context 'a controller that renders a template' do

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

@@ -1,6 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActionController::RenderWithLayoutMatcher do
+describe Shoulda::Matchers::ActionController::RenderWithLayoutMatcher, type: :controller do
   include ActionController::TemplateAssertions
 
   context 'a controller that renders with a layout' do

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

@@ -1,6 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActionController::RescueFromMatcher do
+describe Shoulda::Matchers::ActionController::RescueFromMatcher, type: :controller do
   context 'a controller that rescues from RuntimeError' do
     it 'asserts controller is setup with rescue_from' do
       expect(controller_with_rescue_from).to rescue_from RuntimeError

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

@@ -1,6 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActionController::RespondWithMatcher do
+describe Shoulda::Matchers::ActionController::RespondWithMatcher, type: :controller do
   statuses = { success: 200, redirect: 301, missing: 404, error: 500,
     not_implemented: 501 }
 

spec/unit/shoulda/matchers/action_controller/route_params_spec.rb

@@ -1,6 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActionController::RouteParams do
+describe Shoulda::Matchers::ActionController::RouteParams, type: :controller do
   describe "#normalize" do
     context "when the route parameters is a hash" do
       it "stringifies the values in the hash" do

spec/unit/shoulda/matchers/action_controller/set_flash_matcher_spec.rb

@@ -1,6 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActionController do
+describe Shoulda::Matchers::ActionController, type: :controller do
   describe '#set_the_flash' do
     it 'is deprecated in favor of #set_flash' do
       expect { set_the_flash }.to deprecate(:set_the_flash, :set_flash)

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

@@ -1,6 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActionController, '#set_session' do
+describe Shoulda::Matchers::ActionController, '#set_session', type: :controller do
   context 'passing an argument to the initializer' do
     it 'is deprecated in favor of using #[]' do
       expectation = proc { set_session(:foo) }

spec/unit/shoulda/matchers/action_controller/strong_parameters_matcher_spec.rb

@@ -1,6 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActionController do
+describe Shoulda::Matchers::ActionController, type: :controller do
   describe '#permit' do
     it 'matches when the sent parameter is allowed' do
       controller_for_resource_with_strong_parameters(action: :create) do

spec/unit/shoulda/matchers/active_model/allow_mass_assignment_of_matcher_spec.rb

@@ -1,6 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActiveModel::AllowMassAssignmentOfMatcher do
+describe Shoulda::Matchers::ActiveModel::AllowMassAssignmentOfMatcher, type: :model do
   context '#description' do
     context 'without a role' do
       it 'includes the attribute name' do

spec/unit/shoulda/matchers/active_model/allow_value_matcher_spec.rb

@@ -1,6 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActiveModel::AllowValueMatcher do
+describe Shoulda::Matchers::ActiveModel::AllowValueMatcher, type: :model do
   context "#description" do
     it 'describes itself with multiple values' do
       matcher = allow_value('foo', 'bar').for(:baz)

spec/unit/shoulda/matchers/active_model/disallow_value_matcher_spec.rb

@@ -1,6 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActiveModel::DisallowValueMatcher do
+describe Shoulda::Matchers::ActiveModel::DisallowValueMatcher, type: :model do
   context 'an attribute with a format validation' do
     it 'does not match if the value is allowed' do
       expect(validating_format(with: /abc/)).not_to matcher('abcde').for(:attr)

spec/unit/shoulda/matchers/active_model/exception_message_finder_spec.rb

@@ -1,6 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActiveModel::ExceptionMessageFinder do
+describe Shoulda::Matchers::ActiveModel::ExceptionMessageFinder, type: :model do
   if active_model_3_2?
     context '#allow_description' do
       it 'describes its attribute' do

spec/unit/shoulda/matchers/active_model/have_secure_password_matcher_spec.rb

@@ -1,6 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActiveModel::HaveSecurePasswordMatcher do
+describe Shoulda::Matchers::ActiveModel::HaveSecurePasswordMatcher, type: :model do
   if active_model_3_1?
     it 'matches when the subject configures has_secure_password with default options' do
       working_model = define_model(:example, password_digest: :string) { has_secure_password }

spec/unit/shoulda/matchers/active_model/validate_absence_of_matcher_spec.rb

@@ -1,6 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActiveModel::ValidateAbsenceOfMatcher do
+describe Shoulda::Matchers::ActiveModel::ValidateAbsenceOfMatcher, type: :model do
   if active_model_4_0?
     def self.available_column_types
       [

spec/unit/shoulda/matchers/active_model/validate_acceptance_of_matcher_spec.rb

@@ -1,6 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActiveModel::ValidateAcceptanceOfMatcher do
+describe Shoulda::Matchers::ActiveModel::ValidateAcceptanceOfMatcher, type: :model do
   context 'a model with an acceptance validation' do
     it 'accepts when the attributes match' do
       expect(validating_acceptance).to matcher

spec/unit/shoulda/matchers/active_model/validate_confirmation_of_matcher_spec.rb

@@ -1,6 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActiveModel::ValidateConfirmationOfMatcher do
+describe Shoulda::Matchers::ActiveModel::ValidateConfirmationOfMatcher, type: :model do
   include UnitTests::ConfirmationMatcherHelpers
 
   context '#description' do

spec/unit/shoulda/matchers/active_model/validate_exclusion_of_matcher_spec.rb

@@ -1,6 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActiveModel do
+describe Shoulda::Matchers::ActiveModel, type: :model do
   describe '#ensure_exclusion_of' do
     it 'is aliased to #validate_exclusion_of' do
       allow(matchers).to receive(:validate_exclusion_of)
@@ -17,7 +17,7 @@ describe Shoulda::Matchers::ActiveModel do
   end
 end
 
-describe Shoulda::Matchers::ActiveModel::ValidateExclusionOfMatcher do
+describe Shoulda::Matchers::ActiveModel::ValidateExclusionOfMatcher, type: :model do
   context 'an attribute which must be excluded from a range' do
     it 'accepts ensuring the correct range' do
       expect(validating_exclusion(in: 2..5)).

spec/unit/shoulda/matchers/active_model/validate_inclusion_of_matcher_spec.rb

@@ -1,6 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActiveModel do
+describe Shoulda::Matchers::ActiveModel, type: :model do
   describe '#ensure_inclusion_of' do
     it 'is aliased to #validate_inclusion_of' do
       allow(matchers).to receive(:validate_inclusion_of)
@@ -17,7 +17,7 @@ describe Shoulda::Matchers::ActiveModel do
   end
 end
 
-describe Shoulda::Matchers::ActiveModel::ValidateInclusionOfMatcher do
+describe Shoulda::Matchers::ActiveModel::ValidateInclusionOfMatcher, type: :model do
   shared_context 'for a generic attribute' do
     def self.testing_values_of_option(option_name, &block)
       [nil, true, false].each do |option_value|

spec/unit/shoulda/matchers/active_model/validate_length_of_matcher_spec.rb

@@ -1,6 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActiveModel do
+describe Shoulda::Matchers::ActiveModel, type: :model do
   describe '#ensure_length_of' do
     it 'is aliased to #validate_length_of' do
       allow(matchers).to receive(:validate_length_of)
@@ -17,7 +17,7 @@ describe Shoulda::Matchers::ActiveModel do
   end
 end
 
-describe Shoulda::Matchers::ActiveModel::ValidateLengthOfMatcher do
+describe Shoulda::Matchers::ActiveModel::ValidateLengthOfMatcher, type: :model do
   context 'an attribute with a non-zero minimum length validation' do
     it 'accepts ensuring the correct minimum length' do
       expect(validating_length(minimum: 4)).

spec/unit/shoulda/matchers/active_model/validate_numericality_of_matcher_spec.rb

@@ -1,7 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActiveModel::ValidateNumericalityOfMatcher do
-
+describe Shoulda::Matchers::ActiveModel::ValidateNumericalityOfMatcher, type: :model do
   context 'with a model with a numericality validation' do
     it 'accepts' do
       expect(validating_numericality).to matcher

spec/unit/shoulda/matchers/active_model/validate_presence_of_matcher_spec.rb

@@ -1,6 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActiveModel::ValidatePresenceOfMatcher do
+describe Shoulda::Matchers::ActiveModel::ValidatePresenceOfMatcher, type: :model do
   context 'a model with a presence validation' do
     it 'accepts' do
       expect(validating_presence).to matcher

spec/unit/shoulda/matchers/active_model/validate_uniqueness_of_matcher_spec.rb

@@ -1,6 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActiveRecord::ValidateUniquenessOfMatcher do
+describe Shoulda::Matchers::ActiveRecord::ValidateUniquenessOfMatcher, type: :model do
   context 'a model without a a uniqueness validation' do
     it 'rejects' do
       model = define_model(:example, attr: :string) { attr_accessible :attr } .new

spec/unit/shoulda/matchers/active_record/accept_nested_attributes_for_matcher_spec.rb

@@ -1,6 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActiveRecord::AcceptNestedAttributesForMatcher do
+describe Shoulda::Matchers::ActiveRecord::AcceptNestedAttributesForMatcher, type: :model do
   it 'accepts an existing declaration' do
     expect(accepting_children).to accept_nested_attributes_for(:children)
   end

spec/unit/shoulda/matchers/active_record/association_matcher_spec.rb

@@ -1,6 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActiveRecord::AssociationMatcher do
+describe Shoulda::Matchers::ActiveRecord::AssociationMatcher, type: :model do
   context 'belong_to' do
     it 'accepts a good association with the default foreign key' do
       expect(belonging_to_parent).to belong_to(:parent)

spec/unit/shoulda/matchers/active_record/define_enum_for_matcher_spec.rb

@@ -1,6 +1,6 @@
 require "unit_spec_helper"
 
-describe Shoulda::Matchers::ActiveRecord::DefineEnumForMatcher do
+describe Shoulda::Matchers::ActiveRecord::DefineEnumForMatcher, type: :model do
   if active_record_supports_enum?
     describe "with only the attribute name specified" do
       it "accepts a record where the attribute is defined as an enum" do

spec/unit/shoulda/matchers/active_record/have_db_column_matcher_spec.rb

@@ -1,6 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActiveRecord::HaveDbColumnMatcher do
+describe Shoulda::Matchers::ActiveRecord::HaveDbColumnMatcher, type: :model do
   it 'accepts an existing database column' do
     expect(model(nickname: :string)).to have_db_column(:nickname)
   end

spec/unit/shoulda/matchers/active_record/have_db_index_matcher_spec.rb

@@ -1,6 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActiveRecord::HaveDbIndexMatcher do
+describe Shoulda::Matchers::ActiveRecord::HaveDbIndexMatcher, type: :model do
   context 'have_db_index' do
     it 'accepts an existing index' do
       expect(with_index_on(:age)).to have_db_index(:age)

spec/unit/shoulda/matchers/active_record/have_readonly_attributes_matcher_spec.rb

@@ -1,6 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActiveRecord::HaveReadonlyAttributeMatcher do
+describe Shoulda::Matchers::ActiveRecord::HaveReadonlyAttributeMatcher, type: :model do
   context 'a read-only attribute' do
     it 'accepts' do
       expect(with_readonly_attr).to have_readonly_attribute(:attr)

spec/unit/shoulda/matchers/active_record/serialize_matcher_spec.rb

@@ -1,6 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActiveRecord::SerializeMatcher do
+describe Shoulda::Matchers::ActiveRecord::SerializeMatcher, type: :model do
   it 'accepts when the attribute is serialized' do
     expect(with_serialized_attr).to serialize(:attr)
   end

spec/unit_spec_helper.rb

@@ -45,8 +45,6 @@ RSpec.configure do |config|
     config.infer_spec_type_from_file_location!
   end
 
-  config.include Shoulda::Matchers::ActionController, type: :controller
-
   UnitTests::ActiveModelHelpers.configure_example_group(config)
   UnitTests::ActiveModelVersions.configure_example_group(config)
   UnitTests::ActiveResourceBuilder.configure_example_group(config)