summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Lance <stefan@lances.net>2015-07-01 16:29:05 -0500
committerSamuel Giddins <segiddins@segiddins.me>2016-07-05 15:11:19 -0300
commit3e347af3375f5a4a0acaec2d9800f9597e90b802 (patch)
treee67d00eaf6408f29d4c51af9d8d5613bd1fd7098
parentc9960af024a6a4b0cd6bcd5ef3e4120b7f9a4a90 (diff)
downloadbundler-3e347af3375f5a4a0acaec2d9800f9597e90b802.tar.gz
Fix deprecation warnings and lack_errors matcher
-rw-r--r--lib/bundler/shared_helpers.rb2
-rw-r--r--spec/support/matchers.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/bundler/shared_helpers.rb b/lib/bundler/shared_helpers.rb
index 69f1e85e84..59cf7a05df 100644
--- a/lib/bundler/shared_helpers.rb
+++ b/lib/bundler/shared_helpers.rb
@@ -235,7 +235,7 @@ module Bundler
Bundler.respond_to?(:ui) && Bundler.ui.deprecate(
"Gemfile and Gemfile.lock are " \
"deprecated and will be replaced with gems.rb and " \
- "gems.locked in Bundler 2.0.\n"
+ "gems.locked in Bundler 2.0.", true
)
end
end
diff --git a/spec/support/matchers.rb b/spec/support/matchers.rb
index aee6e88d13..186caa03ab 100644
--- a/spec/support/matchers.rb
+++ b/spec/support/matchers.rb
@@ -3,7 +3,7 @@ module Spec
module Matchers
RSpec::Matchers.define :lack_errors do
match do |actual|
- actual.gsub(/(^DEPRECATION:.+)/, "") == ""
+ actual.gsub(/(^DEPRECATION:.+[\n]?)/, "") == ""
end
end