diff options
author | Robin Houston <robin.houston@gmail.com> | 2011-12-04 22:53:43 +0000 |
---|---|---|
committer | Robin Houston <robin.houston@gmail.com> | 2011-12-04 22:53:43 +0000 |
commit | 40f0d929727694eba21c934cb3732574cf84f6b6 (patch) | |
tree | f4995e43c897bda5a5d878dbdc6df3fb65eddf97 /spec/lib | |
parent | fe6d2c7a1609d9088c136762d7d89f7dc01a21ea (diff) | |
parent | 00caf911d7b60cbd3dea0ec070321b5b6aa6a79d (diff) |
Merge branch 'develop' of github.com:sebbacon/alaveteli into develop
Diffstat (limited to 'spec/lib')
-rw-r--r-- | spec/lib/tmail_extensions_spec.rb | 1 | ||||
-rw-r--r-- | spec/lib/whatdotheyknow/strip_empty_sessions_spec.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/spec/lib/tmail_extensions_spec.rb b/spec/lib/tmail_extensions_spec.rb index ffb8cb178..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 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) |