diff options
author | zofrex <zofrex@gmail.com> | 2012-06-29 19:17:56 -0400 |
---|---|---|
committer | zofrex <zofrex@gmail.com> | 2012-06-29 19:17:56 -0400 |
commit | 336d89b420dc43f33b380d4532f1c5e11d41860c (patch) | |
tree | bf3bc1c639fbbc5545397b98132349a51b208daf /spec | |
parent | accdd1cb8c4066b18dd9f51fdd294085bb455266 (diff) | |
download | bundler-336d89b420dc43f33b380d4532f1c5e11d41860c.tar.gz |
Issue #2000 Add test for conflict markers in Gemfile.lock
Diffstat (limited to 'spec')
-rw-r--r-- | spec/lock/lockfile_spec.rb | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/spec/lock/lockfile_spec.rb b/spec/lock/lockfile_spec.rb index 81c5119e94..e2a5b6461f 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 |