diff options
| author | Andre Arko <andre@arko.net> | 2011-09-22 20:45:52 -0700 |
|---|---|---|
| committer | Andre Arko <andre@arko.net> | 2011-09-22 20:45:52 -0700 |
| commit | 29f74a0d58b6351831db0c4bdc89c7bdcbcaad71 (patch) | |
| tree | aad5f94ac477276c7b4707136a722deec399c700 | |
| parent | 4c25708ab7e487b2bd689d671ad12f3c039a272a (diff) | |
| download | bundler-29f74a0d58b6351831db0c4bdc89c7bdcbcaad71.tar.gz | |
load psych before yaml in the specs
| -rw-r--r-- | spec/spec_helper.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index fc7ccebf20..bb2a2de09b 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,6 +1,13 @@ $:.unshift File.expand_path('..', __FILE__) $:.unshift File.expand_path('../../lib', __FILE__) +begin + require 'psych' +rescue LoadError +ensure + require 'yaml' +end + require 'fileutils' require 'rubygems' require 'bundler' |