From a15a70c7cda9962e56b16ed7129bf6772f1df038 Mon Sep 17 00:00:00 2001 From: Markus Roberts Date: Tue, 18 May 2010 11:58:35 -0700 Subject: Fixing tests broken by conceptual merge conflicts A minor api change and an even less significant variable name change in earlier commits broke two test. --- spec/unit/application/cert.rb | 4 ++-- spec/unit/ssl/certificate_authority/interface.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/unit/application/cert.rb b/spec/unit/application/cert.rb index 66c6aeac8..ba6ba1d2d 100644 --- a/spec/unit/application/cert.rb +++ b/spec/unit/application/cert.rb @@ -56,8 +56,8 @@ describe Puppet::Application::Cert do end it "should set signed to true for --signed" do - @puppetca.handle_signed(0) - @puppetca.signed.should be_true + @cert_app.handle_signed(0) + @cert_app.signed.should be_true end Puppet::SSL::CertificateAuthority::Interface::INTERFACE_METHODS.reject { |m| m == :destroy }.each do |method| diff --git a/spec/unit/ssl/certificate_authority/interface.rb b/spec/unit/ssl/certificate_authority/interface.rb index d38e31b1b..f3b9107c5 100755 --- a/spec/unit/ssl/certificate_authority/interface.rb +++ b/spec/unit/ssl/certificate_authority/interface.rb @@ -219,7 +219,7 @@ describe Puppet::SSL::CertificateAuthority::Interface do it "should print a string containing all signed certificate requests and certificates" do @ca.expects(:list).returns %w{host1 host2} - @applier = @class.new(:list, :signed) + @applier = @class.new(:list, :to => :signed) @applier.apply(@ca) end -- cgit