Skip to content

Commit f99d36b

Browse files
committed
Fix for JRuby on Travis.
1 parent 7ebbf2c commit f99d36b

File tree

3 files changed

+7
-107
lines changed

3 files changed

+7
-107
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ test/dummy/log/*.log
77
test/dummy/tmp/
88
test/dummy/.sass-cache
99
*.gem
10+
Gemfile.lock

Gemfile.lock

Lines changed: 0 additions & 106 deletions
This file was deleted.

rails-controller-testing.gemspec

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,10 @@ Gem::Specification.new do |s|
1919

2020
s.add_dependency "rails", ">= 4.2"
2121

22-
s.add_development_dependency "sqlite3"
22+
if defined?(JRUBY_VERSION)
23+
s.add_development_dependency "jdbc-sqlite3"
24+
s.add_development_dependency "activerecord-jdbc-adapter"
25+
else
26+
s.add_development_dependency "sqlite3"
27+
end
2328
end

0 commit comments

Comments
 (0)