Issue #2000 Add test for conflict markers in Gemfile.lock

1 files changed, 14 insertions, 0 deletions

diff --git a/spec/lock/lockfile_spec.rb b/spec/lock/lockfile_spec.rb
index 81c5119e..e2a5b646 100644
--- a/spec/lock/lockfile_spec.rb
+++ b/spec/lock/lockfile_spec.rb
@@ -806,4 +806,18 @@ describe "the lockfile format" do
       end
     end
   end
+
+  it "refuses to install if Gemfile.lock contains conflict markers" do
+    lambda { Bundler::LockfileParser.new "<<<<<<<" }.
+        should raise_error Bundler::LockfileError
+
+    lambda { Bundler::LockfileParser.new ">>>>>>>" }.
+        should raise_error Bundler::LockfileError
+
+    lambda { Bundler::LockfileParser.new "=======" }.
+        should raise_error Bundler::LockfileError
+
+    lambda { Bundler::LockfileParser.new "|||||||" }.
+        should raise_error Bundler::LockfileError
+  end
 end