From 79c4802e45656ec3f2aaebf18aa39807c32e5ed2 Mon Sep 17 00:00:00 2001 From: Richard Pijnenburg Date: Mon, 22 Sep 2014 19:20:19 +0000 Subject: [PATCH] Minor fixes after review Fixes #1758 --- spec/core/conditionals_spec.rb | 1 - spec/logstash_helpers.rb | 2 +- spec/util/json_spec.rb | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/spec/core/conditionals_spec.rb b/spec/core/conditionals_spec.rb index 0c7fceb8201..2bb46b2825f 100644 --- a/spec/core/conditionals_spec.rb +++ b/spec/core/conditionals_spec.rb @@ -22,7 +22,6 @@ def conditional(expression, &block) end describe "conditionals in output" do - extend LogStash::RSpec extend ConditionalFanciness describe "simple" do diff --git a/spec/logstash_helpers.rb b/spec/logstash_helpers.rb index 40e6af09c50..0439661e059 100644 --- a/spec/logstash_helpers.rb +++ b/spec/logstash_helpers.rb @@ -14,7 +14,7 @@ def type(default_type) def tags(*tags) let(:default_tags) { tags } - puts "Setting default tags: #{@default_tags}" + puts "Setting default tags: #{tags}" end def sample(sample_event, &block) diff --git a/spec/util/json_spec.rb b/spec/util/json_spec.rb index f7bd42a08e3..a745f91a1e8 100644 --- a/spec/util/json_spec.rb +++ b/spec/util/json_spec.rb @@ -42,17 +42,17 @@ context "jruby serialize" do it "should respond to dump and serialize object" do -expect(JrJackson::Json).to receive(:dump).with(string).and_call_original + expect(JrJackson::Json).to receive(:dump).with(string).and_call_original expect(LogStash::Json.dump(string)).to eql(json_string) end it "should call JrJackson::Raw.generate for Hash" do -#expect(JrJackson::Raw).to receive(:generate).with(hash).and_call_original + expect(JrJackson::Raw).to receive(:generate).with(hash).and_call_original expect(LogStash::Json.dump(hash)).to eql(json_hash) end it "should call JrJackson::Raw.generate for Array" do -#expect(JrJackson::Raw).to receive(:generate).with(array).and_call_original + expect(JrJackson::Raw).to receive(:generate).with(array).and_call_original expect(LogStash::Json.dump(array)).to eql(json_array) end