Moving dependency requirements for JRuby to the .gemspec, removing unecessary require statements from test_helper
This commit is contained in:
parent
abd633f5a9
commit
e26a8cea9e
10
Gemfile
10
Gemfile
|
@ -1,12 +1,2 @@
|
||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
gemspec
|
gemspec
|
||||||
|
|
||||||
|
|
||||||
platform :ruby do
|
|
||||||
gem "sqlite3"
|
|
||||||
end
|
|
||||||
|
|
||||||
platform :jruby do
|
|
||||||
gem "jdbc-sqlite3"
|
|
||||||
gem "activerecord-jdbcsqlite3-adapter"
|
|
||||||
end
|
|
||||||
|
|
|
@ -20,6 +20,11 @@ Gem::Specification.new do |s|
|
||||||
|
|
||||||
s.add_development_dependency 'rake'
|
s.add_development_dependency 'rake'
|
||||||
s.add_development_dependency 'shoulda', '~> 3.3'
|
s.add_development_dependency 'shoulda', '~> 3.3'
|
||||||
s.add_development_dependency 'sqlite3', '~> 1.2' unless defined?(JRUBY_VERSION)
|
s.add_development_dependency 'ffaker', '>= 1.15'
|
||||||
s.add_development_dependency 'ffaker', '~> 2.0'
|
# JRuby support for the test ENV
|
||||||
|
unless defined?(JRUBY_VERSION)
|
||||||
|
s.add_development_dependency 'sqlite3', '~> 1.2'
|
||||||
|
else
|
||||||
|
s.add_development_dependency 'activerecord-jdbcsqlite3-adapter', '~> 1.2.9'
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,14 +1,5 @@
|
||||||
# Configure Rails Envinronment
|
# Configure Rails Envinronment
|
||||||
ENV["RAILS_ENV"] = "test"
|
ENV["RAILS_ENV"] = "test"
|
||||||
require 'bundler/setup'
|
|
||||||
|
|
||||||
if defined?(JRUBY_VERSION)
|
|
||||||
require 'jdbc/sqlite3'
|
|
||||||
require 'active_record'
|
|
||||||
require 'active_record/connection_adapters/jdbcsqlite3_adapter'
|
|
||||||
else
|
|
||||||
require 'sqlite3'
|
|
||||||
end
|
|
||||||
|
|
||||||
require File.expand_path("../dummy/config/environment.rb", __FILE__)
|
require File.expand_path("../dummy/config/environment.rb", __FILE__)
|
||||||
require "rails/test_help"
|
require "rails/test_help"
|
||||||
|
|
Loading…
Reference in New Issue