test/language/transportable.rb in puppet-0.18.4 vs test/language/transportable.rb in puppet-0.22.4

@@ -1,21 +1,17 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 
-if __FILE__ == $0
-    $:.unshift '../../lib'
-    $:.unshift '..'
-    $puppetbase = "../.."
-end
+$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppet'
 require 'puppet/transportable'
-require 'test/unit'
 require 'puppettest'
+require 'puppettest/parsertesting'
 require 'yaml'
 
 class TestTransportable < Test::Unit::TestCase
-	include ParserTesting
+    include PuppetTest::ParserTesting
 
     def test_yamldumpobject
         obj = mk_transobject
         obj.to_yaml_properties
         str = nil
@@ -105,5 +101,7 @@
         assert_equal(collectable.length,
             top.flatten.find_all { |o| o.collectable }.length,
             "Found incorrect number of collectable objects")
     end
 end
+
+# $Id: transportable.rb 1793 2006-10-16 22:01:40Z luke $