From b389392c23032090c80cfe42ee19c2d8d45dff64 Mon Sep 17 00:00:00 2001 From: Jesse Wolfe Date: Thu, 1 Jul 2010 15:17:01 -0700 Subject: maint: spec_helper should only get loaded once Added a C-style if-defined? guard to spec_helper.rb to make sure that it only gets evaluated once. (The file is getting loaded multiple times because ruby gets confused by relative paths in `require` statements) --- spec/spec_helper.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 0ea24bb77..e1b65e6de 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,3 +1,6 @@ +unless defined? SPEC_HELPER_IS_LOADED +SPEC_HELPER_IS_LOADED = 1 + dir = File.expand_path(File.dirname(__FILE__)) $LOAD_PATH.unshift("#{dir}/") @@ -75,3 +78,5 @@ Puppet[:vardir] = "/dev/null" class Object alias :must :should end + +end -- cgit