summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Bundler Bot <bot@bundler.io>2018-02-23 22:13:10 +0000
committerThe Bundler Bot <bot@bundler.io>2018-02-23 22:13:10 +0000
commitc4fc79a2bfed38335a3371300bea49286a371d83 (patch)
tree35da89df905433338cc816d46fe6876c2ebb2d7b
parent3d8258586b0fab8899d9a6f801d301e8db4d3ba6 (diff)
parent9f3bad4e352bc35352d91008182173ab50ecbca2 (diff)
downloadbundler-c4fc79a2bfed38335a3371300bea49286a371d83.tar.gz
Auto merge of #6306 - alyssais:gpg_test, r=colby-swandale
Don't GPG-sign test setup commits Running `bin/rake spec` in the Bundler repository causes a bunch of failures if `commit.gpgsign` is set in the global Git configuration. Bundler's tests were making Git commits and trying to GPG sign them. Set `commit.gpgsign` to `false` when initializing a Git repository in the tests. I chose this fix because the alternative would be to pass `--no-gpg-sign` every time a commit is made in the tests, which would have a bigger maintenance impact.
-rw-r--r--spec/bundler/gem_helper_spec.rb1
-rw-r--r--spec/support/builders.rb1
2 files changed, 2 insertions, 0 deletions
diff --git a/spec/bundler/gem_helper_spec.rb b/spec/bundler/gem_helper_spec.rb
index c36204c542..bd7cdc170a 100644
--- a/spec/bundler/gem_helper_spec.rb
+++ b/spec/bundler/gem_helper_spec.rb
@@ -197,6 +197,7 @@ RSpec.describe Bundler::GemHelper do
`git init`
`git config user.email "you@example.com"`
`git config user.name "name"`
+ `git config commit.gpgsign false`
`git config push.default simple`
end
diff --git a/spec/support/builders.rb b/spec/support/builders.rb
index 4bc904aee8..e496df6ecb 100644
--- a/spec/support/builders.rb
+++ b/spec/support/builders.rb
@@ -653,6 +653,7 @@ module Spec
`git add *`
`git config user.email "lol@wut.com"`
`git config user.name "lolwut"`
+ `git config commit.gpgsign false`
`git commit -m 'OMG INITIAL COMMIT'`
end
end