diff options
| -rw-r--r-- | spec/bundler/quality_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/bundler/quality_spec.rb b/spec/bundler/quality_spec.rb index ebe85d17d2..a011196d23 100644 --- a/spec/bundler/quality_spec.rb +++ b/spec/bundler/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| |