Permalink
Browse files

Fix sinatra warning, fixes GH-39

  • Loading branch information...
1 parent dbd3c7f commit bcdb412863350cd8901c11d20dae8acf99c31936 @mperham committed Oct 10, 2011
Showing with 3 additions and 3 deletions.
  1. +1 −1 girl_friday.gemspec
  2. +1 −1 lib/girl_friday/server.rb
  3. +1 −1 test/test_batch.rb
View
@@ -17,6 +17,6 @@ Gem::Specification.new do |s|
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
s.require_paths = ["lib"]
s.add_dependency 'connection_pool', '~> 0.1.0'
- s.add_development_dependency 'sinatra', '~> 1.0'
+ s.add_development_dependency 'sinatra', '~> 1.3'
s.add_development_dependency 'rake'
end
@@ -14,7 +14,7 @@ class Server < Sinatra::Base
basedir = File.expand_path(File.dirname(__FILE__) + '/../../server')
set :views, "#{basedir}/views"
- set :public, "#{basedir}/public"
+ set :public_folder, "#{basedir}/public"
set :static, true
helpers do
View
@@ -16,7 +16,7 @@ def test_simple_batch_operation
# asking for the results should block
results = batch.results(1.0)
c = Time.now
- assert_in_delta(0.5, (c - b), 0.15)
+ assert_in_delta(0.5, (c - b), 0.3)
assert_equal 10, results.size
assert_kind_of Time, results[0]

0 comments on commit bcdb412

Please sign in to comment.