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, 11 insertions, 16 deletions

diff --git a/test/rails/railsresource.rb b/test/rails/railsresource.rb
index e109ba7d1..666d26bcf 100755
--- a/test/rails/railsresource.rb
+++ b/test/rails/railsresource.rb
@@ -22,38 +22,33 @@ class TestRailsResource < Test::Unit::TestCase
         host = Puppet::Rails::Host.new(:name => "myhost")
 
         # Now build a resource
-        resource = host.resources.create(
-            :title => "/tmp/to_resource", 
-            :exported => true)
-        
-        # For some reason the child class doesn't exist until after the resource is created.
-        # Probably an issue with the dynamic class generation.
-        resource.type = "PuppetFile"  
-        resource.save
-  
+        resource = host.rails_resources.build(
+            :title => "/tmp/to_resource", :restype => "file",
+            :exported => true
+        )
+
         # Now add some params
         {"owner" => "root", "mode" => "644"}.each do |param, value|
-            pn = resource.param_names.find_or_create_by_name(param)
-            pv = pn.param_values.find_or_create_by_value(value)
-            resource.param_names << pn
+            resource.rails_parameters.build(
+                :name => param, :value => value
+            )
         end
 
         # Now save the whole thing
         host.save
 
+        # Now, try to convert our resource to a real resource
 
         # We need a scope
         interp, scope, source = mkclassframing
 
-        # Find the new resource and include all it's parameters.
-        resource = Puppet::Rails::Resource.find_by_id(resource.id, :include => [ :param_names, :param_values ])
-
-        # Now, try to convert our resource to a real resource
         res = nil
         assert_nothing_raised do
             res = resource.to_resource(scope)
         end
+
         assert_instance_of(Puppet::Parser::Resource, res)
+
         assert_equal("root", res[:owner])
         assert_equal("644", res[:mode])
         assert_equal("/tmp/to_resource", res.title)