diff options
| author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-08-08 12:07:07 +0200 |
|---|---|---|
| committer | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2019-08-16 14:30:23 +0900 |
| commit | 4913c9b6bf78ae697689f89b99754e346603c68a (patch) | |
| tree | ab8874d70f0ea3bb3868815c8d407a6228bad0f0 /spec/bundler/quality_spec.rb | |
| parent | 6412121b0077cdad8f1fff3da75c2532cd67cd99 (diff) | |
[bundler/bundler] Remove unexistent file from exemptions
https://github.com/bundler/bundler/commit/8601575490
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/2366
Diffstat (limited to 'spec/bundler/quality_spec.rb')
| -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| |