t/test_isolate.rb in zbatery-0.5.0 vs t/test_isolate.rb in zbatery-0.6.0

- old
+ new

@@ -13,18 +13,18 @@ old_out = $stdout.dup $stdout.reopen($stderr) Isolate.now!(opts) do gem 'rack', '1.2.1' - gem 'unicorn', '3.0.0' - gem 'rainbows', '2.0.0' + gem 'unicorn', '3.2.1' + gem 'rainbows', '2.1.0' if engine == "ruby" gem 'sendfile', '1.0.0' # next Rubinius should support this gem 'iobuffer', '0.1.3' - gem 'rev', '0.3.2' + gem 'cool.io', '1.0.0' gem 'eventmachine', '0.12.10' gem 'sinatra', '1.0.0' gem 'async_sinatra', '0.2.1' @@ -37,6 +37,10 @@ gem 'rack-fiber_pool', '0.9.0' end end $stdout.reopen(old_out) -puts Dir["#{path}/gems/*-*/lib"].map { |x| File.expand_path(x) }.join(':') +# don't load the old Rev if it exists, Cool.io 1.0.0 is compatible with it, +# even for everything Revactor uses. +dirs = Dir["#{path}/gems/*-*/lib"] +dirs.delete_if { |x| x =~ %r{/rev-[\d\.]+/lib} } +puts dirs.map { |x| File.expand_path(x) }.join(':')