spec/lib/logstasher_spec.rb in logstasher-0.4.7 vs spec/lib/logstasher_spec.rb in logstasher-0.4.8

@@ -36,19 +36,28 @@
     let(:params)  { {'a' => '1', 'b' => 2, 'action' => 'action', 'controller' => 'test'}.with_indifferent_access }
     let(:payload) { {:params => params} }
     let(:request) { double(:params => params, :remote_ip => '10.0.0.1')}
     after do
       LogStasher.custom_fields = []
+      LogStasher.log_controller_parameters = false
     end
     it 'appends default parameters to payload' do
+      LogStasher.log_controller_parameters = true
       LogStasher.custom_fields = []
       LogStasher.add_default_fields_to_payload(payload, request)
       payload[:ip].should == '10.0.0.1'
       payload[:route].should == 'test#action'
       payload[:parameters].should == {'a' => '1', 'b' => 2}
       LogStasher.custom_fields.should == [:ip, :route, :parameters]
     end
+
+    it 'does not include parameters when not configured to' do
+      LogStasher.custom_fields = []
+      LogStasher.add_default_fields_to_payload(payload, request)
+      payload.should_not have_key(:parameters)
+      LogStasher.custom_fields.should == [:ip, :route]
+    end
   end
 
   describe '.append_custom_params' do
     let(:block) { ->{} }
     it 'defines a method in ActionController::Base' do
@@ -57,11 +66,11 @@
     end
   end
 
   describe '.setup' do
     let(:logger) { double }
-    let(:logstasher_config) { double(:logger => logger,:log_level => 'warn') }
+    let(:logstasher_config) { double(:logger => logger,:log_level => 'warn',:log_controller_parameters => nil) }
     let(:config) { double(:logstasher => logstasher_config) }
     let(:app) { double(:config => config) }
     before do
       config.stub(:action_dispatch => double(:rack_cache => false))
     end
@@ -72,9 +81,10 @@
       LogStasher::RequestLogSubscriber.should_receive(:attach_to).with(:action_controller)
       logger.should_receive(:level=).with('warn')
       LogStasher.setup(app)
       LogStasher.enabled.should be_true
       LogStasher.custom_fields.should == []
+      LogStasher.log_controller_parameters.should == false
     end
   end
 
   describe '.suppress_app_logs' do
     let(:logstasher_config){ double(:logstasher => double(:suppress_app_log => true))}