Browse files

Update to latest RSpec, fix bundler problem with nio4r.

  • Loading branch information...
1 parent e7cd171 commit 77b4944b8d53b5b0ef966b262bf59d726c4393a9 @seancribbs seancribbs committed Nov 17, 2012
Showing with 4 additions and 3 deletions.
  1. +1 −0 Gemfile
  2. +1 −1 spec/webmachine/dispatcher/route_spec.rb
  3. +1 −1 spec/webmachine/dispatcher_spec.rb
  4. +1 −1 webmachine.gemspec
View
1 Gemfile
@@ -10,6 +10,7 @@ group :webservers do
gem 'mongrel', '~> 1.2.beta', :platform => [:mri, :rbx]
if RUBY_VERSION >= '1.9'
gem 'reel', '>= 0.1.0', :platform => [:ruby_19, :jruby]
+ gem 'nio4r'
end
gem 'hatetepe', '~> 0.5'
end
View
2 spec/webmachine/dispatcher/route_spec.rb
@@ -7,7 +7,7 @@
let(:resource){ Class.new(Webmachine::Resource) }
matcher :match_route do |*expected|
- route = described_class.new(expected[0], resource, expected[1] || {})
+ route = Webmachine::Dispatcher::Route.new(expected[0], Class.new(Webmachine::Resource), expected[1] || {})
match do |actual|
request.uri.path = actual if String === actual
route.match?(request)
View
2 spec/webmachine/dispatcher_spec.rb
@@ -29,7 +29,7 @@ def to_html; "goodbye, cruel world"; end
it "should add routes" do
expect {
dispatcher.add_route ['*'], resource
- }.should_not raise_error
+ }.to_not raise_error
end
it "should have add_route return the newly created route" do
View
2 webmachine.gemspec
@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
gem.add_runtime_dependency(%q<i18n>, [">= 0.4.0"])
gem.add_runtime_dependency(%q<multi_json>)
- gem.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+ gem.add_development_dependency(%q<rspec>, ["~> 2.12.0"])
gem.add_development_dependency(%q<yard>, ["~> 0.7.3"])
gem.add_development_dependency(%q<rake>)
gem.add_development_dependency(%q<rack>)

0 comments on commit 77b4944

Please sign in to comment.