Skip to content

Commit

Permalink
Changes to get specs to green. Remove Ruby version related dotfiles t…
Browse files Browse the repository at this point in the history
…o allow use of multiple Ruby versions
  • Loading branch information
petergoldstein committed Dec 27, 2013
1 parent c0c7885 commit 83a9e99
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,7 @@ examples/db/*.db
examples/config/database.yml
db/config.yml
db/test.sqlite3
.rbenv-version
.rvmrc
.ruby-version
.vagrant
1 change: 0 additions & 1 deletion .rbenv-version

This file was deleted.

1 change: 0 additions & 1 deletion .rvmrc

This file was deleted.

5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ language: ruby
rvm:
- 1.9.3
- 2.0.0
- 2.1.0
# TODO: make this work with the regular rake command
script: "bundle exec rake spec"
gemfile:
Expand All @@ -11,7 +12,5 @@ before_script:
- psql -c 'create database database_cleaner_test;' -U postgres
- cp db/sample.config.yml db/config.yml
services:
- redis-server
- mongodb
matrix:
allow_failures:
- rvm: 2.0.0
6 changes: 3 additions & 3 deletions spec/database_cleaner/active_record/transaction_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ module ActiveRecord
connection.should_receive(:open_transactions).and_return(1)

connection.stub(:respond_to?).with(:decrement_open_transactions).and_return(true)
connection.stub(:respond_to?).with(:rollback_transaction_records).and_return(false)
connection.stub(:respond_to?).with(:rollback_transaction_records, true).and_return(false)
connection.stub(:respond_to?).with(:rollback_transaction).and_return(false)
connection.stub(:rollback_db_transaction)

Expand All @@ -75,7 +75,7 @@ module ActiveRecord
it "should decrement connection via ActiveRecord::Base if connection won't" do
connection.should_receive(:open_transactions).and_return(1)
connection.stub(:respond_to?).with(:decrement_open_transactions).and_return(false)
connection.stub(:respond_to?).with(:rollback_transaction_records).and_return(false)
connection.stub(:respond_to?).with(:rollback_transaction_records, true).and_return(false)
connection.stub(:respond_to?).with(:rollback_transaction).and_return(false)
connection.stub(:rollback_db_transaction)

Expand Down Expand Up @@ -112,7 +112,7 @@ module ActiveRecord

it "should decrement connection via ActiveRecord::Base if connection won't" do
connection.should_receive(:open_transactions).and_return(1)
connection.stub(:respond_to?).with(:rollback_transaction_records).and_return(false)
connection.stub(:respond_to?).with(:rollback_transaction_records, true).and_return(false)
connection.stub(:respond_to?).with(:rollback_transaction).and_return(true)
connection.stub(:rollback_transaction)

Expand Down

0 comments on commit 83a9e99

Please sign in to comment.