Skip to content

Commit

Permalink
Merge pull request sinatra#100 from patriciomacadden/yajl-tests-fix
Browse files Browse the repository at this point in the history
Fix tests for jruby
  • Loading branch information
rkh committed Apr 6, 2013
2 parents d934d10 + 545732f commit a76243d
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions sinatra-contrib/spec/respond_with_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit a76243d

Please sign in to comment.