summaryrefslogtreecommitdiff
path: root/spec/bundler/gem_helper_spec.rb
diff options
context:
space:
mode:
authorTim Moore <tmoore@incrementalism.net>2014-06-16 19:01:51 +1000
committerTim Moore <tmoore@incrementalism.net>2014-06-16 19:01:51 +1000
commite7b21b8629705f515d7ea1beeb66b4f22daa7149 (patch)
treec07b4f2c3145ff04cbca4ad572fd01aaafeab234 /spec/bundler/gem_helper_spec.rb
parentb3d2fc82c5cb649c683b465445ffe75ec4c3d4e7 (diff)
downloadbundler-e7b21b8629705f515d7ea1beeb66b4f22daa7149.tar.gz
Fix gem_helper_spec.rb when run with git 2.0.
Git now errors out if you haven't set a default push behavior.
Diffstat (limited to 'spec/bundler/gem_helper_spec.rb')
-rw-r--r--spec/bundler/gem_helper_spec.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/bundler/gem_helper_spec.rb b/spec/bundler/gem_helper_spec.rb
index 59fb90a938..812ad82266 100644
--- a/spec/bundler/gem_helper_spec.rb
+++ b/spec/bundler/gem_helper_spec.rb
@@ -163,6 +163,7 @@ describe Bundler::GemHelper do
`git init`
`git config user.email "you@example.com"`
`git config user.name "name"`
+ `git config push.default simple`
end
end
@@ -203,7 +204,7 @@ describe Bundler::GemHelper do
mock_confirm_message "Pushed git commits and tags."
expect(subject).to receive(:rubygem_push).with(app_gem_path.to_s)
- Dir.chdir(app_path) { sys_exec("git push origin master", true) }
+ Dir.chdir(app_path) { sys_exec("git push -u origin master", true) }
subject.release_gem
end