diff options
| author | Paul Berry <paul@puppetlabs.com> | 2010-11-29 16:32:41 -0800 |
|---|---|---|
| committer | Paul Berry <paul@puppetlabs.com> | 2010-11-30 12:03:57 -0800 |
| commit | beb85d65e4cced7691163add392f53ec58cb1a3d (patch) | |
| tree | 3db2c281fca6b507d90a5915afac9673e065c5b3 /spec/unit/ssl | |
| parent | 3063000155ddc475d1703d10cfc13770f687c3b2 (diff) | |
| download | puppet-beb85d65e4cced7691163add392f53ec58cb1a3d.tar.gz puppet-beb85d65e4cced7691163add392f53ec58cb1a3d.tar.xz puppet-beb85d65e4cced7691163add392f53ec58cb1a3d.zip | |
Maint: Moved auto-signing logic into an indirector extension
Autosigning was previously accomplished by overriding
CertificateRequest#save. This meant that it wouldn't work if
certificate requests were saved via a direct call to Indirection#save.
Changed it to use the indirector :extend mechanism, which works no
matter how the save is invoked.
Diffstat (limited to 'spec/unit/ssl')
| -rwxr-xr-x | spec/unit/ssl/certificate_request_spec.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/spec/unit/ssl/certificate_request_spec.rb b/spec/unit/ssl/certificate_request_spec.rb index f37f9bae4..25b77b332 100755 --- a/spec/unit/ssl/certificate_request_spec.rb +++ b/spec/unit/ssl/certificate_request_spec.rb @@ -200,7 +200,9 @@ describe Puppet::SSL::CertificateRequest do Puppet::SSL::CertificateAuthority.expects(:instance).returns ca csr = Puppet::SSL::CertificateRequest.new("me") - Puppet::SSL::CertificateRequest.indirection.expects(:save).with(csr, nil) + terminus = mock 'terminus' + Puppet::SSL::CertificateRequest.indirection.expects(:prepare).returns(terminus) + terminus.expects(:save).with { |request| puts request.key.inspect; request.instance == csr && request.key == "me" } csr.save end @@ -211,7 +213,9 @@ describe Puppet::SSL::CertificateRequest do Puppet::SSL::CertificateAuthority.expects(:instance).returns nil csr = Puppet::SSL::CertificateRequest.new("me") - Puppet::SSL::CertificateRequest.indirection.expects(:save).with(csr, nil) + terminus = mock 'terminus' + Puppet::SSL::CertificateRequest.indirection.expects(:prepare).returns(terminus) + terminus.expects(:save).with { |request| puts request.key.inspect; request.instance == csr && request.key == "me" } csr.save end |