summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBundlerbot <bot@bundler.io>2019-12-31 11:13:07 +0000
committerDavid Rodríguez <deivid.rodriguez@riseup.net>2020-01-01 20:52:54 +0100
commit80e919280df0fd984a0ae1bb6eba5e7ea408b97d (patch)
tree5f81fb0a3c6f0395634088479efd786153f997b2
parent4501092e66146d55208a1bde5d6c9a350d8c9138 (diff)
downloadbundler-80e919280df0fd984a0ae1bb6eba5e7ea408b97d.tar.gz
Merge #7525
7525: Use raise instead of flunk r=deivid-rodriguez a=kou ### What was the end-user problem that led to this PR? This PR doesn't fix any end-user problem. This PR fixes a developer problem. RSpec doesn't provide `flunk` method. It's a method name in test-unit and minitest. ### What was your diagnosis of the problem? 3edfddbf7ebe4b942e1e2b6d693afd582e9a8147 may use `flunk` accidentally. ### What is your fix for the problem, implemented in this PR? My fix uses `raise` instead of `flunk`. ### Why did you choose this fix out of the possible options? I don't have another option. Co-authored-by: Sutou Kouhei <kou@clear-code.com> (cherry picked from commit 9b9eeddb05feced8d48fbe15a9064de9a10abd18)
-rw-r--r--spec/support/indexes.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/support/indexes.rb b/spec/support/indexes.rb
index b76f493d01..dc6e0bd1e9 100644
--- a/spec/support/indexes.rb
+++ b/spec/support/indexes.rb
@@ -45,7 +45,7 @@ module Spec
def should_conflict_on(names)
got = resolve
- flunk "The resolve succeeded with: #{got.map(&:full_name).sort.inspect}"
+ raise "The resolve succeeded with: #{got.map(&:full_name).sort.inspect}"
rescue Bundler::VersionConflict => e
expect(Array(names).sort).to eq(e.conflicts.sort)
end