From e001d626695037ecda39dbfd37c5e784be071bd6 Mon Sep 17 00:00:00 2001 From: Konstantin Haase Date: Wed, 11 May 2011 09:44:02 +0200 Subject: [PATCH] adjust require lines for test helper, so it also works properly on 1.9.2 --- test/base_test.rb | 2 +- test/builder_test.rb | 2 +- test/coffee_test.rb | 2 +- test/creole_test.rb | 2 +- test/encoding_test.rb | 2 +- test/erb_test.rb | 2 +- test/extensions_test.rb | 2 +- test/filter_test.rb | 2 +- test/haml_test.rb | 2 +- test/helpers_test.rb | 2 +- test/less_test.rb | 2 +- test/liquid_test.rb | 2 +- test/mapped_error_test.rb | 2 +- test/markaby_test.rb | 2 +- test/markdown_test.rb | 2 +- test/middleware_test.rb | 2 +- test/nokogiri_test.rb | 2 +- test/radius_test.rb | 2 +- test/rdoc_test.rb | 2 +- test/readme_test.rb | 2 +- test/request_test.rb | 2 +- test/response_test.rb | 2 +- test/result_test.rb | 2 +- test/route_added_hook_test.rb | 2 +- test/routing_test.rb | 2 +- test/sass_test.rb | 2 +- test/scss_test.rb | 2 +- test/server_test.rb | 2 +- test/settings_test.rb | 2 +- test/sinatra_test.rb | 2 +- test/slim_test.rb | 2 +- test/static_test.rb | 2 +- test/templates_test.rb | 2 +- test/textile_test.rb | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/test/base_test.rb b/test/base_test.rb index 9cb41233..32a0d48d 100644 --- a/test/base_test.rb +++ b/test/base_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) class BaseTest < Test::Unit::TestCase def test_default diff --git a/test/builder_test.rb b/test/builder_test.rb index 40c777f4..2450e813 100644 --- a/test/builder_test.rb +++ b/test/builder_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) begin require 'builder' diff --git a/test/coffee_test.rb b/test/coffee_test.rb index c8c84429..ae049260 100644 --- a/test/coffee_test.rb +++ b/test/coffee_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) begin require 'coffee-script' diff --git a/test/creole_test.rb b/test/creole_test.rb index 03968550..6de3ccb1 100644 --- a/test/creole_test.rb +++ b/test/creole_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) begin require 'creole' diff --git a/test/encoding_test.rb b/test/encoding_test.rb index 70e3bbfe..a2e9f69c 100644 --- a/test/encoding_test.rb +++ b/test/encoding_test.rb @@ -1,5 +1,5 @@ # encoding: UTF-8 -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) require 'erb' class BaseTest < Test::Unit::TestCase diff --git a/test/erb_test.rb b/test/erb_test.rb index 052f2d8a..c0b5cbad 100644 --- a/test/erb_test.rb +++ b/test/erb_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) class ERBTest < Test::Unit::TestCase def engine diff --git a/test/extensions_test.rb b/test/extensions_test.rb index 8e4a5438..739c33e5 100644 --- a/test/extensions_test.rb +++ b/test/extensions_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) class ExtensionsTest < Test::Unit::TestCase module FooExtensions diff --git a/test/filter_test.rb b/test/filter_test.rb index ef7e9aef..d707e4b8 100644 --- a/test/filter_test.rb +++ b/test/filter_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) class BeforeFilterTest < Test::Unit::TestCase it "executes filters in the order defined" do diff --git a/test/haml_test.rb b/test/haml_test.rb index 7404251d..e2779d2a 100644 --- a/test/haml_test.rb +++ b/test/haml_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) begin require 'haml' diff --git a/test/helpers_test.rb b/test/helpers_test.rb index 642c7f6f..8fa583da 100644 --- a/test/helpers_test.rb +++ b/test/helpers_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) require 'date' class HelpersTest < Test::Unit::TestCase diff --git a/test/less_test.rb b/test/less_test.rb index b761f4f0..e79b8359 100644 --- a/test/less_test.rb +++ b/test/less_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) begin require 'less' diff --git a/test/liquid_test.rb b/test/liquid_test.rb index 9c226c71..ef398afd 100644 --- a/test/liquid_test.rb +++ b/test/liquid_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) begin require 'liquid' diff --git a/test/mapped_error_test.rb b/test/mapped_error_test.rb index d6134969..9bd1d6f8 100644 --- a/test/mapped_error_test.rb +++ b/test/mapped_error_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) class FooError < RuntimeError end diff --git a/test/markaby_test.rb b/test/markaby_test.rb index 104295ea..d4e06ee6 100644 --- a/test/markaby_test.rb +++ b/test/markaby_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) begin require 'markaby' diff --git a/test/markdown_test.rb b/test/markdown_test.rb index 0223fa0e..f9f7a6b8 100644 --- a/test/markdown_test.rb +++ b/test/markdown_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) MarkdownTest = proc do def markdown_app(&block) diff --git a/test/middleware_test.rb b/test/middleware_test.rb index ee34f35d..7ba0c8b9 100644 --- a/test/middleware_test.rb +++ b/test/middleware_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) class MiddlewareTest < Test::Unit::TestCase setup do diff --git a/test/nokogiri_test.rb b/test/nokogiri_test.rb index 31230832..3e30aa39 100644 --- a/test/nokogiri_test.rb +++ b/test/nokogiri_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) begin require 'nokogiri' diff --git a/test/radius_test.rb b/test/radius_test.rb index c9449617..0e990282 100644 --- a/test/radius_test.rb +++ b/test/radius_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) begin require 'radius' diff --git a/test/rdoc_test.rb b/test/rdoc_test.rb index 243a8b7e..02598c5b 100644 --- a/test/rdoc_test.rb +++ b/test/rdoc_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) begin require 'rdoc/markup/to_html' diff --git a/test/readme_test.rb b/test/readme_test.rb index fbb496d4..b0a6bce7 100644 --- a/test/readme_test.rb +++ b/test/readme_test.rb @@ -1,5 +1,5 @@ # Tests to check if all the README examples work. -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) class ReadmeTest < Test::Unit::TestCase example do diff --git a/test/request_test.rb b/test/request_test.rb index 610f1a84..13abad4c 100644 --- a/test/request_test.rb +++ b/test/request_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) require 'stringio' class RequestTest < Test::Unit::TestCase diff --git a/test/response_test.rb b/test/response_test.rb index 5aa5f4e6..b2d78e47 100644 --- a/test/response_test.rb +++ b/test/response_test.rb @@ -1,6 +1,6 @@ # encoding: utf-8 -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) class ResponseTest < Test::Unit::TestCase setup do diff --git a/test/result_test.rb b/test/result_test.rb index 5100abf4..eb574c9b 100644 --- a/test/result_test.rb +++ b/test/result_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) class ResultTest < Test::Unit::TestCase it "sets response.body when result is a String" do diff --git a/test/route_added_hook_test.rb b/test/route_added_hook_test.rb index 08fdd925..e621f1b6 100644 --- a/test/route_added_hook_test.rb +++ b/test/route_added_hook_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) module RouteAddedTest @routes, @procs = [], [] diff --git a/test/routing_test.rb b/test/routing_test.rb index 5745d575..b8a1064a 100644 --- a/test/routing_test.rb +++ b/test/routing_test.rb @@ -1,5 +1,5 @@ # I like coding: UTF-8 -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) # Helper method for easy route pattern matching testing def route_def(pattern) diff --git a/test/sass_test.rb b/test/sass_test.rb index 9a0372e6..c46f5a12 100644 --- a/test/sass_test.rb +++ b/test/sass_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) begin require 'sass' diff --git a/test/scss_test.rb b/test/scss_test.rb index 722f0dcf..2b64a2c0 100644 --- a/test/scss_test.rb +++ b/test/scss_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) begin require 'sass' diff --git a/test/server_test.rb b/test/server_test.rb index 886102a4..ee5a192a 100644 --- a/test/server_test.rb +++ b/test/server_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) module Rack::Handler class Mock diff --git a/test/settings_test.rb b/test/settings_test.rb index 32daf79a..7f0ccf96 100644 --- a/test/settings_test.rb +++ b/test/settings_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) class SettingsTest < Test::Unit::TestCase setup do diff --git a/test/sinatra_test.rb b/test/sinatra_test.rb index a7fe1f37..3f8cedef 100644 --- a/test/sinatra_test.rb +++ b/test/sinatra_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) class SinatraTest < Test::Unit::TestCase it 'creates a new Sinatra::Base subclass on new' do diff --git a/test/slim_test.rb b/test/slim_test.rb index 96a8cab6..12b60368 100644 --- a/test/slim_test.rb +++ b/test/slim_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) begin require 'slim' diff --git a/test/static_test.rb b/test/static_test.rb index 50e3db09..37c05b70 100644 --- a/test/static_test.rb +++ b/test/static_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) class StaticTest < Test::Unit::TestCase setup do diff --git a/test/templates_test.rb b/test/templates_test.rb index 8a64312d..a692f649 100644 --- a/test/templates_test.rb +++ b/test/templates_test.rb @@ -1,5 +1,5 @@ # encoding: UTF-8 -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) File.delete(File.dirname(__FILE__) + '/views/layout.test') rescue nil class TestTemplate < Tilt::Template diff --git a/test/textile_test.rb b/test/textile_test.rb index 8d54ce09..a3ed6f5a 100644 --- a/test/textile_test.rb +++ b/test/textile_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/helper' +require File.expand_path('../helper', __FILE__) begin require 'redcloth'