Merge branch 'ticket/next/maint-fix_tests_for_old_rubies' into next

* ticket/next/maint-fix_tests_for_old_rubies:
  maint: Ruby < 1.8.7 knows size but not count
  maint: Get tests passing on Ruby < 1.8.7

2 files changed, 5 insertions, 5 deletions

diff --git a/spec/integration/provider/mount_spec.rb b/spec/integration/provider/mount_spec.rb
index d6f25fe1d..646862050 100644
--- a/spec/integration/provider/mount_spec.rb
+++ b/spec/integration/provider/mount_spec.rb
@@ -56,7 +56,7 @@ describe "mount provider (integration)" do
 
   def check_fstab(expected_to_be_present)
     # Verify that the fake fstab has the expected data in it
-    fstab_contents = File.read(@fake_fstab).lines.map(&:chomp).reject { |x| x =~ /^#|^$/ }
+    fstab_contents = File.read(@fake_fstab).split("\n").reject { |x| x =~ /^#|^$/ }
     if expected_to_be_present
       fstab_contents.length().should == 1
       device, rest_of_line = fstab_contents[0].split(/\t/,2)
diff --git a/spec/unit/application/inspect_spec.rb b/spec/unit/application/inspect_spec.rb
index d334a87ee..a9a793117 100755
--- a/spec/unit/application/inspect_spec.rb
+++ b/spec/unit/application/inspect_spec.rb
@@ -246,9 +246,9 @@ describe Puppet::Application::Inspect do
         @inspect.run_command
 
         @report.status.should == "failed"
-        @report.logs.select{|log| log.message =~ /Could not inspect/}.count.should == 1
-        @report.resource_statuses.count.should == 1
-        @report.resource_statuses['Stub_type[foo]'].events.count.should == 1
+        @report.logs.select{|log| log.message =~ /Could not inspect/}.size.should == 1
+        @report.resource_statuses.size.should == 1
+        @report.resource_statuses['Stub_type[foo]'].events.size.should == 1
 
         event = @report.resource_statuses['Stub_type[foo]'].events.first
         event.property.should == "content"
@@ -265,7 +265,7 @@ describe Puppet::Application::Inspect do
 
         @inspect.run_command
 
-        @report.resource_statuses.count.should == 2
+        @report.resource_statuses.size.should == 2
         @report.resource_statuses.keys.should =~ ['Stub_type[foo]', 'Stub_type[bar]']
       end
     end