diff options
| author | Josh Susser <josh@hasmanythrough.com> | 2008-03-15 18:13:46 -0700 |
|---|---|---|
| committer | Josh Susser <josh@hasmanythrough.com> | 2008-03-15 18:13:46 -0700 |
| commit | 9c00e8b0f0dc422e4bf5efa3fb79cda2cb0ac6a1 (patch) | |
| tree | a5ce787629563b0265be9d35c1adf3a9504a4012 /spec/spec_helper.rb | |
| parent | 5d7c8176f1df8df819dadb1973a202a1c2d9836d (diff) | |
| parent | cd9efb9eec6198f08b4fd5d754a33aa1b1669b37 (diff) | |
| download | rails-9c00e8b0f0dc422e4bf5efa3fb79cda2cb0ac6a1.tar.gz rails-9c00e8b0f0dc422e4bf5efa3fb79cda2cb0ac6a1.tar.bz2 rails-9c00e8b0f0dc422e4bf5efa3fb79cda2cb0ac6a1.zip | |
merge changes from nick
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index cd9c8e96cb..01a703a7d4 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -26,9 +26,9 @@ class Hash end Spec::Runner.configure do |config| - config.include(BeLikeMatcher) + config.include(BeLikeMatcher, HashTheSameAsMatcher) config.mock_with :rr config.before do - ActiveRelation::Table.engine = ActiveRecord::Base.connection + ActiveRelation::Table.engine = ActiveRelation::Engine.new(ActiveRecord::Base) end end
\ No newline at end of file |