Merge branch 'hotfix/some-love' of https://github.com/damien/em-http-…

…request

Rakefile

@@ -6,6 +6,7 @@ require 'rake'
 require 'rake/clean'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
+require 'rspec/core/rake_task'
 require 'fileutils'
 include FileUtils
 
@@ -38,8 +39,8 @@ task :ragel do
   end
 end
 
-require 'rspec/core/rake_task'
-Rspec::Core::RakeTask.new(:spec)
+desc "Run all RSpec tests"
+RSpec::Core::RakeTask.new(:spec)
 
 def make(makedir)
   Dir.chdir(makedir) { sh MAKE }

spec/encoding_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require 'helper'
 
 describe EventMachine::HttpEncoding do
   include EventMachine::HttpEncoding
@@ -34,7 +34,7 @@
   it "should be fast on long string escapes" do
     s = Time.now
     5000.times { |n| form_encode_body({:a => "{a:'b', d:'f', g:['a','b']}"*50}) }
-    (Time.now - s).should be_close(1, 0.5)
+    (Time.now - s).should satisfy { |t| t < 1.5 }
   end
 
-end
+end

spec/mock_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require 'helper'
 
 describe 'em-http mock' do
 

spec/multi_spec.rb

@@ -1,5 +1,5 @@
-require 'spec/helper'
-require 'spec/stallion'
+require 'helper'
+require 'stallion'
 
 describe EventMachine::MultiRequest do
 

spec/request_spec.rb

@@ -1,6 +1,6 @@
-require 'spec/helper'
-require 'spec/stallion'
-require 'spec/stub_server'
+require 'helper'
+require 'stallion'
+require 'stub_server'
 
 describe EventMachine::HttpRequest do