[DRE-commits] [SCM] ruby-rack-test.git branch, master, updated. upstream/0.6.0-5-g05a736f

[Lucas Nussbaum]

The following commit has been merged in the master branch:
commit 944fdab539cbfb435247766fa72bee2903191d39
Merge: ae9339a5b3d6cffd54f48207d6bfaa3caf3ef782 679a6046dfa0967146302201ff97b1763e95fd9a
Author: Lucas Nussbaum <lucas at debian.org>
Date:   Wed Dec 21 10:59:13 2011 +0100

    Merge commit 'upstream/0.6.1'

diff --combined spec/spec_helper.rb
index bf80aa3,7461461..744eaf5
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@@ -1,14 -1,15 +1,14 @@@
  require "rubygems"
 -require "bundler/setup"
 -
  require "rack"
  require "rspec"
 +require "sinatra"
  
  Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
  
  require "rack/test"
  require File.dirname(__FILE__) + "/fixtures/fake_app"
  
- Rspec.configure do |config|
+ RSpec.configure do |config|
    config.mock_with :rspec
    config.include Rack::Test::Methods
  

-- 
ruby-rack-test.git