diff --git a/.travis.yml b/.travis.yml index d97681e..4db834e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,7 @@ language: ruby rvm: - 1.8.7 -# TODO: fix ruby 1.9x build issues... -# - 1.9.3 + - 1.9.3 # TODO: make this work with the regular rake command script: "bundle exec rake spec" gemfile: @@ -12,4 +11,4 @@ before_script: - psql -c 'create database database_cleaner_test;' -U postgres - cp db/sample.config.yml db/config.yml services: - - mongodb \ No newline at end of file + - mongodb diff --git a/Gemfile b/Gemfile index 099ae23..0992bbc 100755 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source "http://rubygems.org" group :development do gem "rake" - gem "ruby-debug" + #gem "ruby-debug" gem "bundler" gem "jeweler" @@ -32,12 +32,21 @@ end group :test do gem "rspec-rails" - gem "rspactor" - gem "rcov" - gem "ZenTest" + #gem "rspactor" + #gem "rcov" + #gem "ZenTest" end group :cucumber do gem "cucumber" - gem 'sqlite3-ruby' +end + +platforms :mri_18 do + gem 'sqlite3-ruby', :group => :cucumber + #gem 'mysql', :group => :development +end + +platforms :mri_19 do + gem 'sqlite3', :group => :cucumber + #gem 'mysql2', :group => :development end diff --git a/Gemfile.lock b/Gemfile.lock index bf3226e..42fd8c0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,6 @@ GEM remote: http://rubygems.org/ specs: - ZenTest (4.8.1) actionpack (3.2.6) activemodel (= 3.2.6) activesupport (= 3.2.6) @@ -29,7 +28,6 @@ GEM bson_ext (1.6.4) bson (~> 1.6.4) builder (3.0.0) - columnize (0.3.6) couch_potato (0.5.7) activemodel couchrest (>= 1.0.1) @@ -113,8 +111,6 @@ GEM journey (1.0.4) json (1.7.3) json_pure (1.4.6) - linecache (0.46) - rbx-require-relative (> 0.0.4) listen (0.4.7) rb-fchange (~> 0.0.5) rb-fsevent (~> 0.9.1) @@ -160,13 +156,10 @@ GEM rb-fsevent (0.9.1) rb-inotify (0.8.8) ffi (>= 0.5.0) - rbx-require-relative (0.0.9) - rcov (1.0.0) rdoc (3.12) json (~> 1.4) rest-client (1.6.7) mime-types (>= 1.16) - rspactor (0.6.4) rspec (2.11.0) rspec-core (~> 2.11.0) rspec-expectations (~> 2.11.0) @@ -180,11 +173,6 @@ GEM activesupport (>= 3.0) railties (>= 3.0) rspec (~> 2.11.0) - ruby-debug (0.10.4) - columnize (>= 0.1) - ruby-debug-base (~> 0.10.4.0) - ruby-debug-base (0.10.4) - linecache (>= 0.3) sequel (3.21.0) sprockets (2.1.3) hike (~> 1.2) @@ -203,7 +191,6 @@ PLATFORMS ruby DEPENDENCIES - ZenTest activerecord bson_ext bundler @@ -222,10 +209,8 @@ DEPENDENCIES mysql2 pg rake - rcov - rspactor rspec-rails - ruby-debug sequel (~> 3.21.0) + sqlite3 sqlite3-ruby tzinfo diff --git a/spec/database_cleaner/active_record/truncation_spec.rb b/spec/database_cleaner/active_record/truncation_spec.rb index ee80b52..d046791 100644 --- a/spec/database_cleaner/active_record/truncation_spec.rb +++ b/spec/database_cleaner/active_record/truncation_spec.rb @@ -8,7 +8,7 @@ module ActiveRecord [MysqlAdapter, Mysql2Adapter, SQLite3Adapter, JdbcAdapter, PostgreSQLAdapter, IBM_DBAdapter].each do |adapter| describe adapter, "#truncate_table" do it "responds" do - adapter.instance_methods.should include('truncate_table') + adapter.instance_methods.should include(:truncate_table) end end end