oops, move deprecation warning out of test and into code

github · Jan 6, 2016 · 6cef8c7 · 6cef8c7
1 parent 7915516
commit 6cef8c7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/fixtures/rails_3_2_22_no_init/app/controllers/other_things_controller.rb b/fixtures/rails_3_2_22_no_init/app/controllers/other_things_controller.rb
@@ -9,7 +9,6 @@ def other_action
   end
 
   def secure_header_options_for(header, options)
-    warn "[DEPRECATION] secure_header_options_for will not be supported in secure_headers 3.x."
     if params[:action] == "other_action"
       if header == :csp
         options.merge(:style_src => "'self'")

diff --git a/lib/secure_headers.rb b/lib/secure_headers.rb
@@ -212,6 +212,7 @@ def set_x_permitted_cross_domain_policies_header(options=self.class.secure_heade
     # we can't use ||= because I'm overloading false => disable, nil => default
     # both of which trigger the conditional assignment
     def secure_header_options_for(type, options)
+      warn "[DEPRECATION] secure_header_options_for will not be supported in secure_headers 3.x."
       options.nil? ? ::SecureHeaders::Configuration.send(type) : options
     end