summaryrefslogtreecommitdiff
path: root/spec/unit/puppet
diff options
context:
space:
mode:
authorKen Barber <ken@bob.sh>2012-01-11 14:53:13 +0000
committerKen Barber <ken@bob.sh>2012-01-11 14:53:13 +0000
commitc4b836e322deab90f4cf27e8efe4f1a1c91cf235 (patch)
tree3c5b192d2224beb168dc38af6c1cc1652fce9fb7 /spec/unit/puppet
parent3ef86923ae284df81b87bf055a83b682a873228a (diff)
parentb082094599f4cd26c9cb0c67ae44880b0dc02407 (diff)
downloadpuppet-stdlib-c4b836e322deab90f4cf27e8efe4f1a1c91cf235.tar.gz
puppet-stdlib-c4b836e322deab90f4cf27e8efe4f1a1c91cf235.tar.bz2
Merge branch '2.2.x'
* 2.2.x: (#11873) time function spec failure on Fixnum matcher
Diffstat (limited to 'spec/unit/puppet')
-rw-r--r--spec/unit/puppet/parser/functions/time_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/unit/puppet/parser/functions/time_spec.rb b/spec/unit/puppet/parser/functions/time_spec.rb
index 666e8e0..5d6cd97 100644
--- a/spec/unit/puppet/parser/functions/time_spec.rb
+++ b/spec/unit/puppet/parser/functions/time_spec.rb
@@ -20,7 +20,7 @@ describe "the time function" do
it "should return a number" do
result = @scope.function_time([])
- result.class.should(eq(Fixnum))
+ result.should be_an(Integer)
end
it "should be higher then when I wrote this test" do