1 files changed, 4 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/associations/builder/has_many.rb b/activerecord/lib/active_record/associations/builder/has_many.rb
index 6920bf0633..d0bdfa7d9c 100644
--- a/activerecord/lib/active_record/associations/builder/has_many.rb
+++ b/activerecord/lib/active_record/associations/builder/has_many.rb
@@ -19,14 +19,12 @@ module ActiveRecord::Associations::Builder
     private
 
       def configure_dependency
-        if options[:dependent]
+        if dependent = options[:dependent]
+          check_valid_dependent! dependent, [:destroy, :delete_all, :nullify, :restrict]
+          dependent_restrict_deprecation_warning if dependent == :restrict
 
-          check_dependent_valid [:destroy, :delete_all, :nullify, :restrict]
-
-          dependent_restrict_deprecation_warning if options[:dependent] == :restrict
-          send("define_#{options[:dependent]}_dependency_method")
+          send("define_#{dependent}_dependency_method")
           model.before_destroy dependency_method_name
-
         end
       end