Merge pull request #440 from strzalek/jruby-tests

Make tests pass on jruby

.travis.yml

@@ -11,7 +11,6 @@ gemfile:
 matrix:
   allow_failures:
     - gemfile: Gemfile.edge
-    - rvm: jruby-19mode
 notifications:
   email: false
   campfire:

Gemfile

@@ -3,7 +3,14 @@ source 'https://rubygems.org'
 # Specify gem dependencies in active_model_serializers.gemspec
 gemspec
 
-gem 'sqlite3'
+platforms :ruby do
+  gem 'sqlite3'
+end
+
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter'
+end
+
 gem 'coveralls', :require => false
 gem 'simplecov', :require => false
 

Gemfile.edge

@@ -2,7 +2,14 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'sqlite3'
+platforms :ruby do
+  gem 'sqlite3'
+end
+
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter'
+end
+
 gem 'coveralls', :require => false
 gem 'simplecov', :require => false
 

Gemfile.rails3

@@ -3,7 +3,15 @@ source 'https://rubygems.org'
 # Specify gem dependencies in active_model_serializers.gemspec
 gemspec
 
-gem 'sqlite3'
+
+platforms :ruby do
+  gem 'sqlite3'
+end
+
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter'
+end
+
 gem 'coveralls', :require => false
 gem 'simplecov', :require => false