Permalink
Browse files

Merge branch 'master' of github.com:sinatra/sinatra-contrib

  • Loading branch information...
rkh committed Apr 6, 2013
2 parents fa76fb0 + d01d2cd commit 6da79a0309ccc652c18e6edfd29d59f66b251a39
Showing with 6 additions and 4 deletions.
  1. +6 −4 spec/respond_with_spec.rb
View
@@ -229,10 +229,12 @@ def object.to_pdf; "hi" end
body.should == "hi"
end
- it 'uses yajl for json' do
- respond_with :baz
- req(:json).should be_ok
- body.should == "\"yajl!\""
+ unless defined? JRUBY_VERSION
+ it 'uses yajl for json' do
+ respond_with :baz
+ req(:json).should be_ok
+ body.should == "\"yajl!\""
+ end
end
end

0 comments on commit 6da79a0

Please sign in to comment.