summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2019-08-08 12:07:07 +0200
committerDavid Rodríguez <deivid.rodriguez@riseup.net>2019-08-10 12:05:10 +0200
commit8601575490290855f79ddf92119963df502e0962 (patch)
tree520f32252a6b3e141c866231a99f7bc876783190
parent0b6d9735433be1d0666b4dc0c3770c4e1e3aae62 (diff)
downloadbundler-8601575490290855f79ddf92119963df502e0962.tar.gz
Remove unexistent file from exemptions
-rw-r--r--spec/quality_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/quality_spec.rb b/spec/quality_spec.rb
index 70fc9844a9..7cd04fdc75 100644
--- a/spec/quality_spec.rb
+++ b/spec/quality_spec.rb
@@ -146,7 +146,7 @@ RSpec.describe "The library itself" do
it "does not include any unresolved merge conflicts" do
error_messages = []
- exempt = %r{lock/lockfile_(bundler_1_)?spec|quality_spec|vcr_cassettes|\.ronn|lockfile_parser\.rb}
+ exempt = %r{lock/lockfile_spec|quality_spec|vcr_cassettes|\.ronn|lockfile_parser\.rb}
Dir.chdir(root) do
files = ruby_core? ? `git ls-files -z -- lib/bundler lib/bundler.rb spec/bundler` : `git ls-files -z`
files.split("\x0").each do |filename|