summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Wen <jrw2175@columbia.edu>2015-12-30 00:23:43 -0500
committerJames Wen <jrw2175@columbia.edu>2015-12-30 00:23:43 -0500
commitabe0b233f77530ffb2455bb07aa45710742c82e0 (patch)
tree4b68357202778204dafb631413efd61c4e9c95dc
parentdf5751f016de714f8cd6443c2a2b4198e583936f (diff)
downloadbundler-abe0b233f77530ffb2455bb07aa45710742c82e0.tar.gz
Clean up "Cloning into 'submodule-1.0'..." output messages from test suite
- Removes the following output messages from the test suite: ``` Cloning into 'submodule-1.0'... done. ```
-rw-r--r--spec/cache/git_spec.rb6
-rw-r--r--spec/install/gemfile/git_spec.rb6
-rw-r--r--spec/update/git_spec.rb6
3 files changed, 9 insertions, 9 deletions
diff --git a/spec/cache/git_spec.rb b/spec/cache/git_spec.rb
index 8600455c6a..001cbb4564 100644
--- a/spec/cache/git_spec.rb
+++ b/spec/cache/git_spec.rb
@@ -123,18 +123,18 @@ end
end
Dir.chdir(lib_path("has_submodule-1.0")) do
- `git submodule add #{lib_path("submodule-1.0")} submodule-1.0`
+ sys_exec "git submodule add #{lib_path("submodule-1.0")} submodule-1.0", :expect_err => true
`git commit -m "submodulator"`
end
- install_gemfile <<-G
+ install_gemfile <<-G, :expect_err => true
git "#{lib_path("has_submodule-1.0")}", :submodules => true do
gem "has_submodule"
end
G
ref = git.ref_for("master", 11)
- bundle "#{cmd} --all"
+ bundle "#{cmd} --all", :expect_err => true
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
diff --git a/spec/install/gemfile/git_spec.rb b/spec/install/gemfile/git_spec.rb
index ec4bd59e68..ec148f99ff 100644
--- a/spec/install/gemfile/git_spec.rb
+++ b/spec/install/gemfile/git_spec.rb
@@ -575,7 +575,7 @@ describe "bundle install with git sources" do
s.add_dependency "submodule"
end
Dir.chdir(lib_path("has_submodule-1.0")) do
- `git submodule add #{lib_path("submodule-1.0")} submodule-1.0`
+ sys_exec "git submodule add #{lib_path("submodule-1.0")} submodule-1.0", :expect_err => true
`git commit -m "submodulator"`
end
@@ -595,11 +595,11 @@ describe "bundle install with git sources" do
s.add_dependency "submodule"
end
Dir.chdir(lib_path("has_submodule-1.0")) do
- `git submodule add #{lib_path("submodule-1.0")} submodule-1.0`
+ sys_exec "git submodule add #{lib_path("submodule-1.0")} submodule-1.0", :expect_err => true
`git commit -m "submodulator"`
end
- install_gemfile <<-G
+ install_gemfile <<-G, :expect_err => true
git "#{lib_path("has_submodule-1.0")}", :submodules => true do
gem "has_submodule"
end
diff --git a/spec/update/git_spec.rb b/spec/update/git_spec.rb
index 9133f9473c..1c69918f25 100644
--- a/spec/update/git_spec.rb
+++ b/spec/update/git_spec.rb
@@ -131,7 +131,7 @@ describe "bundle update" do
end
Dir.chdir(lib_path("has_submodule-1.0")) do
- `git submodule add #{lib_path("submodule-1.0")} submodule-1.0`
+ sys_exec "git submodule add #{lib_path("submodule-1.0")} submodule-1.0", :expect_err => true
`git commit -m "submodulator"`
end
end
@@ -146,7 +146,7 @@ describe "bundle update" do
run "require 'submodule'"
expect(out).to eq("GEM")
- install_gemfile <<-G
+ install_gemfile <<-G, :expect_err => true
git "#{lib_path("has_submodule-1.0")}", :submodules => true do
gem "has_submodule"
end
@@ -158,7 +158,7 @@ describe "bundle update" do
it "it unlocks the source when submodules are removed from git source" do
pending "This would require actually removing the submodule from the clone"
- install_gemfile <<-G
+ install_gemfile <<-G, :expect_err => true
git "#{lib_path("has_submodule-1.0")}", :submodules => true do
gem "has_submodule"
end