Skip to content

Commit 067c280

Browse files
author
Kim Burgestrand
committed
Fix specs in JRuby.
1 parent 21b68f0 commit 067c280

File tree

3 files changed

+20
-5
lines changed

3 files changed

+20
-5
lines changed

Gemfile

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
1-
source 'https://rubygems.org'
1+
source "https://rubygems.org"
22

3-
# Specify your gem's dependencies in serial.gemspec
43
gemspec
4+
5+
group :development do
6+
platform :ruby do
7+
gem "sqlite3"
8+
end
9+
10+
platform :jruby do
11+
gem "jdbc-sqlite3"
12+
gem "activerecord-jdbcsqlite3-adapter"
13+
end
14+
end

serial.gemspec

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
1010
spec.email = ["jonas@elabs.se", "kim@elabs.se"]
1111
spec.license = "MIT"
1212

13-
spec.summary = %q{Plain old Ruby for generating simple data structures from object graphs.}
13+
spec.summary = %q{Plain old Ruby for generating primitive data structures from object graphs.}
1414
spec.homepage = "https://github.com/elabs/serial"
1515

1616
spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -23,5 +23,4 @@ Gem::Specification.new do |spec|
2323
spec.add_development_dependency "rspec", "~> 3.2"
2424
spec.add_development_dependency "yard", "~> 0.8"
2525
spec.add_development_dependency "activerecord", "~> 4.0"
26-
spec.add_development_dependency "sqlite3", "~> 1.0"
2726
end

spec/serial/rails_helpers_spec.rb

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
require "active_record"
22

3-
ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
3+
adapter = if RUBY_ENGINE == "jruby"
4+
"jdbcsqlite3"
5+
else
6+
"sqlite3"
7+
end
8+
9+
ActiveRecord::Base.establish_connection(adapter: adapter, database: ":memory:")
410
ActiveRecord::Schema.define do
511
self.verbose = false
612
create_table :fake_people, :force => true do |t|

0 commit comments

Comments
 (0)