New rails stuff redux.

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

1 files changed, 6 insertions, 4 deletions

diff --git a/test/language/ast.rb b/test/language/ast.rb
index d414a4f96..733ca4b36 100755
--- a/test/language/ast.rb
+++ b/test/language/ast.rb
@@ -458,7 +458,7 @@ class TestAST < Test::Unit::TestCase
 
         # make a rails resource
         railsresource "file", "/tmp/testing", :owner => "root", :group => "bin",
-            :mode => "644"
+            :mode => "644" 
 
         run_collection_queries(:exported) do |string, result, query|
             code = nil
@@ -487,8 +487,8 @@ class TestAST < Test::Unit::TestCase
                 end
             end
             assert_nothing_raised("Could not find resource") do
-                retval = Puppet::Rails::RailsResource.find(:all,
-                    :include => :rails_parameters,
+                retval = Puppet::Rails::Resource.find(:all,
+                    :include => :param_names,
                     :conditions => str) 
             end
 
@@ -496,7 +496,9 @@ class TestAST < Test::Unit::TestCase
                 assert_equal(1, retval.length, "Did not find resource with '#{string}'")
                 res = retval.shift
 
-                assert_equal("file", res.restype)
+		# Not sure this is correct, maybe we need a case statement to convert to/from 
+                # the autogenerated Puppet<Type> classes to <type>
+                assert_equal(PuppetFile, res.class)
                 assert_equal("/tmp/testing", res.title)
             else
                 assert_equal(0, retval.length, "found a resource with '#{string}'")