bundler 1.2.5 → 1.3.0.pre

data/spec/cache/git_spec.rb

@@ -3,12 +3,12 @@ require "spec_helper"
 describe "git base name" do
   it "base_name should strip private repo uris" do
     source  = Bundler::Source::Git.new("uri" => "git@github.com:bundler.git")
-    source.send(:base_name).should == "bundler"
+    expect(source.send(:base_name)).to eq("bundler")
   end
 
   it "base_name should strip network share paths" do
     source = Bundler::Source::Git.new("uri" => "//MachineName/ShareFolder")
-    source.send(:base_name).should == "ShareFolder"
+    expect(source.send(:base_name)).to eq("ShareFolder")
   end
 end
 
@@ -23,9 +23,9 @@ end
       G
 
       bundle "#{cmd} --all"
-      bundled_app("vendor/cache/foo-1.0-#{ref}").should exist
-      bundled_app("vendor/cache/foo-1.0-#{ref}/.git").should_not exist
-      bundled_app("vendor/cache/foo-1.0-#{ref}/.bundlecache").should be_file
+      expect(bundled_app("vendor/cache/foo-1.0-#{ref}")).to exist
+      expect(bundled_app("vendor/cache/foo-1.0-#{ref}/.git")).not_to exist
+      expect(bundled_app("vendor/cache/foo-1.0-#{ref}/.bundlecache")).to be_file
 
       FileUtils.rm_rf lib_path("foo-1.0")
       should_be_installed "foo 1.0"
@@ -42,8 +42,8 @@ end
       bundle "install --path vendor/bundle"
       bundle "#{cmd} --all"
 
-      bundled_app("vendor/cache/foo-1.0-#{ref}").should exist
-      bundled_app("vendor/cache/foo-1.0-#{ref}/.git").should_not exist
+      expect(bundled_app("vendor/cache/foo-1.0-#{ref}")).to exist
+      expect(bundled_app("vendor/cache/foo-1.0-#{ref}/.git")).not_to exist
 
       FileUtils.rm_rf lib_path("foo-1.0")
       should_be_installed "foo 1.0"
@@ -59,7 +59,7 @@ end
       bundle "#{cmd} --all"
       bundle "#{cmd} --all"
 
-      err.should == ""
+      expect(err).to eq("")
       FileUtils.rm_rf lib_path("foo-1.0")
       should_be_installed "foo 1.0"
     end
@@ -79,17 +79,17 @@ end
       end
 
       ref = git.ref_for("master", 11)
-      ref.should_not == old_ref
+      expect(ref).not_to eq(old_ref)
 
       bundle "update"
       bundle "#{cmd} --all"
 
-      bundled_app("vendor/cache/foo-1.0-#{ref}").should exist
-      bundled_app("vendor/cache/foo-1.0-#{old_ref}").should_not exist
+      expect(bundled_app("vendor/cache/foo-1.0-#{ref}")).to exist
+      expect(bundled_app("vendor/cache/foo-1.0-#{old_ref}")).not_to exist
 
       FileUtils.rm_rf lib_path("foo-1.0")
       run "require 'foo'"
-      out.should == "CACHE"
+      expect(out).to eq("CACHE")
     end
 
     it "uses the local repository to generate the cache" do
@@ -104,7 +104,7 @@ end
       bundle "install"
       bundle "#{cmd} --all"
 
-      bundled_app("vendor/cache/foo-invalid-#{ref}").should exist
+      expect(bundled_app("vendor/cache/foo-invalid-#{ref}")).to exist
 
       # Updating the local still uses the local.
       update_git "foo" do |s|
@@ -112,7 +112,7 @@ end
       end
 
       run "require 'foo'"
-      out.should == "LOCAL"
+      expect(out).to eq("LOCAL")
     end
 
     it "copies repository to vendor cache, including submodules" do
@@ -136,14 +136,13 @@ end
       ref = git.ref_for("master", 11)
       bundle "#{cmd} --all"
 
-      bundled_app("vendor/cache/has_submodule-1.0-#{ref}").should exist
-      bundled_app("vendor/cache/has_submodule-1.0-#{ref}/submodule-1.0").should exist
+      expect(bundled_app("vendor/cache/has_submodule-1.0-#{ref}")).to exist
+      expect(bundled_app("vendor/cache/has_submodule-1.0-#{ref}/submodule-1.0")).to exist
       should_be_installed "has_submodule 1.0"
     end
 
     it "displays warning message when detecting git repo in Gemfile" do
-      git = build_git "foo"
-      ref = git.ref_for("master", 11)
+      build_git "foo"
 
       install_gemfile <<-G
         gem "foo", :git => '#{lib_path("foo-1.0")}'
@@ -151,12 +150,11 @@ end
 
       bundle "#{cmd}"
 
-      out.should include("Your Gemfile contains path and git dependencies.")
+      expect(out).to include("Your Gemfile contains path and git dependencies.")
     end
 
     it "does not display warning message if cache_all is set in bundle config" do
-      git = build_git "foo"
-      ref = git.ref_for("master", 11)
+      build_git "foo"
 
       install_gemfile <<-G
         gem "foo", :git => '#{lib_path("foo-1.0")}'
@@ -165,7 +163,7 @@ end
       bundle "#{cmd} --all"
       bundle "#{cmd}"
 
-      out.should_not include("Your Gemfile contains path and git dependencies.")
+      expect(out).not_to include("Your Gemfile contains path and git dependencies.")
     end
   end
-end
+end

data/spec/cache/path_spec.rb

@@ -10,7 +10,7 @@ require "spec_helper"
       G
 
       bundle "#{cmd} --all"
-      bundled_app("vendor/cache/foo-1.0").should_not exist
+      expect(bundled_app("vendor/cache/foo-1.0")).not_to exist
       should_be_installed "foo 1.0"
     end
 
@@ -22,8 +22,8 @@ require "spec_helper"
       G
 
       bundle "#{cmd} --all"
-      bundled_app("vendor/cache/foo-1.0").should exist
-      bundled_app("vendor/cache/foo-1.0/.bundlecache").should be_file
+      expect(bundled_app("vendor/cache/foo-1.0")).to exist
+      expect(bundled_app("vendor/cache/foo-1.0/.bundlecache")).to be_file
 
       FileUtils.rm_rf lib_path("foo-1.0")
       should_be_installed "foo 1.0"
@@ -44,11 +44,11 @@ require "spec_helper"
 
       bundle "#{cmd} --all"
 
-      bundled_app("vendor/cache/foo-1.0").should exist
+      expect(bundled_app("vendor/cache/foo-1.0")).to exist
       FileUtils.rm_rf lib_path("foo-1.0")
 
       run "require 'foo'"
-      out.should == "CACHE"
+      expect(out).to eq("CACHE")
     end
 
     it "removes stale entries cache" do
@@ -65,7 +65,7 @@ require "spec_helper"
       G
 
       bundle "#{cmd} --all"
-      bundled_app("vendor/cache/bar-1.0").should_not exist
+      expect(bundled_app("vendor/cache/bar-1.0")).not_to exist
     end
 
     it "raises a warning without --all" do
@@ -76,8 +76,8 @@ require "spec_helper"
       G
 
       bundle cmd
-      out.should =~ /please pass the \-\-all flag/
-      bundled_app("vendor/cache/foo-1.0").should_not exist
+      expect(out).to match(/please pass the \-\-all flag/)
+      expect(bundled_app("vendor/cache/foo-1.0")).not_to exist
     end
 
     it "stores the given flag" do
@@ -96,7 +96,7 @@ require "spec_helper"
       G
 
       bundle cmd
-      bundled_app("vendor/cache/bar-1.0").should exist
+      expect(bundled_app("vendor/cache/bar-1.0")).to exist
     end
 
     it "can rewind chosen configuration" do
@@ -115,7 +115,7 @@ require "spec_helper"
       G
 
       bundle "#{cmd} --no-all"
-      bundled_app("vendor/cache/baz-1.0").should_not exist
+      expect(bundled_app("vendor/cache/baz-1.0")).not_to exist
     end
   end
-end
+end

data/spec/cache/platform_spec.rb

@@ -42,16 +42,16 @@ describe "bundle cache with multiple platforms" do
   it "ensures that bundle install does not delete gems for other platforms" do
     bundle "install"
 
-    bundled_app("vendor/cache/rack-1.0.0.gem").should exist
-    bundled_app("vendor/cache/activesupport-2.3.5.gem").should exist
-    bundled_app("vendor/cache/activerecord-2.3.2.gem").should exist
+    expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
+    expect(bundled_app("vendor/cache/activesupport-2.3.5.gem")).to exist
+    expect(bundled_app("vendor/cache/activerecord-2.3.2.gem")).to exist
   end
 
   it "ensures that bundle update does not delete gems for other platforms" do
     bundle "update"
 
-    bundled_app("vendor/cache/rack-1.0.0.gem").should exist
-    bundled_app("vendor/cache/activesupport-2.3.5.gem").should exist
-    bundled_app("vendor/cache/activerecord-2.3.2.gem").should exist
+    expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
+    expect(bundled_app("vendor/cache/activesupport-2.3.5.gem")).to exist
+    expect(bundled_app("vendor/cache/activerecord-2.3.2.gem")).to exist
   end
 end

data/spec/install/deploy_spec.rb

@@ -10,18 +10,18 @@ describe "install with --deployment or --frozen" do
 
   it "fails without a lockfile and says that --deployment requires a lock" do
     bundle "install --deployment"
-    out.should include("The --deployment flag requires a Gemfile.lock")
+    expect(out).to include("The --deployment flag requires a Gemfile.lock")
   end
 
   it "fails without a lockfile and says that --frozen requires a lock" do
     bundle "install --frozen"
-    out.should include("The --frozen flag requires a Gemfile.lock")
+    expect(out).to include("The --frozen flag requires a Gemfile.lock")
   end
 
   it "works after you try to deploy without a lock" do
     bundle "install --deployment"
     bundle :install, :exitstatus => true
-    exitstatus.should eq(0)
+    expect(exitstatus).to eq(0)
     should_be_installed "rack 1.0"
   end
 
@@ -43,14 +43,14 @@ describe "install with --deployment or --frozen" do
     G
     bundle :install
     bundle "install --deployment --without test", :exitstatus => true
-    exitstatus.should == 0
+    expect(exitstatus).to eq(0)
   end
 
   it "works when you bundle exec bundle" do
     bundle :install
     bundle "install --deployment"
     bundle "exec bundle check", :exitstatus => true
-    exitstatus.should == 0
+    expect(exitstatus).to eq(0)
   end
 
   it "works when using path gems from the same path and the version is specified" do
@@ -64,7 +64,7 @@ describe "install with --deployment or --frozen" do
     bundle :install
     bundle "install --deployment", :exitstatus => true
 
-    exitstatus.should == 0
+    expect(exitstatus).to eq(0)
   end
 
   describe "with an existing lockfile" do
@@ -74,12 +74,12 @@ describe "install with --deployment or --frozen" do
 
     it "works with the --deployment flag if you didn't change anything" do
       bundle "install --deployment", :exitstatus => true
-      exitstatus.should == 0
+      expect(exitstatus).to eq(0)
     end
 
     it "works with the --frozen flag if you didn't change anything" do
       bundle "install --frozen", :exitstatus => true
-      exitstatus.should == 0
+      expect(exitstatus).to eq(0)
     end
 
     it "explodes with the --deployment flag if you make a change and don't check in the lockfile" do
@@ -90,11 +90,11 @@ describe "install with --deployment or --frozen" do
       G
 
       bundle "install --deployment"
-      out.should include("deployment mode")
-      out.should include("You have added to the Gemfile")
-      out.should include("* rack-obama")
-      out.should_not include("You have deleted from the Gemfile")
-      out.should_not include("You have changed in the Gemfile")
+      expect(out).to include("deployment mode")
+      expect(out).to include("You have added to the Gemfile")
+      expect(out).to include("* rack-obama")
+      expect(out).not_to include("You have deleted from the Gemfile")
+      expect(out).not_to include("You have changed in the Gemfile")
     end
 
     it "can have --frozen set via an environment variable" do
@@ -106,11 +106,11 @@ describe "install with --deployment or --frozen" do
 
       ENV['BUNDLE_FROZEN'] = '1'
       bundle "install"
-      out.should include("deployment mode")
-      out.should include("You have added to the Gemfile")
-      out.should include("* rack-obama")
-      out.should_not include("You have deleted from the Gemfile")
-      out.should_not include("You have changed in the Gemfile")
+      expect(out).to include("deployment mode")
+      expect(out).to include("You have added to the Gemfile")
+      expect(out).to include("* rack-obama")
+      expect(out).not_to include("You have deleted from the Gemfile")
+      expect(out).not_to include("You have changed in the Gemfile")
     end
 
     it "explodes with the --frozen flag if you make a change and don't check in the lockfile" do
@@ -121,11 +121,11 @@ describe "install with --deployment or --frozen" do
       G
 
       bundle "install --frozen"
-      out.should include("deployment mode")
-      out.should include("You have added to the Gemfile")
-      out.should include("* rack-obama")
-      out.should_not include("You have deleted from the Gemfile")
-      out.should_not include("You have changed in the Gemfile")
+      expect(out).to include("deployment mode")
+      expect(out).to include("You have added to the Gemfile")
+      expect(out).to include("* rack-obama")
+      expect(out).not_to include("You have deleted from the Gemfile")
+      expect(out).not_to include("You have changed in the Gemfile")
     end
 
     it "explodes if you remove a gem and don't check in the lockfile" do
@@ -135,10 +135,10 @@ describe "install with --deployment or --frozen" do
       G
 
       bundle "install --deployment"
-      out.should include("deployment mode")
-      out.should include("You have added to the Gemfile:\n* activesupport\n\n")
-      out.should include("You have deleted from the Gemfile:\n* rack")
-      out.should_not include("You have changed in the Gemfile")
+      expect(out).to include("deployment mode")
+      expect(out).to include("You have added to the Gemfile:\n* activesupport\n\n")
+      expect(out).to include("You have deleted from the Gemfile:\n* rack")
+      expect(out).not_to include("You have changed in the Gemfile")
     end
 
     it "explodes if you add a source" do
@@ -148,9 +148,9 @@ describe "install with --deployment or --frozen" do
       G
 
       bundle "install --deployment"
-      out.should include("deployment mode")
-      out.should include("You have added to the Gemfile:\n* source: git://hubz.com (at master)")
-      out.should_not include("You have changed in the Gemfile")
+      expect(out).to include("deployment mode")
+      expect(out).to include("You have added to the Gemfile:\n* source: git://hubz.com (at master)")
+      expect(out).not_to include("You have changed in the Gemfile")
     end
 
     it "explodes if you unpin a source" do
@@ -167,10 +167,10 @@ describe "install with --deployment or --frozen" do
       G
 
       bundle "install --deployment"
-      out.should include("deployment mode")
-      out.should include("You have deleted from the Gemfile:\n* source: #{lib_path("rack-1.0")} (at master)")
-      out.should_not include("You have added to the Gemfile")
-      out.should_not include("You have changed in the Gemfile")
+      expect(out).to include("deployment mode")
+      expect(out).to include("You have deleted from the Gemfile:\n* source: #{lib_path("rack-1.0")} (at master)")
+      expect(out).not_to include("You have added to the Gemfile")
+      expect(out).not_to include("You have changed in the Gemfile")
     end
 
     it "explodes if you unpin a source, leaving it pinned somewhere else" do
@@ -190,10 +190,10 @@ describe "install with --deployment or --frozen" do
       G
 
       bundle "install --deployment"
-      out.should include("deployment mode")
-      out.should include("You have changed in the Gemfile:\n* rack from `no specified source` to `#{lib_path("rack")} (at master)`")
-      out.should_not include("You have added to the Gemfile")
-      out.should_not include("You have deleted from the Gemfile")
+      expect(out).to include("deployment mode")
+      expect(out).to include("You have changed in the Gemfile:\n* rack from `no specified source` to `#{lib_path("rack")} (at master)`")
+      expect(out).not_to include("You have added to the Gemfile")
+      expect(out).not_to include("You have deleted from the Gemfile")
     end
 
     it "remembers that the bundle is frozen at runtime" do

data/spec/install/gems/c_ext_spec.rb

@@ -40,9 +40,9 @@ describe "installing a gem with C extensions" do
     bundle "config build.c_extension --with-c_extension=hello"
     bundle "install"
 
-    out.should_not include("extconf.rb failed")
+    expect(out).not_to include("extconf.rb failed")
 
     run "Bundler.require; puts CExtension.new.its_true"
-    out.should == "true"
+    expect(out).to eq("true")
   end
 end

data/spec/install/gems/dependency_api_spec.rb

@@ -10,7 +10,7 @@ describe "gemcutter's dependency API" do
     G
 
     bundle :install, :artifice => "endpoint"
-    out.should include("Fetching gem metadata from #{source_uri}")
+    expect(out).to include("Fetching gem metadata from #{source_uri}")
     should_be_installed "rack 1.0.0"
   end
 
@@ -21,7 +21,7 @@ describe "gemcutter's dependency API" do
     G
 
     bundle :install, :artifice => "endpoint"
-    out.should include("Could not find gem ' sinatra")
+    expect(out).to include("Could not find gem ' sinatra")
   end
 
   it "should handle nested dependencies" do
@@ -31,7 +31,7 @@ describe "gemcutter's dependency API" do
     G
 
     bundle :install, :artifice => "endpoint"
-    out.should include("Fetching gem metadata from #{source_uri}/...")
+    expect(out).to include("Fetching gem metadata from #{source_uri}/...")
     should_be_installed(
       "rails 2.3.2",
       "actionpack 2.3.2",
@@ -59,7 +59,7 @@ describe "gemcutter's dependency API" do
     bundle :install, :artifice => "endpoint"
 
     bundle "install --deployment", :artifice => "endpoint"
-    out.should include("Fetching gem metadata from #{source_uri}")
+    expect(out).to include("Fetching gem metadata from #{source_uri}")
     should_be_installed "rack 1.0.0"
   end
 
@@ -108,7 +108,7 @@ describe "gemcutter's dependency API" do
     G
 
     bundle :install, :fakeweb => "windows"
-    out.should include("\nFetching full source index from #{source_uri}")
+    expect(out).to include("\nFetching full source index from #{source_uri}")
     should_be_installed "rcov 1.0.0"
   end
 
@@ -124,7 +124,7 @@ describe "gemcutter's dependency API" do
       gem "rails"
     G
     bundle :install, :artifice => "endpoint_fallback"
-    out.should include("\nFetching full source index from #{source_uri}")
+    expect(out).to include("\nFetching full source index from #{source_uri}")
 
     should_be_installed(
       "activesupport 2.3.2",
@@ -144,7 +144,7 @@ describe "gemcutter's dependency API" do
     G
 
     bundle :install, :artifice => "endpoint_marshal_fail"
-    out.should include("\nFetching full source index from #{source_uri}")
+    expect(out).to include("\nFetching full source index from #{source_uri}")
     should_be_installed "rack 1.0.0"
   end
 
@@ -155,56 +155,7 @@ describe "gemcutter's dependency API" do
     G
 
     bundle :install, :artifice => "endpoint_redirect"
-    out.should match(/Too many redirects/)
-  end
-
-  context "when Gemcutter API takes too long to respond" do
-    before do
-      # need to hack, so we can require rack
-      old_gem_home = ENV['GEM_HOME']
-      ENV['GEM_HOME'] = Spec::Path.base_system_gems.to_s
-      require 'rack'
-      ENV['GEM_HOME'] = old_gem_home
-
-      port = 21453
-      port += 1 while TCPSocket.new("127.0.0.1", port) rescue false
-      @server_uri = "http://127.0.0.1:#{port}"
-
-      require File.expand_path('../../../support/artifice/endpoint_timeout', __FILE__)
-      require 'thread'
-      @t = Thread.new {
-        server = Rack::Server.start(:app       => EndpointTimeout,
-                                    :Host      => '0.0.0.0',
-                                    :Port      => port,
-                                    :server    => 'webrick',
-                                    :AccessLog => [])
-        server.start
-      }
-      @t.run
-
-      # ensure server is started
-      require 'timeout'
-      Timeout.timeout(15) { sleep(0.1) until @t.status == "sleep" }
-    end
-
-    after do
-      @t.kill
-    end
-
-    it "times out and falls back on the modern index" do
-      gemfile <<-G
-        source "#{@server_uri}"
-        gem "rack"
-
-        old_v, $VERBOSE = $VERBOSE, nil
-        Bundler::Fetcher::API_TIMEOUT = 1
-        $VERBOSE = old_v
-      G
-
-      bundle :install
-      expect(out).to include("\nFetching full source index from #{@server_uri}")
-      should_be_installed "rack 1.0.0"
-    end
+    expect(out).to match(/Too many redirects/)
   end
 
   context "when --full-index is specified" do
@@ -215,7 +166,7 @@ describe "gemcutter's dependency API" do
       G
 
       bundle "install --full-index", :artifice => "endpoint"
-      out.should include("Fetching source index from #{source_uri}")
+      expect(out).to include("Fetching source index from #{source_uri}")
       should_be_installed "rack 1.0.0"
     end
 
@@ -226,7 +177,7 @@ describe "gemcutter's dependency API" do
       G
 
       bundle "update --full-index", :artifice => "endpoint"
-      out.should include("Fetching source index from #{source_uri}")
+      expect(out).to include("Fetching source index from #{source_uri}")
       should_be_installed "rack 1.0.0"
     end
   end
@@ -269,7 +220,7 @@ describe "gemcutter's dependency API" do
 Fetching gem metadata from http://localgemserver.test/..
 Fetching gem metadata from http://localgemserver.test/extra/.
 OUTPUT
-    out.should include(output)
+    expect(out).to include(output)
   end
 
   it "does not fetch every specs if the index of gems is large when doing back deps" do
@@ -335,10 +286,10 @@ OUTPUT
     G
 
     bundle :install, :artifice => "endpoint"
-    out.should include("Fetching gem metadata from #{source_uri}")
+    expect(out).to include("Fetching gem metadata from #{source_uri}")
   end
 
-  fit "should install when EndpointSpecification with a bin dir owned by root", :sudo => true do
+  it "should install when EndpointSpecification with a bin dir owned by root", :sudo => true do
     sudo "mkdir -p #{system_gem_path("bin")}"
     sudo "chown -R root #{system_gem_path("bin")}"
 
@@ -347,7 +298,6 @@ OUTPUT
       gem "rails"
     G
     bundle :install, :artifice => "endpoint"
-    puts out, err
     should_be_installed "rails 2.3.2"
   end
 
@@ -360,7 +310,7 @@ OUTPUT
     bundle "install --binstubs", :artifice => "endpoint"
 
     gembin "rackup"
-    out.should == "1.0.0"
+    expect(out).to eq("1.0.0")
   end
 
   it "installs the bins when using --path and uses autoclean" do
@@ -371,7 +321,7 @@ OUTPUT
 
     bundle "install --path vendor/bundle", :artifice => "endpoint"
 
-    vendored_gems("bin/rackup").should exist
+    expect(vendored_gems("bin/rackup")).to exist
   end
 
   it "installs the bins when using --path and uses bundle clean" do
@@ -382,7 +332,7 @@ OUTPUT
 
     bundle "install --path vendor/bundle --no-clean", :artifice => "endpoint"
 
-    vendored_gems("bin/rackup").should exist
+    expect(vendored_gems("bin/rackup")).to exist
   end
 
   it "prints post_install_messages" do
@@ -392,7 +342,7 @@ OUTPUT
     G
 
     bundle :install, :artifice => "endpoint"
-    out.should include("Post-install message from rack:")
+    expect(out).to include("Post-install message from rack:")
   end
 
   it "should display the post install message for a dependency" do
@@ -402,8 +352,8 @@ OUTPUT
     G
 
     bundle :install, :artifice => "endpoint"
-    out.should include("Post-install message from rack:")
-    out.should include("Rack's post install message")
+    expect(out).to include("Post-install message from rack:")
+    expect(out).to include("Rack's post install message")
   end
 
   context "when using basic authentication" do
@@ -424,7 +374,7 @@ OUTPUT
       G
 
       bundle :install, :artifice => "endpoint_basic_authentication"
-      out.should_not include("#{user}:#{password}")
+      expect(out).not_to include("#{user}:#{password}")
       should_be_installed "rack 1.0.0"
     end
 
@@ -435,7 +385,7 @@ OUTPUT
       G
 
       bundle :install, :artifice => "endopint_marshal_fail_basic_authentication"
-      out.should_not include("#{user}:#{password}")
+      expect(out).not_to include("#{user}:#{password}")
       should_be_installed "rack 1.0.0"
     end
 
@@ -446,7 +396,7 @@ OUTPUT
       G
 
       bundle :install, :artifice => "endpoint_500"
-      out.should_not include("#{user}:#{password}")
+      expect(out).not_to include("#{user}:#{password}")
     end
   end
 
@@ -479,50 +429,7 @@ OUTPUT
 
       bundle :install, :artifice => "endpoint",
         :env => {"RUBYOPT" => "-I#{bundled_app("broken_ssl")}"}
-      out.should include("Could not load OpenSSL.")
-    end
-  end
-
-  context "when SSL certificate verification fails" do
-    it "explains what is going on" do
-      # Install a monkeypatch that reproduces the effects of openssl raising
-      # a certificate validation error at the appropriate moment.
-      gemfile <<-G
-        class Bundler::Fetcher
-          def fetch_all_remote_specs
-            raise OpenSSL::SSL::SSLError, "Certificate invalid"
-          end
-        end
-
-        source "#{source_uri.gsub(/http/, 'https')}"
-        gem "rack"
-      G
-
-      bundle :install
-      expect(out).to match(/could not verify the SSL certificate/i)
-    end
-  end
-
-  context ".gemrc with sources is present" do
-    before do
-      File.open(home('.gemrc'), 'w') do |file|
-        file.puts({:sources => ["https://rubygems.org"]}.to_yaml)
-      end
-    end
-
-    after do
-      home('.gemrc').rmtree
-    end
-
-    it "uses other sources declared in the Gemfile" do
-      gemfile <<-G
-        source "#{source_uri}"
-        gem 'rack'
-      G
-
-      bundle "install", :exitstatus => true, :artifice => "endpoint_marshal_fail"
-
-      expect(exitstatus).to eq(0)
+      expect(out).to include("Could not load OpenSSL.")
     end
   end