Temporarily reverting all of the recent rails work so that I can release 0.20.1

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1873 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 15 insertions, 16 deletions

diff --git a/test/rails/railsparameter.rb b/test/rails/railsparameter.rb
index f76939ac9..46a12e57c 100755
--- a/test/rails/railsparameter.rb
+++ b/test/rails/railsparameter.rb
@@ -16,33 +16,32 @@ class TestRailsParameter < Test::Unit::TestCase
     def test_to_resourceparam
         railsinit
         # First create our parameter
-        #FIXME Need to re-add file/line support
-        pname = { :name => "myname" }
-        pvalue = { :value => "myval" }
-            pn = Puppet::Rails::ParamName.new(:name => pname[:name])
-            pv = Puppet::Rails::ParamValue.new(:value => pvalue[:value])
+        rparam = nil
+        hash = { :name => :myparam, :value => "myval",
+                :file => __FILE__, :line => __LINE__}
         assert_nothing_raised do
-            pn.param_values << pv
+            rparam = Puppet::Rails::RailsParameter.new(hash)
         end
 
-        assert(pn, "Did not create rails parameter")
+        assert(rparam, "Did not create rails parameter")
 
         # The id doesn't get assigned until we save
-        pn.save
+        rparam.save
 
         # Now create a source
         interp = mkinterp
         source = interp.newclass "myclass"
 
         # And try to convert our parameter
-        #FIXME Why does this assert prevent the block from executing?
-        #assert_nothing_raised do
-            pp = pn.to_resourceparam(source)
-        #end
-
-        assert_instance_of(Puppet::Parser::Resource::Param, pp)
-        pname.each do |name, value|
-            assert_equal(value.to_sym,  pp.send(name), "%s was not equal" % name)
+        pparam = nil
+        assert_nothing_raised do
+            pparam = rparam.to_resourceparam(source)
+        end
+
+
+        assert_instance_of(Puppet::Parser::Resource::Param, pparam)
+        hash.each do |name, value|
+            assert_equal(value,  pparam.send(name), "%s was not equal" % name)
         end
     end
 end