Permalink
Browse files

Merge remote branch 'krek/fake_record_adapter'

* krek/fake_record_adapter:
  'sqlite3' ==> {:adapter => 'sqlite3'}

Conflicts:
	spec/support/fake_record.rb
  • Loading branch information...
2 parents e75f0e5 + a4f5ccf commit 31e3033ed9059577e60a8e25962f55bc4a918fd7 @tenderlove tenderlove committed Sep 28, 2010
Showing with 1 addition and 1 deletion.
  1. +1 −1 spec/support/fake_record.rb
@@ -66,7 +66,7 @@ class Spec < Struct.new(:config)
attr_reader :spec, :connection
def initialize
- @spec = Spec.new('sqlite3')
+ @spec = Spec.new(:adapter => 'sqlite3')
@connection = Connection.new
end

0 comments on commit 31e3033

Please sign in to comment.