From 4913c9b6bf78ae697689f89b99754e346603c68a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Thu, 8 Aug 2019 12:07:07 +0200 Subject: [PATCH] [bundler/bundler] Remove unexistent file from exemptions https://github.com/bundler/bundler/commit/8601575490 --- spec/bundler/quality_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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|