Skip to content

Commit

Permalink
Depend on mysql2 gem for database testing operations instead of sqlite
Browse files Browse the repository at this point in the history
SQLite was having incompatibility issues with Ruby 1.9.3.  This makes
for a higher barrier to entry when testing carrier wave locally but
ensure that tests can pass on TravisCI.
  • Loading branch information
bensie committed Jan 20, 2012
1 parent 5783c36 commit de123f1
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 23 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Expand Up @@ -20,3 +20,6 @@ matrix:
gemfile: gemfiles/rails_master.gemfile
- rvm: rbx-18mode
gemfile: gemfiles/rails_master.gemfile

before_script:
- "mysql -e 'create database carrierwave_test;'"
8 changes: 1 addition & 7 deletions carrierwave.gemspec
Expand Up @@ -24,13 +24,7 @@ Gem::Specification.new do |s|

s.add_dependency "activesupport", ">= 3.2.0.rc2"

if defined?(JRUBY_VERSION)
s.add_development_dependency "activerecord-jdbc-adapter"
s.add_development_dependency "jdbc-sqlite3"
else
s.add_development_dependency "sqlite3"
end

s.add_development_dependency "mysql2"
s.add_development_dependency "rails", ">= 3.2.0.rc2"
s.add_development_dependency "cucumber", "1.1.4"
s.add_development_dependency "json"
Expand Down
14 changes: 6 additions & 8 deletions features/support/activerecord.rb
@@ -1,19 +1,17 @@
# encoding: utf-8

unless defined?(JRUBY_VERSION)
# not sure why we need to do this
require 'sqlite3/sqlite3_native'
require 'sqlite3'
end
require 'mysql2'

require 'active_record'
require 'carrierwave/mount'
require 'carrierwave/orm/activerecord'

# change this if sqlite is unavailable
# Change this if MySQL is unavailable
dbconfig = {
:adapter => 'sqlite3',
:database => ':memory:'
:adapter => 'mysql2',
:database => 'carrierwave_test',
:username => 'root',
:encoding => 'utf8'
}

ActiveRecord::Base.establish_connection(dbconfig)
Expand Down
8 changes: 5 additions & 3 deletions spec/orm/activerecord_spec.rb
Expand Up @@ -4,10 +4,12 @@

require 'carrierwave/orm/activerecord'

# change this if sqlite is unavailable
# Change this if MySQL is unavailable
dbconfig = {
:adapter => 'sqlite3',
:database => ':memory:'
:adapter => 'mysql2',
:database => 'carrierwave_test',
:username => 'root',
:encoding => 'utf8'
}

ActiveRecord::Base.establish_connection(dbconfig)
Expand Down
6 changes: 1 addition & 5 deletions spec/spec_helper.rb
Expand Up @@ -12,11 +12,7 @@
require 'open-uri'
require 'sham_rack'

unless defined?(JRUBY_VERSION)
# not sure why we need to do this
require 'sqlite3/sqlite3_native'
require 'sqlite3'
end
require 'mysql2'

require 'fog'
require 'storage/fog_helper'
Expand Down

0 comments on commit de123f1

Please sign in to comment.