summaryrefslogtreecommitdiff
path: root/spec/update
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2017-08-20 17:28:22 -0400
committerSamuel Giddins <segiddins@segiddins.me>2017-08-28 16:21:49 -0500
commit468993fbc4993f90ba780a2161c63c0bc3862255 (patch)
tree663e6d6642277fcb273f31e51d5e65ad40bda045 /spec/update
parent6ce61e7c6060d1d7a45a131031be472aa25e1d7e (diff)
downloadbundler-468993fbc4993f90ba780a2161c63c0bc3862255.tar.gz
Automatically bundle clean without a path set on 2.0
Diffstat (limited to 'spec/update')
-rw-r--r--spec/update/git_spec.rb18
1 files changed, 12 insertions, 6 deletions
diff --git a/spec/update/git_spec.rb b/spec/update/git_spec.rb
index 95b0a95976..52c4fc0957 100644
--- a/spec/update/git_spec.rb
+++ b/spec/update/git_spec.rb
@@ -117,8 +117,10 @@ RSpec.describe "bundle update" do
describe "with submodules" do
before :each do
- build_gem "submodule", :to_bundle => true do |s|
- s.write "lib/submodule.rb", "puts 'GEM'"
+ build_repo4 do
+ build_gem "submodule" do |s|
+ s.write "lib/submodule.rb", "puts 'GEM'"
+ end
end
build_git "submodule", "1.0" do |s|
@@ -137,6 +139,7 @@ RSpec.describe "bundle update" do
it "it unlocks the source when submodules are added to a git source" do
install_gemfile <<-G
+ source "file:#{gem_repo4}"
git "#{lib_path("has_submodule-1.0")}" do
gem "has_submodule"
end
@@ -146,6 +149,7 @@ RSpec.describe "bundle update" do
expect(out).to eq("GEM")
install_gemfile <<-G
+ source "file:#{gem_repo4}"
git "#{lib_path("has_submodule-1.0")}", :submodules => true do
gem "has_submodule"
end
@@ -156,22 +160,24 @@ RSpec.describe "bundle update" do
end
it "unlocks the source when submodules are removed from git source", :git => ">= 2.9.0" do
- install_gemfile <<-G
+ install_gemfile! <<-G
+ source "file:#{gem_repo4}"
git "#{lib_path("has_submodule-1.0")}", :submodules => true do
gem "has_submodule"
end
G
- run "require 'submodule'"
+ run! "require 'submodule'"
expect(out).to eq("GIT")
- install_gemfile <<-G
+ install_gemfile! <<-G
+ source "file:#{gem_repo4}"
git "#{lib_path("has_submodule-1.0")}" do
gem "has_submodule"
end
G
- run "require 'submodule'"
+ run! "require 'submodule'"
expect(out).to eq("GEM")
end
end