Create quality check for unresolved merge conflicts

1 files changed, 28 insertions, 0 deletions

diff --git a/spec/quality_spec.rb b/spec/quality_spec.rb
index 043958a74d..36d081c4e4 100644
--- a/spec/quality_spec.rb
+++ b/spec/quality_spec.rb
@@ -35,6 +35,22 @@ describe "The library itself" do
     "#{filename} has debugging mechanisms (like binding.pry, sleep, debugger, rspec focusing, etc.) on lines #{failing_lines.join(", ")}"
   end
 
+  def check_for_git_merge_conflicts(filename)
+    merge_conflicts_regex = /
+      <<<<<<<|
+      =======|
+      >>>>>>>
+    /x
+
+    failing_lines = []
+    File.readlines(filename).each_with_index do |line, number|
+      failing_lines << number + 1 if line =~ merge_conflicts_regex
+    end
+
+    return if failing_lines.empty?
+    "#{filename} has unresolved git merge conflicts on lines #{failing_lines.join(", ")}"
+  end
+
   def check_for_tab_characters(filename)
     failing_lines = []
     File.readlines(filename).each_with_index do |line, number|
@@ -128,6 +144,18 @@ describe "The library itself" do
     expect(error_messages.compact).to be_well_formed
   end
 
+  it "does not include any unresolved merge conflicts" do
+    error_messages = []
+    exempt = %r{lock/lockfile_spec|quality_spec}
+    Dir.chdir(File.expand_path("../", __FILE__)) do
+      `git ls-files -z`.split("\x0").each do |filename|
+        next if filename =~ exempt
+        error_messages << check_for_git_merge_conflicts(filename)
+      end
+    end
+    expect(error_messages.compact).to be_well_formed
+  end
+
   it "maintains language quality of the documentation" do
     included = /ronn/
     error_messages = []