+1 On May 2, 2009, at 4:46 PM, Brice Figureau wrote:
> > Signed-off-by: Brice Figureau <[email protected]> > --- > test/language/scope.rb | 2 +- > test/rails/railsparameter.rb | 2 +- > test/ral/type/file.rb | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/test/language/scope.rb b/test/language/scope.rb > index eeaf179..0fbc17d 100755 > --- a/test/language/scope.rb > +++ b/test/language/scope.rb > @@ -404,7 +404,7 @@ class TestScope < Test::Unit::TestCase > end > end > > - if defined? ActiveRecord > + if Puppet.features.rails? > # Verify that we can both store and collect an object in the same > # run, whether it's in the same scope as a collection or a > different > # scope. > diff --git a/test/rails/railsparameter.rb b/test/rails/ > railsparameter.rb > index 7c99ac3..5c53a6f 100755 > --- a/test/rails/railsparameter.rb > +++ b/test/rails/railsparameter.rb > @@ -8,7 +8,7 @@ require 'puppettest' > require 'puppettest/railstesting' > > # Don't do any tests w/out this class > -if defined? ActiveRecord::Base > +if Puppet.features.rails? > class TestRailsParameter < Test::Unit::TestCase > include PuppetTest::RailsTesting > > diff --git a/test/ral/type/file.rb b/test/ral/type/file.rb > index 1e7f286..63d2a52 100755 > --- a/test/ral/type/file.rb > +++ b/test/ral/type/file.rb > @@ -1159,7 +1159,7 @@ class TestFile < Test::Unit::TestCase > > wh = mock 'writehandle', :print => nil > rh = mock 'readhandle' > - > rh > .expects(:read).with(512).times(2).returns("other").then.returns(nil) > + > rh > .expects(:read).with(4096).times(2).returns("other").then.returns(nil) > File.expects(:open).with { |*args| args[0] == tmpfile and > args[1] != "r" }.yields(wh) > File.expects(:open).with { |*args| args[0] == tmpfile and > args[1] == "r" }.yields(rh) > > -- > 1.6.0.2 > > > > -- 'Tis better to be silent and be thought a fool, than to speak and remove all doubt. --Abraham Lincoln --------------------------------------------------------------------- Luke Kanies | http://reductivelabs.com | http://madstop.com --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en -~----------~----~----~----~------~----~------~--~---
