Apply reviewer's comments

- Refactor verifier logic
- Nest all specs in one `describe` block

Co-authored-by: Jose Blanco <jose.blanco@thoughtbot.com>

lib/shoulda/matchers/active_record/association_matchers/model_reflection.rb

@@ -13,13 +13,7 @@ def initialize(reflection)
           end
 
           def associated_class
-            associated_class = reflection.klass
-
-            if subject.strict_loading_by_default && !(reflection.options[:strict_loading] == false)
-              reflection.options[:strict_loading] = true
-            end
-
-            associated_class
+            reflection.klass
           end
 
           def polymorphic?
@@ -76,6 +70,10 @@ def has_and_belongs_to_many_name
             reflection.options[:through]
           end
 
+          def strict_loading?
+            reflection.options.fetch(:strict_loading, subject.strict_loading_by_default)
+          end
+
           protected
 
           attr_reader :reflection, :subject

lib/shoulda/matchers/active_record/association_matchers/option_verifier.rb

@@ -122,6 +122,10 @@ def actual_value_for_class_name
             reflector.associated_class
           end
 
+          def actual_value_for_strict_loading
+            reflection.strict_loading?
+          end
+
           def actual_value_for_option(name)
             option_value = reflection.options[name]