Permalink
Browse files

Use Bundler.require in test helper.

  • Loading branch information...
1 parent 9d538b7 commit a45339e127e1dd5d8ae483da0a1d43b21cfb38cf @jnunemaker jnunemaker committed Apr 20, 2012
Showing with 5 additions and 11 deletions.
  1. +1 −1 Gemfile
  2. +4 −10 test/helper.rb
View
@@ -11,7 +11,7 @@ end
group(:test) do
gem 'shoulda', '~> 2.11'
- gem 'jnunemaker-matchy', '~> 0.4.0'
+ gem 'jnunemaker-matchy', '~> 0.4.0', :require => 'matchy'
gem 'mocha', '~> 0.9.8'
gem 'log_buddy'
end
View
@@ -1,8 +1,7 @@
require 'rubygems'
-gem 'jnunemaker-matchy', '~> 0.4.0'
-gem 'log_buddy'
-gem 'shoulda', '~> 2.11'
-gem 'mocha', '~> 0.9.8'
+require 'bundler'
+
+Bundler.require(:default, :test)
$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
require 'plucky'
@@ -12,11 +11,6 @@
require 'pp'
require 'set'
-require 'log_buddy'
-require 'shoulda'
-require 'matchy'
-require 'mocha'
-
log_dir = File.expand_path('../../log', __FILE__)
FileUtils.mkdir_p(log_dir)
Log = Logger.new(File.join(log_dir, 'test.log'))
@@ -43,4 +37,4 @@ def oh(*args)
operators = %w{gt lt gte lte ne in nin mod all size exists}
operators.delete('size') if RUBY_VERSION >= '1.9.1'
-SymbolOperators = operators
+SymbolOperators = operators

0 comments on commit a45339e

Please sign in to comment.