summaryrefslogtreecommitdiffstats
path: root/spec/unit/parser/collector.rb
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2009-02-11 13:51:48 -0600
committerLuke Kanies <luke@madstop.com>2009-02-11 13:51:48 -0600
commita2270b4a4f093c6c4f171dcf0c0e05fe101dd979 (patch)
treef0d893dfe6fe13c8c9e0670c1e5459ec336318ba /spec/unit/parser/collector.rb
parent9bac833dcfdd8d6a00188faee0487e787b7a0101 (diff)
parent6b0c1b9170c69829bdf5956d1dec0949dcc08b35 (diff)
downloadpuppet-a2270b4a4f093c6c4f171dcf0c0e05fe101dd979.tar.gz
puppet-a2270b4a4f093c6c4f171dcf0c0e05fe101dd979.tar.xz
puppet-a2270b4a4f093c6c4f171dcf0c0e05fe101dd979.zip
Merge branch '0.24.x'
Conflicts: CHANGELOG spec/unit/type/file/selinux.rb
Diffstat (limited to 'spec/unit/parser/collector.rb')
-rwxr-xr-xspec/unit/parser/collector.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/unit/parser/collector.rb b/spec/unit/parser/collector.rb
index edd74e25f..f92b881c8 100755
--- a/spec/unit/parser/collector.rb
+++ b/spec/unit/parser/collector.rb
@@ -240,10 +240,10 @@ describe Puppet::Parser::Collector, "when collecting exported resources" do
one = stub 'one', :type => "Mytype", :virtual? => true, :exported? => true
two = stub 'two', :type => "Mytype", :virtual? => true, :exported? => true
- one.expects(:exported=).with(false)
- one.expects(:virtual=).with(false)
- two.expects(:exported=).with(false)
- two.expects(:virtual=).with(false)
+ one.stubs(:exported=)
+ one.stubs(:virtual=)
+ two.stubs(:exported=)
+ two.stubs(:virtual=)
@compiler.expects(:resources).returns([one, two])