diff options
-rw-r--r-- | test/test_helper.rb (renamed from test/testhelp.rb) | 0 | ||||
-rw-r--r-- | test/unit/test_cgi_wrapper.rb (renamed from test/test_cgi_wrapper.rb) | 2 | ||||
-rw-r--r-- | test/unit/test_command.rb (renamed from test/test_command.rb) | 2 | ||||
-rw-r--r-- | test/unit/test_conditional.rb (renamed from test/test_conditional.rb) | 2 | ||||
-rw-r--r-- | test/unit/test_configurator.rb (renamed from test/test_configurator.rb) | 6 | ||||
-rw-r--r-- | test/unit/test_debug.rb (renamed from test/test_debug.rb) | 2 | ||||
-rw-r--r-- | test/unit/test_handlers.rb (renamed from test/test_handlers.rb) | 2 | ||||
-rw-r--r-- | test/unit/test_http11.rb (renamed from test/test_http11.rb) | 2 | ||||
-rw-r--r-- | test/unit/test_redirect_handler.rb (renamed from test/test_redirect_handler.rb) | 2 | ||||
-rw-r--r-- | test/unit/test_request_progress.rb (renamed from test/test_request_progress.rb) | 2 | ||||
-rw-r--r-- | test/unit/test_response.rb (renamed from test/test_response.rb) | 2 | ||||
-rw-r--r-- | test/unit/test_stats.rb (renamed from test/test_stats.rb) | 2 | ||||
-rw-r--r-- | test/unit/test_uriclassifier.rb (renamed from test/test_uriclassifier.rb) | 2 | ||||
-rw-r--r-- | test/unit/test_ws.rb (renamed from test/test_ws.rb) | 2 |
14 files changed, 15 insertions, 15 deletions
diff --git a/test/testhelp.rb b/test/test_helper.rb index 42ead2c..42ead2c 100644 --- a/test/testhelp.rb +++ b/test/test_helper.rb diff --git a/test/test_cgi_wrapper.rb b/test/unit/test_cgi_wrapper.rb index 449f6d0..a494655 100644 --- a/test/test_cgi_wrapper.rb +++ b/test/unit/test_cgi_wrapper.rb @@ -1,5 +1,5 @@ -require 'test/testhelp' +require 'test/test_helper' class MockHttpRequest attr_reader :body diff --git a/test/test_command.rb b/test/unit/test_command.rb index 3cb9643..2e49ff2 100644 --- a/test/test_command.rb +++ b/test/unit/test_command.rb @@ -4,7 +4,7 @@ # Additional work donated by contributors. See http://mongrel.rubyforge.org/attributions.html # for more information. -require 'test/testhelp' +require 'test/test_helper' class TestCommand < GemPlugin::Plugin "/commands" include Mongrel::Command::Base diff --git a/test/test_conditional.rb b/test/unit/test_conditional.rb index cd3ce06..769dd91 100644 --- a/test/test_conditional.rb +++ b/test/unit/test_conditional.rb @@ -4,7 +4,7 @@ # Additional work donated by contributors. See http://mongrel.rubyforge.org/attributions.html # for more information. -require 'test/testhelp' +require 'test/test_helper' include Mongrel diff --git a/test/test_configurator.rb b/test/unit/test_configurator.rb index dd99f00..f55a8ae 100644 --- a/test/test_configurator.rb +++ b/test/unit/test_configurator.rb @@ -4,7 +4,7 @@ # Additional work donated by contributors. See http://mongrel.rubyforge.org/attributions.html # for more information. -require 'test/testhelp' +require 'test/test_helper' $test_plugin_fired = 0 @@ -48,8 +48,8 @@ class ConfiguratorTest < Test::Unit::TestCase debug "/" setup_signals - run_config(File.dirname(__FILE__) + "/../test/mongrel.conf") - load_mime_map(File.dirname(__FILE__) + "/../test/mime.yaml") + run_config(HERE + "/mongrel.conf") + load_mime_map(HERE + "/mime.yaml") run end diff --git a/test/test_debug.rb b/test/unit/test_debug.rb index 2f7be24..05d92d8 100644 --- a/test/test_debug.rb +++ b/test/unit/test_debug.rb @@ -4,7 +4,7 @@ # Additional work donated by contributors. See http://mongrel.rubyforge.org/attributions.html # for more information. -require 'test/testhelp' +require 'test/test_helper' require 'mongrel/debug' class MongrelDbgTest < Test::Unit::TestCase diff --git a/test/test_handlers.rb b/test/unit/test_handlers.rb index 1005dd0..1d316e5 100644 --- a/test/test_handlers.rb +++ b/test/unit/test_handlers.rb @@ -4,7 +4,7 @@ # Additional work donated by contributors. See http://mongrel.rubyforge.org/attributions.html # for more information. -require 'test/testhelp' +require 'test/test_helper' class SimpleHandler < Mongrel::HttpHandler def process(request, response) diff --git a/test/test_http11.rb b/test/unit/test_http11.rb index da311af..e083abf 100644 --- a/test/test_http11.rb +++ b/test/unit/test_http11.rb @@ -4,7 +4,7 @@ # Additional work donated by contributors. See http://mongrel.rubyforge.org/attributions.html # for more information. -require 'test/testhelp' +require 'test/test_helper' include Mongrel diff --git a/test/test_redirect_handler.rb b/test/unit/test_redirect_handler.rb index 2e03d48..3207b46 100644 --- a/test/test_redirect_handler.rb +++ b/test/unit/test_redirect_handler.rb @@ -4,7 +4,7 @@ # Additional work donated by contributors. See http://mongrel.rubyforge.org/attributions.html # for more information. -require 'test/testhelp' +require 'test/test_helper' class RedirectHandlerTest < Test::Unit::TestCase diff --git a/test/test_request_progress.rb b/test/unit/test_request_progress.rb index ba21c27..da9374e 100644 --- a/test/test_request_progress.rb +++ b/test/unit/test_request_progress.rb @@ -4,7 +4,7 @@ # Additional work donated by contributors. See http://mongrel.rubyforge.org/attributions.html # for more information. -require 'test/testhelp' +require 'test/test_helper' class UploadBeginHandler < Mongrel::HttpHandler attr_reader :request_began, :request_progressed, :request_processed diff --git a/test/test_response.rb b/test/unit/test_response.rb index 123ed98..b49c9df 100644 --- a/test/test_response.rb +++ b/test/unit/test_response.rb @@ -4,7 +4,7 @@ # Additional work donated by contributors. See http://mongrel.rubyforge.org/attributions.html # for more information. -require 'test/testhelp' +require 'test/test_helper' include Mongrel diff --git a/test/test_stats.rb b/test/unit/test_stats.rb index 404870a..012c6a5 100644 --- a/test/test_stats.rb +++ b/test/unit/test_stats.rb @@ -4,7 +4,7 @@ # Additional work donated by contributors. See http://mongrel.rubyforge.org/attributions.html # for more information. -require 'test/testhelp' +require 'test/test_helper' class StatsTest < Test::Unit::TestCase diff --git a/test/test_uriclassifier.rb b/test/unit/test_uriclassifier.rb index 28af72c..a438065 100644 --- a/test/test_uriclassifier.rb +++ b/test/unit/test_uriclassifier.rb @@ -4,7 +4,7 @@ # Additional work donated by contributors. See http://mongrel.rubyforge.org/attributions.html # for more information. -require 'test/testhelp' +require 'test/test_helper' include Mongrel diff --git a/test/test_ws.rb b/test/unit/test_ws.rb index f019122..3385e0a 100644 --- a/test/test_ws.rb +++ b/test/unit/test_ws.rb @@ -4,7 +4,7 @@ # Additional work donated by contributors. See http://mongrel.rubyforge.org/attributions.html # for more information. -require 'test/testhelp' +require 'test/test_helper' include Mongrel |