diff options
| -rwxr-xr-x | test/language/scope.rb | 2 | ||||
| -rwxr-xr-x | test/rails/railsparameter.rb | 2 | ||||
| -rwxr-xr-x | 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 eeaf179ba..77af950f5 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 defined? ::ActiveRecord # 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 7c99ac38d..aaa88e505 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 defined? ::ActiveRecord::Base class TestRailsParameter < Test::Unit::TestCase include PuppetTest::RailsTesting diff --git a/test/ral/type/file.rb b/test/ral/type/file.rb index 1e7f2862d..63d2a5270 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) |