From 27854caea22dbba0f1a244e1c127f5eb2a6a86d8 Mon Sep 17 00:00:00 2001 From: dewski Date: Wed, 14 Mar 2012 05:33:02 -0700 Subject: [PATCH] Add default options to whitelist --- test/test_helper.rb | 2 +- test/unit/mail_gate/filter_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test_helper.rb b/test/test_helper.rb index 83cf001..0b14869 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -28,7 +28,7 @@ class Test::Unit::TestCase # Returns instance of Mail::Message. def with_whitelist(options={}) filter = MailGate::Filter.new \ - :whitelist => options.delete(:whitelist), + :whitelist => options.fetch(:whitelist, /.*/), :subject_prefix => options.delete(:subject_prefix), :append_emails => options.delete(:append_emails) diff --git a/test/unit/mail_gate/filter_test.rb b/test/unit/mail_gate/filter_test.rb index 987779b..adf2187 100644 --- a/test/unit/mail_gate/filter_test.rb +++ b/test/unit/mail_gate/filter_test.rb @@ -9,7 +9,7 @@ def test_without_whitelist_regex def test_with_whitelist_as_string mail = with_whitelist \ :to => 'garrett@site.com', - :whitelist => '@site.com' + :whitelist => /\@site.com/ assert_equal %w{ garrett@site.com }, mail.to end