diff options
Diffstat (limited to 'test/rails/railsresource.rb')
| -rwxr-xr-x | test/rails/railsresource.rb | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/test/rails/railsresource.rb b/test/rails/railsresource.rb index 302dd99fb..236c43594 100755 --- a/test/rails/railsresource.rb +++ b/test/rails/railsresource.rb @@ -36,9 +36,9 @@ class TestRailsResource < Test::Unit::TestCase # Now add some params params.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 + pn = Puppet::Rails::ParamName.find_or_create_by_name(param) + pv = resource.param_values.create(:value => value, + :param_name => pn) end host.save @@ -58,7 +58,7 @@ class TestRailsResource < Test::Unit::TestCase 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 ]) + resource = Puppet::Rails::Resource.find_by_id(resource.id) # Now, try to convert our resource to a real resource res = nil @@ -74,10 +74,12 @@ class TestRailsResource < Test::Unit::TestCase def test_parameters resource = mktest_resource - setparams = nil assert_nothing_raised do - setparams = resource.parameters + setparams = resource.parameters.inject({}) { |h, a| + h[a[0]] = a[1][0] + h + } end assert_equal(params, setparams, "Did not get the right answer from #parameters") |