Test against JRuby and Rubinius

.travis.yml

@@ -12,6 +12,8 @@ script:
 rvm:
   - 1.9.3
   - 2.1.2
+  - rbx-2
+  - jruby
 env:
   matrix:
     - RAILS=3.2.19

Gemfile

@@ -1,5 +1,4 @@
 source 'https://rubygems.org'
-
 gemspec
 
 require File.expand_path 'spec/support/detect_rails_version', File.dirname(__FILE__)
@@ -17,6 +16,10 @@ gem 'pundit'
 gem 'rake', require: false
 gem 'parallel_tests'
 
+gem RUBY_ENGINE =~ /jruby/ ? 'activerecord-jdbcsqlite3-adapter' : 'sqlite3'
+
+gem 'rubysl' if RUBY_ENGINE =~ /rbx/
+
 group :development do
   # Debugging
   gem 'pry'                # Easily debug from your console with `binding.pry`
@@ -45,6 +48,6 @@ group :test do
   gem 'rails-i18n' # Provides default i18n for many languages
   gem 'rspec'
   gem 'rspec-rails'
+  gem 'rubinius-coverage' if RUBY_ENGINE =~ /rbx/ # colszowka/simplecov#250
   gem 'shoulda-matchers'
-  gem 'sqlite3'
 end

spec/requests/memory_spec.rb

@@ -1,6 +1,11 @@
 require 'rails_helper'
 
+<<<<<<< HEAD:spec/requests/memory_spec.rb
 describe "Memory Leak", :type => :request do
+=======
+describe "Memory Leak" do
+  JRuby.objectspace = true if RUBY_ENGINE =~ /jruby/
+>>>>>>> test against JRuby and Rubinius:spec/integration/memory_spec.rb
 
   def count_instances_of(klass)
     ObjectSpace.each_object(klass) { }