diff options
| author | Samuel Giddins <segiddins@segiddins.me> | 2017-06-23 17:13:11 -0500 |
|---|---|---|
| committer | Samuel Giddins <segiddins@segiddins.me> | 2017-06-23 23:29:07 -0500 |
| commit | 6b40a8a22bfb3f04e677a3de4d5b9329c689d2c2 (patch) | |
| tree | 446a39339e9616e0f000cb1fbc9ac4f1003d7efb /spec/quality_spec.rb | |
| parent | f1ffdf65a07f5764c42dfd6bbb044d6afeda0b86 (diff) | |
| download | bundler-6b40a8a22bfb3f04e677a3de4d5b9329c689d2c2.tar.gz | |
Get the Bundler 2 specs passing with transitive source pinning
Diffstat (limited to 'spec/quality_spec.rb')
| -rw-r--r-- | spec/quality_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/quality_spec.rb b/spec/quality_spec.rb index 4561ce0461..bbdaa8b30d 100644 --- a/spec/quality_spec.rb +++ b/spec/quality_spec.rb @@ -131,7 +131,7 @@ RSpec.describe "The library itself" do it "does not include any unresolved merge conflicts" do error_messages = [] - exempt = %r{lock/lockfile_spec|quality_spec|vcr_cassettes|\.ronn|lockfile_parser\.rb} + exempt = %r{lock/lockfile_(bundler_1_)?spec|quality_spec|vcr_cassettes|\.ronn|lockfile_parser\.rb} Dir.chdir(root) do `git ls-files -z`.split("\x0").each do |filename| next if filename =~ exempt |