Skip to content

Commit

Permalink
enable the test execution again by removing the broken filter, added …
Browse files Browse the repository at this point in the history
…also two development dependencies to run the test, but this test need a bit more work to do what is expected

Fixes #9
  • Loading branch information
Pere Urbon-Bayes authored and jordansissel committed Feb 27, 2015
1 parent 1f4b61e commit 08e625e
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 51 deletions.
2 changes: 2 additions & 0 deletions logstash-output-email.gemspec
Expand Up @@ -26,5 +26,7 @@ Gem::Specification.new do |s|

s.add_development_dependency 'logstash-devutils'
s.add_development_dependency 'rumbster'
s.add_development_dependency 'logstash-input-generator'

end

101 changes: 50 additions & 51 deletions spec/outputs/email_spec.rb
@@ -1,25 +1,24 @@
require "logstash/devutils/rspec/spec_helper"
require "spec_helper"
require "rumbster"
require "message_observers"

describe "outputs/email", :broken => true do

describe "outputs/email" do

port = 2525
let (:rumbster) { Rumbster.new(port) }
let (:message_observer) { MailMessageObserver.new }
port = 2525
let (:rumbster) { Rumbster.new(port) }
let (:message_observer) { MailMessageObserver.new }

before :each do
rumbster.add_observer message_observer
rumbster.start
end
before :each do
rumbster.add_observer message_observer
rumbster.start
end

after :each do
rumbster.stop
end
after :each do
rumbster.stop
end

describe "use a list of email as mail.to (LOGSTASH-827)" do
config <<-CONFIG
describe "use a list of email as mail.to (LOGSTASH-827)" do
config <<-CONFIG
input {
generator {
message => "hello world"
Expand All @@ -39,16 +38,16 @@
options => ["port", #{port}]
}
}
CONFIG
CONFIG

agent do
insist {message_observer.messages.size} == 1
insist {message_observer.messages[0].to} == ["email1@host", "email2@host"]
end
agent do
insist {message_observer.messages.size} == 1
insist {message_observer.messages[0].to} == ["email1@host", "email2@host"]
end
end

describe "use an array of email as mail.to (LOGSTASH-827)" do
config <<-CONFIG
describe "use an array of email as mail.to (LOGSTASH-827)" do
config <<-CONFIG
input {
generator {
message => "hello world"
Expand All @@ -70,16 +69,16 @@
options => ["port", #{port}]
}
}
CONFIG
CONFIG

agent do
insist {message_observer.messages.size} == 1
insist {message_observer.messages[0].to} == ["email1@host", "email2@host"]
end
agent do
insist {message_observer.messages.size} == 1
insist {message_observer.messages[0].to} == ["email1@host", "email2@host"]
end
end

describe "multi-lined text body (LOGSTASH-841)" do
config <<-CONFIG
describe "multi-lined text body (LOGSTASH-841)" do
config <<-CONFIG
input {
generator {
message => "hello world"
Expand All @@ -101,17 +100,17 @@
options => ["port", #{port}]
}
}
CONFIG
CONFIG

agent do
insist {message_observer.messages.size} == 1
insist {message_observer.messages[0].subject} == "Hello World"
insist {message_observer.messages[0].body.raw_source} == "Line1\r\nLine2\r\nLine3"
end
agent do
insist {message_observer.messages.size} == 1
insist {message_observer.messages[0].subject} == "Hello World"
insist {message_observer.messages[0].body.raw_source} == "Line1\r\nLine2\r\nLine3"
end
end

describe "use nil authenticationType (LOGSTASH-559)" do
config <<-CONFIG
describe "use nil authenticationType (LOGSTASH-559)" do
config <<-CONFIG
input {
generator {
message => "hello world"
Expand All @@ -133,17 +132,17 @@
options => ["port", #{port}, "authenticationType", "nil"]
}
}
CONFIG
CONFIG

agent do
insist {message_observer.messages.size} == 1
insist {message_observer.messages[0].subject} == "Hello World"
insist {message_observer.messages[0].body.raw_source} == "Line1\r\nLine2\r\nLine3"
end
agent do
insist {message_observer.messages.size} == 1
insist {message_observer.messages[0].subject} == "Hello World"
insist {message_observer.messages[0].body.raw_source} == "Line1\r\nLine2\r\nLine3"
end
end

describe "match on source and message (LOGSTASH-826)" do
config <<-CONFIG
describe "match on source and message (LOGSTASH-826)" do
config <<-CONFIG
input {
generator {
message => "hello world"
Expand All @@ -160,14 +159,14 @@
options => ["port", #{port}, "authenticationType", "nil"]
}
}
CONFIG
CONFIG

agent do
insist {message_observer.messages.size} == 1
insist {message_observer.messages[0].subject} == "Hello World"
insist {message_observer.messages[0].body.raw_source} == "Mail body"
end
agent do
insist {message_observer.messages.size} == 1
insist {message_observer.messages[0].subject} == "Hello World"
insist {message_observer.messages[0].body.raw_source} == "Mail body"
end
end
end


14 changes: 14 additions & 0 deletions spec/spec_helper.rb
@@ -0,0 +1,14 @@
require "logstash/devutils/rspec/spec_helper"

# use a dummy NOOP filter to test Filters::Base
class LogStash::Filters::NOOP < LogStash::Filters::Base
config_name "noop"
milestone 2

def register; end

def filter(event)
return unless filter?(event)
filter_matched(event)
end
end

0 comments on commit 08e625e

Please sign in to comment.