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, 6 insertions, 5 deletions

diff --git a/test/rails/rails.rb b/test/rails/rails.rb
index 699d132a2..8be1bc66d 100755
--- a/test/rails/rails.rb
+++ b/test/rails/rails.rb
@@ -60,14 +60,13 @@ class TestRails < Test::Unit::TestCase
         }
         assert(host, "Could not find host object")
 
-        assert(host.resources, "No objects on host")
+        assert(host.rails_resources, "No objects on host")
 
-        # This changed from a hash to a method call, hope that doesn't break anything!
-        assert_equal(facts["hostname"], host.facts("hostname"),
+        assert_equal(facts["hostname"], host.facts["hostname"],
             "Did not retrieve facts")
 
         count = 0
-        host.resources.each do |resource|
+        host.rails_resources.each do |resource|
             count += 1
             i = nil
             if resource[:title] =~ /file([0-9]+)/
@@ -75,7 +74,9 @@ class TestRails < Test::Unit::TestCase
             else
                 raise "Got weird resource %s" % resource.inspect
             end
-            assert_equal("user#{i}", resource.parameters[:owner])
+
+            assert_equal("user#{i}",
+                resource.rails_parameters.find_by_name("owner")[:value])
         end
 
         assert_equal(20, count, "Did not get enough resources")