kolan
/
obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[#112] Fix tests for jruby

This commit is contained in:
Holger Just 2011-05-22 19:46:31 +02:00
parent 18247a6c58
commit 35a38086e3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/chili_project/database.rb
View File

@ -66,7 +66,7 @@ module ChiliProject
version = ActiveRecord::Base.connection.select_value('SELECT version()') version = ActiveRecord::Base.connection.select_value('SELECT version()')
raw ? version : version.match(/^PostgreSQL (\S+)/i)[1] raw ? version : version.match(/^PostgreSQL (\S+)/i)[1]
when :sqlite when :sqlite
if RUBY_ENGINE == 'jruby' if Object.const_defined?('RUBY_ENGINE') && ::RUBY_ENGINE == 'jruby'
Jdbc::SQLite3::VERSION Jdbc::SQLite3::VERSION
else else
if SQLite3.const_defined? 'SQLITE_VERSION' if SQLite3.const_defined? 'SQLITE_VERSION'

4
test/unit/lib/chili_project/database_test.rb
View File

@ -36,7 +36,7 @@ class ChiliProject::DatabaseTest < ActiveSupport::TestCase
begin begin
ChiliProject::Database.stubs(:adapter_name).returns "SQLite" ChiliProject::Database.stubs(:adapter_name).returns "SQLite"
if RUBY_ENGINE == 'jruby' if Object.const_defined?('RUBY_ENGINE') && ::RUBY_ENGINE == 'jruby'
# If we have the SQLite3 gem installed, save the old constant # If we have the SQLite3 gem installed, save the old constant
if Object.const_defined?('Jdbc') && Jdbc::SQLite3.const_defined?('SQLite3') if Object.const_defined?('Jdbc') && Jdbc::SQLite3.const_defined?('SQLite3')
sqlite3_version = Jdbc::SQLite3::VERSION sqlite3_version = Jdbc::SQLite3::VERSION
@ -70,7 +70,7 @@ class ChiliProject::DatabaseTest < ActiveSupport::TestCase
assert_equal "1.2.3", ChiliProject::Database.version(true) assert_equal "1.2.3", ChiliProject::Database.version(true)
ensure ensure
# Clean up after us # Clean up after us
if RUBY_ENGINE == 'jruby' if Object.const_defined?('RUBY_ENGINE') && ::RUBY_ENGINE == 'jruby'
if created_module if created_module
Jdbc.instance_eval{remove_const 'SQLite3' } Jdbc.instance_eval{remove_const 'SQLite3' }
elsif sqlite3_version elsif sqlite3_version