gemfiles/rails51.gemfile in rollbar-2.19.3 vs gemfiles/rails51.gemfile in rollbar-2.19.4

- old
+ new

@@ -1,9 +1,16 @@ require 'rubygems/version' source 'https://rubygems.org' +# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a +# new process is created during tests. (Testing rake tasks, for example.) +# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis. +# We use the ||= assignment because Travis loads the gemfile twice, the second time +# with the wrong gemfile path. +ENV['CURRENT_GEMFILE'] ||= __FILE__ + is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE) gem 'appraisal' gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby gem 'jruby-openssl', :platform => :jruby @@ -52,12 +59,16 @@ gem 'database_cleaner' gem 'delayed_job', :require => false gem 'generator_spec' gem 'girl_friday', '>= 0.11.1' -gem 'rspec-command' gem 'redis' gem 'resque' + +unless is_jruby + # JRuby doesn't support fork, which is required for this test helper. + gem 'rspec-command' +end if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0') gem 'mime-types', '< 3.0' end