Merge branch 'tmail-to-mail-tests' into rails-3-develop

This merge brings in a number of tests and fixes for the handling
of mail under Mail / Rails 3 instead of TMail / Rails 2.

Conflicts:
	config/initializers/alaveteli.rb

2 files changed, 3 insertions, 9 deletions

diff --git a/spec/support/email_helpers.rb b/spec/support/email_helpers.rb
index 7e98c39f6..252b1f137 100644
--- a/spec/support/email_helpers.rb
+++ b/spec/support/email_helpers.rb
@@ -8,7 +8,7 @@ end
 
 def receive_incoming_mail(email_name, email_to, email_from = 'geraldinequango@localhost')
     email_name = file_fixture_name(email_name)
-    content = File.read(email_name)
+    content = File.open(email_name, 'rb') { |f| f.read }
     content.gsub!('EMAIL_TO', email_to)
     content.gsub!('EMAIL_FROM', email_from)
     RequestMailer.receive(content)
diff --git a/spec/support/load_file_fixtures.rb b/spec/support/load_file_fixtures.rb
index 08079f654..a54505e99 100644
--- a/spec/support/load_file_fixtures.rb
+++ b/spec/support/load_file_fixtures.rb
@@ -2,13 +2,7 @@ def file_fixture_name(file_name)
     return File.join(RSpec.configuration.fixture_path, "files", file_name)
 end
 
-def load_file_fixture(file_name, as_binary=false)
+def load_file_fixture(file_name)
     file_name = file_fixture_name(file_name)
-    content = File.open(file_name, 'r') do |file|
-        if as_binary
-            file.set_encoding(Encoding::BINARY) if file.respond_to?(:set_encoding)
-        end
-        file.read
-    end
-    return content
+    return File.open(file_name, 'rb') { |f| f.read }
 end