diff options
| author | James Tucker <jftucker@gmail.com> | 2011-09-08 11:31:49 -0700 |
|---|---|---|
| committer | James Tucker <jftucker@gmail.com> | 2011-09-08 11:31:49 -0700 |
| commit | 418cb694fdd0c69936c68af91cdc1d454e647956 (patch) | |
| tree | 90894ce0f6e2fae561f014d0ede56473dd7840b0 | |
| parent | 470fdfd7f4f7c2f06a011423046cdca6983f71d7 (diff) | |
| download | rack-418cb694fdd0c69936c68af91cdc1d454e647956.tar.gz | |
Lets move things forward... (working test runs again)
| -rw-r--r-- | Rakefile | 2 | ||||
| -rw-r--r-- | rack.gemspec | 3 | ||||
| -rw-r--r-- | test/spec_rack_camping.rb | 4 |
3 files changed, 7 insertions, 2 deletions
@@ -75,7 +75,7 @@ end desc "Run all the fast tests" task :test do - sh "specrb -Ilib:test -w #{ENV['TEST'] || '-a'} #{ENV['TESTOPTS'] || '-t "^(?!Rack::Handler|Rack::Adapter|Rack::Session::Memcache|rackup)"'}" + sh "specrb -rtest/gemloader -Ilib:test -w #{ENV['TEST'] || '-a'} #{ENV['TESTOPTS'] || '-t "^(?!Rack::Handler|Rack::Adapter|Rack::Session::Memcache|rackup)"'}" end desc "Run all the tests" diff --git a/rack.gemspec b/rack.gemspec index b28a94af..1f04bcc7 100644 --- a/rack.gemspec +++ b/rack.gemspec @@ -33,7 +33,8 @@ EOF s.add_development_dependency 'test-spec' - s.add_development_dependency 'camping', '< 1.5' + s.add_development_dependency 'activesupport', '< 2' + s.add_development_dependency 'camping', '< 1.6' s.add_development_dependency 'fcgi' s.add_development_dependency 'memcache-client' s.add_development_dependency 'mongrel' diff --git a/test/spec_rack_camping.rb b/test/spec_rack_camping.rb index bed11710..e7597f07 100644 --- a/test/spec_rack_camping.rb +++ b/test/spec_rack_camping.rb @@ -6,6 +6,10 @@ begin require 'rack/mock' $-w, w = nil, $-w # yuck + + # campings dependencies also don't pull this in anymore: + class Object;def meta_def m,&b;(class<<self;self;end).send:define_method,m,&b end end + require 'camping' require 'rack/adapter/camping' |