diff options
author | Francis Irving <francis@mysociety.org> | 2010-09-15 11:34:08 +0100 |
---|---|---|
committer | Francis Irving <francis@mysociety.org> | 2010-09-15 11:34:08 +0100 |
commit | 6333fa139bc8b022162d02ef4d301d0a00e3f499 (patch) | |
tree | d737244101bbcb6fc1d9dd63967b3348f2f070f4 /spec/lib | |
parent | ad579293d65f99fd19a770b807dcb2753623f05a (diff) |
Make path work in Ruby 1.9
Diffstat (limited to 'spec/lib')
-rw-r--r-- | spec/lib/fcgi_fixes_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/format_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/mysociety_validate_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/sendmail_return_path_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/timezone_fixes_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/tmail_extensions_spec.rb | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/spec/lib/fcgi_fixes_spec.rb b/spec/lib/fcgi_fixes_spec.rb index 92b954645..edc1c9d98 100644 --- a/spec/lib/fcgi_fixes_spec.rb +++ b/spec/lib/fcgi_fixes_spec.rb @@ -1,6 +1,6 @@ # This is a test of the monkey patches in lib/fcgi_fixes.rb -require File.dirname(__FILE__) + '/../spec_helper' +require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') require 'railties/lib/fcgi_handler.rb' diff --git a/spec/lib/format_spec.rb b/spec/lib/format_spec.rb index 8f0ebbed9..c4d43a8f0 100644 --- a/spec/lib/format_spec.rb +++ b/spec/lib/format_spec.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../spec_helper' +require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe "when making clickable" do diff --git a/spec/lib/mysociety_validate_spec.rb b/spec/lib/mysociety_validate_spec.rb index 1d59677be..ba20694bb 100644 --- a/spec/lib/mysociety_validate_spec.rb +++ b/spec/lib/mysociety_validate_spec.rb @@ -1,7 +1,7 @@ # This is tests for the code in commonlib/rblib/validate.rb # XXX move the tests into commonlib -require File.dirname(__FILE__) + '/../spec_helper' +require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe "when checking text uses mixed capitals" do diff --git a/spec/lib/sendmail_return_path_spec.rb b/spec/lib/sendmail_return_path_spec.rb index 6556d0888..0a9f60953 100644 --- a/spec/lib/sendmail_return_path_spec.rb +++ b/spec/lib/sendmail_return_path_spec.rb @@ -1,6 +1,6 @@ # This is a test of the monkey patches in sendmail_return_path.rb -require File.dirname(__FILE__) + '/../spec_helper' +require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe "when sending email with an altered return path" do diff --git a/spec/lib/timezone_fixes_spec.rb b/spec/lib/timezone_fixes_spec.rb index 9ceb58a13..eef7e865c 100644 --- a/spec/lib/timezone_fixes_spec.rb +++ b/spec/lib/timezone_fixes_spec.rb @@ -2,7 +2,7 @@ # We use EximLogDone here just as a totally random model that has a datetime type. -require File.dirname(__FILE__) + '/../spec_helper' +require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe "when doing things with timezones" do diff --git a/spec/lib/tmail_extensions_spec.rb b/spec/lib/tmail_extensions_spec.rb index 1c913283a..d1a56f2e2 100644 --- a/spec/lib/tmail_extensions_spec.rb +++ b/spec/lib/tmail_extensions_spec.rb @@ -1,7 +1,7 @@ # This is a test of the set_content_type monkey patch in # lib/tmail_extensions.rb -require File.dirname(__FILE__) + '/../spec_helper' +require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe "when using TMail" do |