Undoing changes to file imports to fix tests

lib/shoulda/matchers/action_controller.rb

@@ -1,3 +1,4 @@
+require 'shoulda/matchers/action_controller/respond_with_matcher'
 require 'shoulda/matchers/action_controller/route_matcher'
 
 module Shoulda
@@ -13,7 +14,6 @@ module ActionController
       autoload :RenderTemplateMatcher, 'shoulda/matchers/action_controller/render_template_matcher'
       autoload :RenderWithLayoutMatcher, 'shoulda/matchers/action_controller/render_with_layout_matcher'
       autoload :RescueFromMatcher, 'shoulda/matchers/action_controller/rescue_from_matcher'
-      autoload :RespondWithMatcher, 'shoulda/matchers/action_controller/respond_with_matcher'
       autoload :RouteParams, 'shoulda/matchers/action_controller/route_params'
       autoload :SessionStore, 'shoulda/matchers/action_controller/session_store'
       autoload :SetFlashMatcher, 'shoulda/matchers/action_controller/set_flash_matcher'

lib/shoulda/matchers/active_model.rb

@@ -1,3 +1,10 @@
+require 'shoulda/matchers/active_model/allow_mass_assignment_of_matcher'
+require 'shoulda/matchers/active_model/helpers'
+require 'shoulda/matchers/active_model/qualifiers'
+require 'shoulda/matchers/active_model/validation_matcher'
+require 'shoulda/matchers/active_model/validate_absence_of_matcher'
+require 'shoulda/matchers/active_model/validate_presence_of_matcher'
+
 module Shoulda
   module Matchers
     # This module provides matchers that are used to test behavior within
@@ -57,25 +64,19 @@ module Matchers
     #     end
     #
     module ActiveModel
-      autoload :AllowMassAssignmentOfMatcher, 'shoulda/matchers/active_model/allow_mass_assignment_of_matcher'
       autoload :AllowValueMatcher, 'shoulda/matchers/active_model/allow_value_matcher'
       autoload :CouldNotDetermineValueOutsideOfArray, 'shoulda/matchers/active_model/errors'
       autoload :CouldNotSetPasswordError, 'shoulda/matchers/active_model/errors'
       autoload :DisallowValueMatcher, 'shoulda/matchers/active_model/disallow_value_matcher'
       autoload :HaveSecurePasswordMatcher, 'shoulda/matchers/active_model/have_secure_password_matcher'
-      autoload :Helpers, 'shoulda/matchers/active_model/helpers'
       autoload :NonNullableBooleanError, 'shoulda/matchers/active_model/errors'
       autoload :NumericalityMatchers, 'shoulda/matchers/active_model/numericality_matchers'
-      autoload :Qualifiers, 'shoulda/matchers/active_model/qualifiers'
-      autoload :ValidateAbsenceOfMatcher, 'shoulda/matchers/active_model/validate_absence_of_matcher'
       autoload :ValidateAcceptanceOfMatcher, 'shoulda/matchers/active_model/validate_acceptance_of_matcher'
       autoload :ValidateConfirmationOfMatcher, 'shoulda/matchers/active_model/validate_confirmation_of_matcher'
       autoload :ValidateExclusionOfMatcher, 'shoulda/matchers/active_model/validate_exclusion_of_matcher'
       autoload :ValidateInclusionOfMatcher, 'shoulda/matchers/active_model/validate_inclusion_of_matcher'
       autoload :ValidateLengthOfMatcher, 'shoulda/matchers/active_model/validate_length_of_matcher'
       autoload :ValidateNumericalityOfMatcher, 'shoulda/matchers/active_model/validate_numericality_of_matcher'
-      autoload :ValidatePresenceOfMatcher, 'shoulda/matchers/active_model/validate_presence_of_matcher'
-      autoload :ValidationMatcher, 'shoulda/matchers/active_model/validation_matcher'
       autoload :Validator, 'shoulda/matchers/active_model/validator'
     end
   end

lib/shoulda/matchers/active_record.rb

@@ -1,3 +1,5 @@
+require "shoulda/matchers/active_record/validate_uniqueness_of_matcher"
+
 module Shoulda
   module Matchers
     # This module provides matchers that are used to test behavior within
@@ -16,7 +18,6 @@ module ActiveRecord
       autoload :HaveSecureTokenMatcher, 'shoulda/matchers/active_record/have_secure_token_matcher'
       autoload :SerializeMatcher, 'shoulda/matchers/active_record/serialize_matcher'
       autoload :Uniqueness, 'shoulda/matchers/active_record/uniqueness'
-      autoload :ValidateUniquenessOfMatcher, 'shoulda/matchers/active_record/validate_uniqueness_of_matcher'
     end
   end
 end

lib/shoulda/matchers/doublespeak.rb

@@ -10,7 +10,6 @@ module Doublespeak
       autoload :MethodCall, 'shoulda/matchers/doublespeak/method_call'
       autoload :ObjectDouble, 'shoulda/matchers/doublespeak/object_double'
       autoload :ProxyImplementation, 'shoulda/matchers/doublespeak/proxy_implementation'
-      autoload :StubImplementation, 'shoulda/matchers/doublespeak/stub_implementation'
       autoload :World, 'shoulda/matchers/doublespeak/world'
 
       class << self
@@ -37,3 +36,4 @@ def debug(&block)
   end
 end
 
+require 'shoulda/matchers/doublespeak/stub_implementation'

lib/shoulda/matchers/independent.rb

@@ -1,9 +1,10 @@
+require 'shoulda/matchers/independent/delegate_method_matcher'
+
 module Shoulda
   module Matchers
     # This module provides matchers that are used to test behavior outside of
     # Rails-specific classes.
     module Independent
-      autoload :DelegateMethodMatcher, 'shoulda/matchers/independent/delegate_method_matcher'
     end
   end
 end

lib/shoulda/matchers/independent/delegate_method_matcher.rb

@@ -1,3 +1,6 @@
+require 'shoulda/matchers/doublespeak'
+require 'shoulda/matchers/matcher_context'
+
 module Shoulda
   module Matchers
     module Independent

lib/shoulda/matchers/integrations.rb

@@ -39,4 +39,5 @@ def test_framework_registry
   end
 end
 
+require 'shoulda/matchers/integrations/libraries'
 require 'shoulda/matchers/integrations/test_frameworks'

lib/shoulda/matchers/integrations/registry.rb

@@ -26,5 +26,3 @@ def find_class!(name)
     end
   end
 end
-
-require 'shoulda/matchers/integrations/libraries'

lib/shoulda/matchers/integrations/test_frameworks.rb

@@ -1,3 +1,5 @@
+require 'shoulda/matchers/integrations/test_frameworks/minitest_4'
+require 'shoulda/matchers/integrations/test_frameworks/minitest_5'
 require 'shoulda/matchers/integrations/test_frameworks/missing_test_framework'
 require 'shoulda/matchers/integrations/test_frameworks/rspec'