Rename spec/ back to test/

70 files changed, 5 insertions, 5 deletions

diff --git a/Rakefile b/Rakefile
index 8a78b25b..0dee0a7e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -32,7 +32,7 @@ end
 desc "Make binaries executable"
 task :chmod do
   Dir["bin/*"].each { |binary| File.chmod(0775, binary) }
-  Dir["spec/cgi/spec*"].each { |binary| File.chmod(0775, binary) }
+  Dir["test/cgi/test*"].each { |binary| File.chmod(0775, binary) }
 end
 
 desc "Generate a ChangeLog"
@@ -71,14 +71,14 @@ task :test do
   specopts = ENV['TESTOPTS'] ||
     "-q -t '^(?!Rack::Handler|Rack::Adapter|Rack::Session::Memcache|rackup)'"
 
-  sh "bacon -I./lib:./spec -w #{opts} #{specopts}"
+  sh "bacon -I./lib:./test -w #{opts} #{specopts}"
 end
 
 desc "Run all the tests"
 task :fulltest => [:chmod] do
   opts     = ENV['TEST'] || '-a'
   specopts = ENV['TESTOPTS'] || '-q'
-  sh "bacon -I./lib:./spec -w #{opts} #{specopts}"
+  sh "bacon -I./lib:./test -w #{opts} #{specopts}"
 end
 
 task :gem => ["SPEC"] do
diff --git a/rack.gemspec b/rack.gemspec
index ab142dbc..18ca1d3f 100644
--- a/rack.gemspec
+++ b/rack.gemspec
@@ -14,14 +14,14 @@ middleware) into a single method call.
 Also see http://rack.rubyforge.org.
 EOF
 
-  s.files           = Dir['{bin/*,contrib/*,example/*,lib/**/*,spec/**/*}'] +
+  s.files           = Dir['{bin/*,contrib/*,example/*,lib/**/*,test/**/*}'] +
                         %w(COPYING KNOWN-ISSUES rack.gemspec README SPEC)
   s.bindir          = 'bin'
   s.executables     << 'rackup'
   s.require_path    = 'lib'
   s.has_rdoc        = true
   s.extra_rdoc_files = ['README', 'SPEC', 'KNOWN-ISSUES']
-  s.test_files      = Dir['spec/spec_*.rb']
+  s.test_files      = Dir['test/spec_*.rb']
 
   s.author          = 'Christian Neukirchen'
   s.email           = 'chneukirchen@gmail.com'
diff --git a/spec/cgi/lighttpd.conf b/test/cgi/lighttpd.conf
index 0d8da250..0d8da250 100755
--- a/spec/cgi/lighttpd.conf
+++ b/test/cgi/lighttpd.conf
diff --git a/spec/cgi/rackup_stub.rb b/test/cgi/rackup_stub.rb
index a216cdc3..a216cdc3 100755
--- a/spec/cgi/rackup_stub.rb
+++ b/test/cgi/rackup_stub.rb
diff --git a/spec/cgi/sample_rackup.ru b/test/cgi/sample_rackup.ru
index 86d99e69..86d99e69 100755
--- a/spec/cgi/sample_rackup.ru
+++ b/test/cgi/sample_rackup.ru
diff --git a/spec/cgi/test b/test/cgi/test
index e4837a4e..e4837a4e 100755
--- a/spec/cgi/test
+++ b/test/cgi/test
diff --git a/spec/cgi/test.fcgi b/test/cgi/test.fcgi
index 5e104fc9..5e104fc9 100755
--- a/spec/cgi/test.fcgi
+++ b/test/cgi/test.fcgi
diff --git a/spec/cgi/test.ru b/test/cgi/test.ru
index bd3ee725..bd3ee725 100755
--- a/spec/cgi/test.ru
+++ b/test/cgi/test.ru
diff --git a/spec/multipart/bad_robots b/test/multipart/bad_robots
index 7e5bd418..7e5bd418 100644
--- a/spec/multipart/bad_robots
+++ b/test/multipart/bad_robots
diff --git a/spec/multipart/binary b/test/multipart/binary
index a3bd67c4..a3bd67c4 100644
--- a/spec/multipart/binary
+++ b/test/multipart/binary
diff --git a/spec/multipart/empty b/test/multipart/empty
index f0f79835..f0f79835 100644
--- a/spec/multipart/empty
+++ b/test/multipart/empty
diff --git a/spec/multipart/fail_16384_nofile b/test/multipart/fail_16384_nofile
index bdcd3320..bdcd3320 100644
--- a/spec/multipart/fail_16384_nofile
+++ b/test/multipart/fail_16384_nofile
diff --git a/spec/multipart/file1.txt b/test/multipart/file1.txt
index 0839b2e9..0839b2e9 100644
--- a/spec/multipart/file1.txt
+++ b/test/multipart/file1.txt
diff --git a/spec/multipart/filename_and_modification_param b/test/multipart/filename_and_modification_param
index 20893f42..20893f42 100644
--- a/spec/multipart/filename_and_modification_param
+++ b/test/multipart/filename_and_modification_param
diff --git a/spec/multipart/filename_with_escaped_quotes b/test/multipart/filename_with_escaped_quotes
index 0a332df7..0a332df7 100644
--- a/spec/multipart/filename_with_escaped_quotes
+++ b/test/multipart/filename_with_escaped_quotes
diff --git a/spec/multipart/filename_with_escaped_quotes_and_modification_param b/test/multipart/filename_with_escaped_quotes_and_modification_param
index 7619bd50..7619bd50 100644
--- a/spec/multipart/filename_with_escaped_quotes_and_modification_param
+++ b/test/multipart/filename_with_escaped_quotes_and_modification_param
diff --git a/spec/multipart/filename_with_percent_escaped_quotes b/test/multipart/filename_with_percent_escaped_quotes
index 7db06413..7db06413 100644
--- a/spec/multipart/filename_with_percent_escaped_quotes
+++ b/test/multipart/filename_with_percent_escaped_quotes
diff --git a/spec/multipart/filename_with_unescaped_quotes b/test/multipart/filename_with_unescaped_quotes
index 9a291e8e..9a291e8e 100644
--- a/spec/multipart/filename_with_unescaped_quotes
+++ b/test/multipart/filename_with_unescaped_quotes
diff --git a/spec/multipart/ie b/test/multipart/ie
index eae06ab5..eae06ab5 100644
--- a/spec/multipart/ie
+++ b/test/multipart/ie
diff --git a/spec/multipart/nested b/test/multipart/nested
index 51978824..51978824 100644
--- a/spec/multipart/nested
+++ b/test/multipart/nested
diff --git a/spec/multipart/none b/test/multipart/none
index d66f4730..d66f4730 100644
--- a/spec/multipart/none
+++ b/test/multipart/none
diff --git a/spec/multipart/semicolon b/test/multipart/semicolon
index 00fd68ab..00fd68ab 100644
--- a/spec/multipart/semicolon
+++ b/test/multipart/semicolon
diff --git a/spec/multipart/text b/test/multipart/text
index b83d3821..b83d3821 100644
--- a/spec/multipart/text
+++ b/test/multipart/text
diff --git a/spec/rackup/.gitignore b/test/rackup/.gitignore
index 2f9d279a..2f9d279a 100644
--- a/spec/rackup/.gitignore
+++ b/test/rackup/.gitignore
diff --git a/spec/rackup/config.ru b/test/rackup/config.ru
index f1e2e1f3..f1e2e1f3 100644
--- a/spec/rackup/config.ru
+++ b/test/rackup/config.ru
diff --git a/spec/spec_auth_basic.rb b/test/spec_auth_basic.rb
index 5ef2643b..5ef2643b 100644
--- a/spec/spec_auth_basic.rb
+++ b/test/spec_auth_basic.rb
diff --git a/spec/spec_auth_digest.rb b/test/spec_auth_digest.rb
index 75b61b15..75b61b15 100644
--- a/spec/spec_auth_digest.rb
+++ b/test/spec_auth_digest.rb
diff --git a/spec/spec_builder.rb b/test/spec_builder.rb
index 9839eaa5..9839eaa5 100644
--- a/spec/spec_builder.rb
+++ b/test/spec_builder.rb
diff --git a/spec/spec_cascade.rb b/test/spec_cascade.rb
index c2c49200..c2c49200 100644
--- a/spec/spec_cascade.rb
+++ b/test/spec_cascade.rb
diff --git a/spec/spec_cgi.rb b/test/spec_cgi.rb
index e820d3ff..e820d3ff 100644
--- a/spec/spec_cgi.rb
+++ b/test/spec_cgi.rb
diff --git a/spec/spec_chunked.rb b/test/spec_chunked.rb
index ac53c4a4..ac53c4a4 100644
--- a/spec/spec_chunked.rb
+++ b/test/spec_chunked.rb
diff --git a/spec/spec_commonlogger.rb b/test/spec_commonlogger.rb
index 446e70e1..446e70e1 100644
--- a/spec/spec_commonlogger.rb
+++ b/test/spec_commonlogger.rb
diff --git a/spec/spec_conditionalget.rb b/test/spec_conditionalget.rb
index c6a5b16e..c6a5b16e 100644
--- a/spec/spec_conditionalget.rb
+++ b/test/spec_conditionalget.rb
diff --git a/spec/spec_config.rb b/test/spec_config.rb
index 21425dd2..21425dd2 100644
--- a/spec/spec_config.rb
+++ b/test/spec_config.rb
diff --git a/spec/spec_content_length.rb b/test/spec_content_length.rb
index 904992ff..904992ff 100644
--- a/spec/spec_content_length.rb
+++ b/test/spec_content_length.rb
diff --git a/spec/spec_content_type.rb b/test/spec_content_type.rb
index 8eb9f150..8eb9f150 100644
--- a/spec/spec_content_type.rb
+++ b/test/spec_content_type.rb
diff --git a/spec/spec_deflater.rb b/test/spec_deflater.rb
index f2e462af..f2e462af 100644
--- a/spec/spec_deflater.rb
+++ b/test/spec_deflater.rb
diff --git a/spec/spec_directory.rb b/test/spec_directory.rb
index a45ba23f..a45ba23f 100644
--- a/spec/spec_directory.rb
+++ b/test/spec_directory.rb
diff --git a/spec/spec_etag.rb b/test/spec_etag.rb
index 18bc8400..18bc8400 100644
--- a/spec/spec_etag.rb
+++ b/test/spec_etag.rb
diff --git a/spec/spec_fastcgi.rb b/test/spec_fastcgi.rb
index 0e56bf53..0e56bf53 100644
--- a/spec/spec_fastcgi.rb
+++ b/test/spec_fastcgi.rb
diff --git a/spec/spec_file.rb b/test/spec_file.rb
index f191aa03..f191aa03 100644
--- a/spec/spec_file.rb
+++ b/test/spec_file.rb
diff --git a/spec/spec_handler.rb b/test/spec_handler.rb
index 4f05efcf..4f05efcf 100644
--- a/spec/spec_handler.rb
+++ b/test/spec_handler.rb
diff --git a/spec/spec_head.rb b/test/spec_head.rb
index f81392ad..f81392ad 100644
--- a/spec/spec_head.rb
+++ b/test/spec_head.rb
diff --git a/spec/spec_lint.rb b/test/spec_lint.rb
index 792670b0..792670b0 100644
--- a/spec/spec_lint.rb
+++ b/test/spec_lint.rb
diff --git a/spec/spec_lobster.rb b/test/spec_lobster.rb
index 6a610409..6a610409 100644
--- a/spec/spec_lobster.rb
+++ b/test/spec_lobster.rb
diff --git a/spec/spec_lock.rb b/test/spec_lock.rb
index 3b3fd45e..3b3fd45e 100644
--- a/spec/spec_lock.rb
+++ b/test/spec_lock.rb
diff --git a/spec/spec_logger.rb b/test/spec_logger.rb
index f1952273..f1952273 100644
--- a/spec/spec_logger.rb
+++ b/test/spec_logger.rb
diff --git a/spec/spec_methodoverride.rb b/test/spec_methodoverride.rb
index 853991d9..853991d9 100644
--- a/spec/spec_methodoverride.rb
+++ b/test/spec_methodoverride.rb
diff --git a/spec/spec_mock.rb b/test/spec_mock.rb
index eaec655a..eaec655a 100644
--- a/spec/spec_mock.rb
+++ b/test/spec_mock.rb
diff --git a/spec/spec_mongrel.rb b/test/spec_mongrel.rb
index ac0e825a..ac0e825a 100644
--- a/spec/spec_mongrel.rb
+++ b/test/spec_mongrel.rb
diff --git a/spec/spec_nulllogger.rb b/test/spec_nulllogger.rb
index 7c1968e5..7c1968e5 100644
--- a/spec/spec_nulllogger.rb
+++ b/test/spec_nulllogger.rb
diff --git a/spec/spec_recursive.rb b/test/spec_recursive.rb
index 592b2631..592b2631 100644
--- a/spec/spec_recursive.rb
+++ b/test/spec_recursive.rb
diff --git a/spec/spec_request.rb b/test/spec_request.rb
index 914ce350..914ce350 100644
--- a/spec/spec_request.rb
+++ b/test/spec_request.rb
diff --git a/spec/spec_response.rb b/test/spec_response.rb
index 28121130..28121130 100644
--- a/spec/spec_response.rb
+++ b/test/spec_response.rb
diff --git a/spec/spec_rewindable_input.rb b/test/spec_rewindable_input.rb
index 025d830d..025d830d 100644
--- a/spec/spec_rewindable_input.rb
+++ b/test/spec_rewindable_input.rb
diff --git a/spec/spec_runtime.rb b/test/spec_runtime.rb
index 547a32ec..547a32ec 100644
--- a/spec/spec_runtime.rb
+++ b/test/spec_runtime.rb
diff --git a/spec/spec_sendfile.rb b/test/spec_sendfile.rb
index 84517e7e..84517e7e 100644
--- a/spec/spec_sendfile.rb
+++ b/test/spec_sendfile.rb
diff --git a/spec/spec_session_cookie.rb b/test/spec_session_cookie.rb
index fda40cc4..fda40cc4 100644
--- a/spec/spec_session_cookie.rb
+++ b/test/spec_session_cookie.rb
diff --git a/spec/spec_session_memcache.rb b/test/spec_session_memcache.rb
index eb2c5a39..eb2c5a39 100644
--- a/spec/spec_session_memcache.rb
+++ b/test/spec_session_memcache.rb
diff --git a/spec/spec_session_pool.rb b/test/spec_session_pool.rb
index 904b5f22..904b5f22 100644
--- a/spec/spec_session_pool.rb
+++ b/test/spec_session_pool.rb
diff --git a/spec/spec_showexceptions.rb b/test/spec_showexceptions.rb
index 82ac9184..82ac9184 100644
--- a/spec/spec_showexceptions.rb
+++ b/test/spec_showexceptions.rb
diff --git a/spec/spec_showstatus.rb b/test/spec_showstatus.rb
index 210a2f49..210a2f49 100644
--- a/spec/spec_showstatus.rb
+++ b/test/spec_showstatus.rb
diff --git a/spec/spec_static.rb b/test/spec_static.rb
index fe03058d..fe03058d 100644
--- a/spec/spec_static.rb
+++ b/test/spec_static.rb
diff --git a/spec/spec_thin.rb b/test/spec_thin.rb
index 94039647..94039647 100644
--- a/spec/spec_thin.rb
+++ b/test/spec_thin.rb
diff --git a/spec/spec_urlmap.rb b/test/spec_urlmap.rb
index fdaf129a..fdaf129a 100644
--- a/spec/spec_urlmap.rb
+++ b/test/spec_urlmap.rb
diff --git a/spec/spec_utils.rb b/test/spec_utils.rb
index 822058bb..822058bb 100644
--- a/spec/spec_utils.rb
+++ b/test/spec_utils.rb
diff --git a/spec/spec_webrick.rb b/test/spec_webrick.rb
index 0bf9690e..0bf9690e 100644
--- a/spec/spec_webrick.rb
+++ b/test/spec_webrick.rb
diff --git a/spec/testrequest.rb b/test/testrequest.rb
index b819ce93..b819ce93 100644
--- a/spec/testrequest.rb
+++ b/test/testrequest.rb
diff --git a/spec/unregistered_handler/rack/handler/unregistered.rb b/test/unregistered_handler/rack/handler/unregistered.rb
index 6dd9436d..6dd9436d 100644
--- a/spec/unregistered_handler/rack/handler/unregistered.rb
+++ b/test/unregistered_handler/rack/handler/unregistered.rb
diff --git a/spec/unregistered_handler/rack/handler/unregistered_long_one.rb b/test/unregistered_handler/rack/handler/unregistered_long_one.rb
index 1920685f..1920685f 100644
--- a/spec/unregistered_handler/rack/handler/unregistered_long_one.rb
+++ b/test/unregistered_handler/rack/handler/unregistered_long_one.rb