Changing the test/ classes so that they work from the main

test/ dir or from their own working dir, like the specs do.
This was just a question of changing how their libraries
are loaded.

7 files changed, 7 insertions, 7 deletions

diff --git a/test/language/ast/casestatement.rb b/test/language/ast/casestatement.rb
index 4623a2235..0a744b686 100755
--- a/test/language/ast/casestatement.rb
+++ b/test/language/ast/casestatement.rb
@@ -3,7 +3,7 @@
 #  Created by Luke A. Kanies on 2006-12-22.
 #  Copyright (c) 2006. All rights reserved.
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'puppettest/parsertesting'
diff --git a/test/language/ast/definition.rb b/test/language/ast/definition.rb
index d4c987362..b4d58a289 100755
--- a/test/language/ast/definition.rb
+++ b/test/language/ast/definition.rb
@@ -3,7 +3,7 @@
 #  Created by Luke A. Kanies on 2006-02-20.
 #  Copyright (c) 2006. All rights reserved.
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'mocha'
diff --git a/test/language/ast/hostclass.rb b/test/language/ast/hostclass.rb
index f747779b3..62d4f9ee3 100755
--- a/test/language/ast/hostclass.rb
+++ b/test/language/ast/hostclass.rb
@@ -3,7 +3,7 @@
 #  Created by Luke A. Kanies on 2006-02-20.
 #  Copyright (c) 2006. All rights reserved.
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'puppettest/parsertesting'
diff --git a/test/language/ast/resource.rb b/test/language/ast/resource.rb
index 9ef5181af..49c64112d 100755
--- a/test/language/ast/resource.rb
+++ b/test/language/ast/resource.rb
@@ -3,7 +3,7 @@
 #  Created by Luke A. Kanies on 2007-07-8.
 #  Copyright (c) 2007. All rights reserved.
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'puppettest/parsertesting'
diff --git a/test/language/ast/resource_reference.rb b/test/language/ast/resource_reference.rb
index e8883afb9..d3b1ffd8f 100755
--- a/test/language/ast/resource_reference.rb
+++ b/test/language/ast/resource_reference.rb
@@ -3,7 +3,7 @@
 #  Created by Luke A. Kanies on 2007-07-8.
 #  Copyright (c) 2007. All rights reserved.
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'puppettest/parsertesting'
diff --git a/test/language/ast/selector.rb b/test/language/ast/selector.rb
index 7394f5f7d..535fcbf70 100755
--- a/test/language/ast/selector.rb
+++ b/test/language/ast/selector.rb
@@ -3,7 +3,7 @@
 #  Created by Luke A. Kanies on 2006-12-22.
 #  Copyright (c) 2006. All rights reserved.
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'puppettest/parsertesting'
diff --git a/test/language/ast/variable.rb b/test/language/ast/variable.rb
index bf22021d0..09122ce16 100755
--- a/test/language/ast/variable.rb
+++ b/test/language/ast/variable.rb
@@ -3,7 +3,7 @@
 #  Created by Luke A. Kanies on 2007-0419.
 #  Copyright (c) 2006. All rights reserved.
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'puppettest/parsertesting'