summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Roberts <Markus@reality.com>2010-05-18 11:58:35 -0700
committertest branch <puppet-dev@googlegroups.com>2010-02-17 06:50:53 -0800
commita15a70c7cda9962e56b16ed7129bf6772f1df038 (patch)
tree6ec986a816a025b4be32c590896601dc49de43ce
parent5988f76aac63c4cb33c3e138c830eaf8aa4abfff (diff)
downloadpuppet-a15a70c7cda9962e56b16ed7129bf6772f1df038.tar.gz
puppet-a15a70c7cda9962e56b16ed7129bf6772f1df038.tar.xz
puppet-a15a70c7cda9962e56b16ed7129bf6772f1df038.zip
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.
-rw-r--r--spec/unit/application/cert.rb4
-rwxr-xr-xspec/unit/ssl/certificate_authority/interface.rb2
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