Skip to content

Commit

Permalink
Minor fixes after review
Browse files Browse the repository at this point in the history
  • Loading branch information
Richard Pijnenburg authored and jordansissel committed Sep 30, 2014
1 parent 6daeb22 commit 79c4802
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
1 change: 0 additions & 1 deletion spec/core/conditionals_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ def conditional(expression, &block)
end

describe "conditionals in output" do
extend LogStash::RSpec
extend ConditionalFanciness

describe "simple" do
Expand Down
2 changes: 1 addition & 1 deletion spec/logstash_helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions spec/util/json_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 79c4802

Please sign in to comment.