aboutsummaryrefslogtreecommitdiffstats
path: root/spec/spec_helper.rb
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2010-03-12 16:38:36 -0800
committerCarl Lerche <carllerche@mac.com>2010-03-12 16:38:36 -0800
commit3ab6ae0c601d1b4459efd8bb39650fee370aa5b8 (patch)
tree7ec7bb6ab71094cca2b61190728efb2e0c2e1497 /spec/spec_helper.rb
parent0e6888232a19c8c59416490d3da6079e590fab77 (diff)
downloadrails-3ab6ae0c601d1b4459efd8bb39650fee370aa5b8.tar.gz
rails-3ab6ae0c601d1b4459efd8bb39650fee370aa5b8.tar.bz2
rails-3ab6ae0c601d1b4459efd8bb39650fee370aa5b8.zip
Organize the matchers a bit more
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r--spec/spec_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 894e70c29d..5941840437 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -7,12 +7,12 @@ require 'pp'
require 'fileutils'
require 'arel'
-Dir["#{dir}/support/*.rb"].each do |file|
+Dir["#{dir}/{support,shared}/*.rb"].each do |file|
require file
end
Spec::Runner.configure do |config|
- config.include BeLikeMatcher, HashTheSameAsMatcher, DisambiguateAttributesMatcher
+ config.include Matchers
config.include AdapterGuards
config.include Check