Ruby 2.5

mlt · May 17, 2018 · c33104c · c33104c
1 parent 0023d1a
commit c33104c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ rvm:
 #  -  2.1.10
   -  2.2.6
   -  2.3.3
-  -  2.4.2
+  -  2.4.4
+  -  2.5.1
   -  jruby-9.1.13.0
 script: "bundle exec rspec spec"
-
diff --git a/Gemfile b/Gemfile
@@ -25,7 +25,14 @@ group :development, :test do
     gem 'activerecord-jdbc-adapter'
     gem 'jdbc-sqlite3'
   else
-    gem 'sqlite3'
+    # gem 'sqlite3' # , '1.3.11'
+    v250 = Gem::Version.new('2.5.0')
+    vr = Gem::Version.new(RUBY_VERSION)
+    if Gem.win_platform? and vr >= v250
+      gem 'sqlite3', git: "https://github.com/larskanis/sqlite3-ruby", branch: "add-gemspec"
+    else
+      gem 'sqlite3'
+    end
   end
   gem 'minitest'
   gem 'launchy'

diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
@@ -13,6 +13,7 @@
 require 'spec_helper'
 
 Capybara.javascript_driver = :poltergeist
+Capybara.server = :webrick
 
 Capybara.register_driver :poltergeist do |app|
   Capybara::Poltergeist::Driver.new(app, {js_errors: true})