Merge branch 'release/0.5' into wdtk

Conflicts:
	.gitignore

2 files changed, 11 insertions, 1 deletions

diff --git a/spec/lib/tmail_extensions_spec.rb b/spec/lib/tmail_extensions_spec.rb
index c647fe522..6a55c34da 100644
--- a/spec/lib/tmail_extensions_spec.rb
+++ b/spec/lib/tmail_extensions_spec.rb
@@ -1,3 +1,4 @@
+# coding: utf-8
 # This is a test of the set_content_type monkey patch in
 # lib/tmail_extensions.rb
 
@@ -27,5 +28,14 @@ describe "when using TMail" do
         mail.to.should == ["request-66666-caa77777@whatdotheyknow.com", "foi@example.com"]
     end
 
+    it 'should convert to utf8' do
+        # NB this isn't actually a TMail extension, but is core TMail;
+        # this was just a convenient place to assert the UTF8
+        # conversion is working
+        mail = TMail::Mail.parse(load_file_fixture('iso8859_2_raw_email.email'))
+        mail.subject.should have_text(/gjatë/u)
+        mail.body.is_utf8?.should == true
+    end
+
 end
 
diff --git a/spec/lib/whatdotheyknow/strip_empty_sessions_spec.rb b/spec/lib/whatdotheyknow/strip_empty_sessions_spec.rb
index 1cf5e3d25..9bd5ccb93 100644
--- a/spec/lib/whatdotheyknow/strip_empty_sessions_spec.rb
+++ b/spec/lib/whatdotheyknow/strip_empty_sessions_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 describe WhatDoTheyKnow::StripEmptySessions do
   
   def make_response(session_data, response_headers)