Skip to content
This repository has been archived by the owner on Jan 16, 2022. It is now read-only.

Commit

Permalink
don't use thin in jruby
Browse files Browse the repository at this point in the history
  • Loading branch information
Elana Koren and Gregg Van Hove committed Feb 26, 2014
1 parent eb6ab8f commit 8a2d1c3
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion spec/jasmine_rails_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def bundle_install
f.puts "gem 'jasmine-core', :github => 'pivotal/jasmine'"
f.puts "gem 'rubysl', :platform => :rbx"
f.puts "gem 'racc', :platform => :rbx"
f.puts "gem 'thin'"
f.puts "gem 'thin'" unless RUBY_PLATFORM == 'java'
f.flush
}

Expand Down Expand Up @@ -155,6 +155,7 @@ def bundle_install
end

it "should pass custom rack options from jasmine.yml" do
pending "we're testing this with thin, which doesn't work in jruby" if RUBY_PLATFORM == 'java'
rack_yaml = custom_jasmine_config('custom_rack') do |jasmine_config|
jasmine_config['rack_options'] = { 'server' => 'webrick' }
end
Expand Down

0 comments on commit 8a2d1c3

Please sign in to comment.