diff options
| author | James Wen <jrw2175@columbia.edu> | 2016-03-28 18:08:31 -0400 |
|---|---|---|
| committer | James Wen <jrw2175@columbia.edu> | 2016-03-28 20:31:14 -0400 |
| commit | 82b6e996572fb3475e7327c92b9bfff824896340 (patch) | |
| tree | be4b11d51b3f8f7878ba42457b3055e03ab16aed | |
| parent | c1311ce4a6210006f4953c10841e0ecaeb080046 (diff) | |
| download | bundler-82b6e996572fb3475e7327c92b9bfff824896340.tar.gz | |
Have `Bundler::SSLCerts::CertificateManager` use new `ssl_certs` dir
structure for `#certificates_in`
| -rw-r--r-- | lib/bundler/ssl_certs/certificate_manager.rb | 2 | ||||
| -rw-r--r-- | spec/bundler/ssl_certs/certificate_manager_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/bundler/ssl_certs/certificate_manager.rb b/lib/bundler/ssl_certs/certificate_manager.rb index f858b1e3c1..a5e5d84b64 100644 --- a/lib/bundler/ssl_certs/certificate_manager.rb +++ b/lib/bundler/ssl_certs/certificate_manager.rb @@ -48,7 +48,7 @@ module Bundler private def certificates_in(path) - Dir[File.join(path, "*/*.pem")].sort + Dir[File.join(path, "**/*.pem")].sort end def store diff --git a/spec/bundler/ssl_certs/certificate_manager_spec.rb b/spec/bundler/ssl_certs/certificate_manager_spec.rb index 7ac8d66791..d4b76125c0 100644 --- a/spec/bundler/ssl_certs/certificate_manager_spec.rb +++ b/spec/bundler/ssl_certs/certificate_manager_spec.rb @@ -51,7 +51,7 @@ describe Bundler::SSLCerts::CertificateManager do describe "#up_to_date?" do context "when bundler certs and rubygems certs are the same" do before do - bundler_certs = Dir[File.join(root.to_s, "lib", "bundler", "ssl_certs", "*.pem")] + bundler_certs = Dir[File.join(root.to_s, "lib", "bundler", "ssl_certs", "**", "*.pem")] FileUtils.rm(stub_cert) FileUtils.cp(bundler_certs, rubygems_certs_dir) end |