summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/bundler/ssl_certs/certificate_manager.rb2
-rw-r--r--spec/bundler/ssl_certs/certificate_manager_spec.rb2
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