diff options
Diffstat (limited to 'spec/install/gems/dependency_api_spec.rb')
-rw-r--r-- | spec/install/gems/dependency_api_spec.rb | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/spec/install/gems/dependency_api_spec.rb b/spec/install/gems/dependency_api_spec.rb index 72e7bffcbc..a7c1aedea3 100644 --- a/spec/install/gems/dependency_api_spec.rb +++ b/spec/install/gems/dependency_api_spec.rb @@ -13,7 +13,7 @@ describe "gemcutter's dependency API" do bundle :install, :artifice => "endpoint" expect(out).to include("Fetching gem metadata from #{source_uri}") - expect(the_bundle).to have_installed "rack 1.0.0" + expect(the_bundle).to include_gems "rack 1.0.0" end it "should URI encode gem names" do @@ -34,7 +34,7 @@ describe "gemcutter's dependency API" do bundle :install, :artifice => "endpoint" expect(out).to include("Fetching gem metadata from #{source_uri}/...") - expect(the_bundle).to have_installed( + expect(the_bundle).to include_gems( "rails 2.3.2", "actionpack 2.3.2", "activerecord 2.3.2", @@ -51,7 +51,7 @@ describe "gemcutter's dependency API" do G bundle :install, :artifice => "endpoint" - expect(the_bundle).to have_installed "net-sftp 1.1.1" + expect(the_bundle).to include_gems "net-sftp 1.1.1" end it "should use the endpoint when using --deployment" do @@ -63,7 +63,7 @@ describe "gemcutter's dependency API" do bundle "install --deployment", :artifice => "endpoint" expect(out).to include("Fetching gem metadata from #{source_uri}") - expect(the_bundle).to have_installed "rack 1.0.0" + expect(the_bundle).to include_gems "rack 1.0.0" end it "handles git dependencies that are in rubygems" do @@ -81,7 +81,7 @@ describe "gemcutter's dependency API" do bundle :install, :artifice => "endpoint" - expect(the_bundle).to have_installed("rails 2.3.2") + expect(the_bundle).to include_gems("rails 2.3.2") end it "handles git dependencies that are in rubygems using --deployment" do @@ -99,7 +99,7 @@ describe "gemcutter's dependency API" do bundle "install --deployment", :artifice => "endpoint" - expect(the_bundle).to have_installed("rails 2.3.2") + expect(the_bundle).to include_gems("rails 2.3.2") end it "doesn't fail if you only have a git gem with no deps when using --deployment" do @@ -113,7 +113,7 @@ describe "gemcutter's dependency API" do bundle "install --deployment", :artifice => "endpoint" expect(exitstatus).to eq(0) if exitstatus - expect(the_bundle).to have_installed("foo 1.0") + expect(the_bundle).to include_gems("foo 1.0") end it "falls back when the API errors out" do @@ -126,7 +126,7 @@ describe "gemcutter's dependency API" do bundle :install, :fakeweb => "windows" expect(out).to include("Fetching source index from #{source_uri}") - expect(the_bundle).to have_installed "rcov 1.0.0" + expect(the_bundle).to include_gems "rcov 1.0.0" end it "falls back when hitting the Gemcutter Dependency Limit" do @@ -143,7 +143,7 @@ describe "gemcutter's dependency API" do bundle :install, :artifice => "endpoint_fallback" expect(out).to include("Fetching source index from #{source_uri}") - expect(the_bundle).to have_installed( + expect(the_bundle).to include_gems( "activesupport 2.3.2", "actionpack 2.3.2", "actionmailer 2.3.2", @@ -163,7 +163,7 @@ describe "gemcutter's dependency API" do bundle :install, :verbose => true, :artifice => "endpoint_marshal_fail" expect(out).to include("could not fetch from the dependency API, trying the full index") - expect(the_bundle).to have_installed "rack 1.0.0" + expect(the_bundle).to include_gems "rack 1.0.0" end it "falls back when the API URL returns 403 Forbidden" do @@ -174,7 +174,7 @@ describe "gemcutter's dependency API" do bundle :install, :verbose => true, :artifice => "endpoint_api_forbidden" expect(out).to include("Fetching source index from #{source_uri}") - expect(the_bundle).to have_installed "rack 1.0.0" + expect(the_bundle).to include_gems "rack 1.0.0" end it "handles host redirects" do @@ -184,7 +184,7 @@ describe "gemcutter's dependency API" do G bundle :install, :artifice => "endpoint_host_redirect" - expect(the_bundle).to have_installed "rack 1.0.0" + expect(the_bundle).to include_gems "rack 1.0.0" end it "handles host redirects without Net::HTTP::Persistent" do @@ -208,7 +208,7 @@ describe "gemcutter's dependency API" do bundle :install, :artifice => "endpoint_host_redirect", :requires => [lib_path("disable_net_http_persistent.rb")] expect(out).to_not match(/Too many redirects/) - expect(the_bundle).to have_installed "rack 1.0.0" + expect(the_bundle).to include_gems "rack 1.0.0" end it "timeouts when Bundler::Fetcher redirects too much" do @@ -230,7 +230,7 @@ describe "gemcutter's dependency API" do bundle "install --full-index", :artifice => "endpoint" expect(out).to include("Fetching source index from #{source_uri}") - expect(the_bundle).to have_installed "rack 1.0.0" + expect(the_bundle).to include_gems "rack 1.0.0" end it "should use the modern index for update" do @@ -241,7 +241,7 @@ describe "gemcutter's dependency API" do bundle "update --full-index", :artifice => "endpoint" expect(out).to include("Fetching source index from #{source_uri}") - expect(the_bundle).to have_installed "rack 1.0.0" + expect(the_bundle).to include_gems "rack 1.0.0" end end @@ -260,7 +260,7 @@ describe "gemcutter's dependency API" do G bundle :install, :artifice => "endpoint_extra" - expect(the_bundle).to have_installed "back_deps 1.0" + expect(the_bundle).to include_gems "back_deps 1.0" end it "fetches gem versions even when those gems are already installed" do @@ -282,7 +282,7 @@ describe "gemcutter's dependency API" do gem "rack", "1.2" G bundle :install, :artifice => "endpoint_extra_api" - expect(the_bundle).to have_installed "rack 1.2" + expect(the_bundle).to include_gems "rack 1.2" end it "considers all possible versions of dependencies from all api gem sources" do @@ -305,8 +305,8 @@ describe "gemcutter's dependency API" do bundle :install, :artifice => "endpoint_extra_api" - expect(the_bundle).to have_installed "somegem 1.0.0" - expect(the_bundle).to have_installed "activesupport 1.2.3" + expect(the_bundle).to include_gems "somegem 1.0.0" + expect(the_bundle).to include_gems "activesupport 1.2.3" end it "prints API output properly with back deps" do @@ -350,7 +350,7 @@ describe "gemcutter's dependency API" do G bundle :install, :artifice => "endpoint_extra_missing" - expect(the_bundle).to have_installed "back_deps 1.0" + expect(the_bundle).to include_gems "back_deps 1.0" end it "uses the endpoint if all sources support it" do @@ -361,7 +361,7 @@ describe "gemcutter's dependency API" do G bundle :install, :artifice => "endpoint_api_missing" - expect(the_bundle).to have_installed "foo 1.0" + expect(the_bundle).to include_gems "foo 1.0" end it "fetches again when more dependencies are found in subsequent sources using --deployment" do @@ -381,7 +381,7 @@ describe "gemcutter's dependency API" do bundle :install, :artifice => "endpoint_extra" bundle "install --deployment", :artifice => "endpoint_extra" - expect(the_bundle).to have_installed "back_deps 1.0" + expect(the_bundle).to include_gems "back_deps 1.0" end it "does not refetch if the only unmet dependency is bundler" do @@ -404,7 +404,7 @@ describe "gemcutter's dependency API" do gem "rails" G bundle :install, :artifice => "endpoint" - expect(the_bundle).to have_installed "rails 2.3.2" + expect(the_bundle).to include_gems "rails 2.3.2" end it "installs the binstubs" do @@ -481,7 +481,7 @@ describe "gemcutter's dependency API" do bundle :install, :artifice => "endpoint_basic_authentication" expect(out).not_to include("#{user}:#{password}") - expect(the_bundle).to have_installed "rack 1.0.0" + expect(the_bundle).to include_gems "rack 1.0.0" end it "strips http basic authentication creds for modern index" do @@ -492,7 +492,7 @@ describe "gemcutter's dependency API" do bundle :install, :artifice => "endopint_marshal_fail_basic_authentication" expect(out).not_to include("#{user}:#{password}") - expect(the_bundle).to have_installed "rack 1.0.0" + expect(the_bundle).to include_gems "rack 1.0.0" end it "strips http basic auth creds when it can't reach the server" do @@ -515,7 +515,7 @@ describe "gemcutter's dependency API" do bundle :install, :artifice => "endpoint_basic_authentication" expect(out).to include("Warning: the gem 'rack' was found in multiple sources.") expect(out).not_to include("#{user}:#{password}") - expect(the_bundle).to have_installed "rack 1.0.0" + expect(the_bundle).to include_gems "rack 1.0.0" end it "does not pass the user / password to different hosts on redirect" do @@ -525,7 +525,7 @@ describe "gemcutter's dependency API" do G bundle :install, :artifice => "endpoint_creds_diff_host" - expect(the_bundle).to have_installed "rack 1.0.0" + expect(the_bundle).to include_gems "rack 1.0.0" end describe "with authentication details in bundle config" do @@ -542,7 +542,7 @@ describe "gemcutter's dependency API" do bundle :install, :artifice => "endpoint_strict_basic_authentication" expect(out).to include("Fetching gem metadata from #{source_uri}") - expect(the_bundle).to have_installed "rack 1.0.0" + expect(the_bundle).to include_gems "rack 1.0.0" end it "reads authentication details by full url from bundle config" do @@ -552,14 +552,14 @@ describe "gemcutter's dependency API" do bundle :install, :artifice => "endpoint_strict_basic_authentication" expect(out).to include("Fetching gem metadata from #{source_uri}") - expect(the_bundle).to have_installed "rack 1.0.0" + expect(the_bundle).to include_gems "rack 1.0.0" end it "should use the API" do bundle "config #{source_hostname} #{user}:#{password}" bundle :install, :artifice => "endpoint_strict_basic_authentication" expect(out).to include("Fetching gem metadata from #{source_uri}") - expect(the_bundle).to have_installed "rack 1.0.0" + expect(the_bundle).to include_gems "rack 1.0.0" end it "prefers auth supplied in the source uri" do @@ -571,7 +571,7 @@ describe "gemcutter's dependency API" do bundle "config #{source_hostname} otheruser:wrong" bundle :install, :artifice => "endpoint_strict_basic_authentication" - expect(the_bundle).to have_installed "rack 1.0.0" + expect(the_bundle).to include_gems "rack 1.0.0" end it "shows instructions if auth is not provided for the source" do @@ -597,7 +597,7 @@ describe "gemcutter's dependency API" do G bundle :install, :artifice => "endpoint_basic_authentication" - expect(the_bundle).to have_installed "rack 1.0.0" + expect(the_bundle).to include_gems "rack 1.0.0" end end end |