diff options
| author | Samuel Giddins <segiddins@segiddins.me> | 2016-07-24 15:38:34 -0500 |
|---|---|---|
| committer | Samuel Giddins <segiddins@segiddins.me> | 2016-07-24 15:41:48 -0500 |
| commit | efab50776a8636a4dcc751a49d7b51c8d16f5951 (patch) | |
| tree | 71d8034b6e4bcba9c94d9f7456e3f41d69322feb | |
| parent | a6a5d32f8e136117a1ca525e20957f68ff79d0e4 (diff) | |
| download | bundler-seg-should-be-installed-source.tar.gz | |
Update a pair of specs to use the new source matchingseg-should-be-installed-source
| -rw-r--r-- | spec/install/gemfile/sources_spec.rb | 7 | ||||
| -rw-r--r-- | spec/install/git_spec.rb | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/spec/install/gemfile/sources_spec.rb b/spec/install/gemfile/sources_spec.rb index 7b44f5932a..1ad9aac029 100644 --- a/spec/install/gemfile/sources_spec.rb +++ b/spec/install/gemfile/sources_spec.rb @@ -35,7 +35,7 @@ describe "bundle install with gems on multiple sources" do expect(out).to have_major_deprecation a_string_including("Your Gemfile contains multiple primary sources.") expect(out).to include("Warning: the gem 'rack' was found in multiple sources.") expect(out).to include("Installed from: file:#{gem_repo1}") - should_be_installed("rack-obama 1.0.0", "rack 1.0.0") + should_be_installed("rack-obama 1.0.0", "rack 1.0.0", :source => "remote1") end it "errors when disable_multisource is set" do @@ -65,7 +65,7 @@ describe "bundle install with gems on multiple sources" do expect(out).to have_major_deprecation a_string_including("Your Gemfile contains multiple primary sources.") expect(out).to include("Warning: the gem 'rack' was found in multiple sources.") expect(out).to include("Installed from: file:#{gem_repo1}") - should_be_installed("rack-obama 1.0.0", "rack 1.0.0") + should_be_installed("rack-obama 1.0.0", "rack 1.0.0", :source => "remote1") end end end @@ -94,7 +94,8 @@ describe "bundle install with gems on multiple sources" do it "installs the gems without any warning" do bundle :install expect(out).not_to include("Warning") - should_be_installed("rack-obama 1.0.0", "rack 1.0.0") + should_be_installed("rack-obama 1.0.0") + should_be_installed("rack 1.0.0", :source => "remote1") end it "can cache and deploy" do diff --git a/spec/install/git_spec.rb b/spec/install/git_spec.rb index 401da1b1d3..518e129169 100644 --- a/spec/install/git_spec.rb +++ b/spec/install/git_spec.rb @@ -12,7 +12,7 @@ describe "bundle install" do bundle :install expect(out).to include("Using foo 1.0 from #{lib_path("foo")} (at master@#{revision_for(lib_path("foo"))[0..6]})") - should_be_installed "foo 1.0" + should_be_installed "foo 1.0", :source => "git@#{lib_path("foo")}" end it "should check out git repos that are missing but not being installed" do |