summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Dreyer <ktdreyer@ktdreyer.com>2013-11-24 23:06:29 -0700
committerKen Dreyer <ktdreyer@ktdreyer.com>2013-11-25 16:34:56 -0700
commit50de234c925ef797c15aa2633a843d87471f1238 (patch)
treec673be3a16a7afb69075a1c0940e6574351c1442
parente6727800fb5c5cae767f58b8df9a5b1d6f9cd755 (diff)
downloadrubygem-unicorn-50de234c925ef797c15aa2633a843d87471f1238.tar.gz
rubygem-unicorn-50de234c925ef797c15aa2633a843d87471f1238.tar.xz
rubygem-unicorn-50de234c925ef797c15aa2633a843d87471f1238.zip
require rubygems in test helper
It is simpler to require rubygems in the test helper rather than adding the rubygems line to each test file individually.
-rw-r--r--rubygem-unicorn.spec50
1 files changed, 2 insertions, 48 deletions
diff --git a/rubygem-unicorn.spec b/rubygem-unicorn.spec
index 5f17e2d..1b86377 100644
--- a/rubygem-unicorn.spec
+++ b/rubygem-unicorn.spec
@@ -69,54 +69,8 @@ grep -rl /this/will/be/overwritten/or/wrapped/anyways/do/not/worry/ruby \
xargs sed -i -e 's|/this/will/be/overwritten/or/wrapped/anyways/do/not/worry/ruby|/usr/bin/ruby|'
%endif
-# Fixing test-suite files
-sed -i '2 i\
-require "rubygems"' test/unit/test_configurator.rb
-
-sed -i '2 i\
-require "rubygems"' test/unit/test_http_parser_ng.rb
-
-sed -i '2 i\
-require "rubygems"' test/unit/test_http_parser_xftrust.rb
-
-sed -i '2 i\
-require "rubygems"' test/unit/test_response.rb
-
-sed -i '2 i\
-require "rubygems"' test/unit/test_signals.rb
-
-sed -i '2 i\
-require "rubygems"' test/unit/test_stream_input.rb
-
-sed -i '2 i\
-require "rubygems"' test/unit/test_upload.rb
-
-sed -i '2 i\
-require "rubygems"' test/unit/test_droplet.rb
-
-sed -i '2 i\
-require "rubygems"' test/unit/test_http_parser.rb
-
-sed -i '2 i\
-require "rubygems"' test/unit/test_request.rb
-
-sed -i '2 i\
-require "rubygems"' test/unit/test_server.rb
-
-sed -i '2 i\
-require "rubygems"' test/unit/test_socket_helper.rb
-
-sed -i '2 i\
-require "rubygems"' test/unit/test_tee_input.rb
-
-sed -i '2 i\
-require "rubygems"' test/unit/test_util.rb
-
-sed -i '2 i\
-require "rubygems"' test/unit/test_sni_hostnames.rb
-
-##sed -i '2 i\
-##require "rubygems"' test/rails/test_rails.rb
+# Require rubygems when running tests
+sed -i "2irequire 'rubygems'" test/test_helper.rb
%build