From c1311ce4a6210006f4953c10841e0ecaeb080046 Mon Sep 17 00:00:00 2001 From: James Wen Date: Tue, 22 Mar 2016 00:01:43 -0400 Subject: Fix `Bundler::SSLCerts::CertificateManager` specs to use new subdirectory structure for ssl certs --- spec/bundler/ssl_certs/certificate_manager_spec.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/spec/bundler/ssl_certs/certificate_manager_spec.rb b/spec/bundler/ssl_certs/certificate_manager_spec.rb index 5a1650b4..7ac8d667 100644 --- a/spec/bundler/ssl_certs/certificate_manager_spec.rb +++ b/spec/bundler/ssl_certs/certificate_manager_spec.rb @@ -3,9 +3,9 @@ require "spec_helper" require "bundler/ssl_certs/certificate_manager" describe Bundler::SSLCerts::CertificateManager do - let(:rubygems_path) { root } - let(:stub_cert) { File.join(root.to_s, "lib", "rubygems", "ssl_certs", "ssl-cert.pem") } - let(:rubygems_certs_dir) { File.join(root.to_s, "lib", "rubygems", "ssl_certs") } + let(:rubygems_path) { root } + let(:stub_cert) { File.join(root.to_s, "lib", "rubygems", "ssl_certs", "rubygems.org", "ssl-cert.pem") } + let(:rubygems_certs_dir) { File.join(root.to_s, "lib", "rubygems", "ssl_certs", "rubygems.org") } subject { described_class.new(rubygems_path) } @@ -37,13 +37,13 @@ describe Bundler::SSLCerts::CertificateManager do end it "should set bundler_certs as the paths of the bundler ssl certs" do - expect(subject.bundler_certs).to include(File.join(root, "lib/bundler/ssl_certs/AddTrustExternalCARoot.pem")) - expect(subject.bundler_certs).to include(File.join(root, "lib/bundler/ssl_certs/GeoTrustGlobalCA.pem")) + expect(subject.bundler_certs).to include(File.join(root, "lib/bundler/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem")) + expect(subject.bundler_certs).to include(File.join(root, "lib/bundler/ssl_certs/index.rubygems.org/GlobalSignRoot.pem")) end context "when rubygems_path is not nil" do it "should set rubygems_certs" do - expect(subject.rubygems_certs).to include(File.join(root, "lib", "rubygems", "ssl_certs", "ssl-cert.pem")) + expect(subject.rubygems_certs).to include(File.join(root, "lib", "rubygems", "ssl_certs", "rubygems.org", "ssl-cert.pem")) end end end -- cgit v1.2.3