diff options
| -rw-r--r-- | lib/bundler/dependency.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/lockfile_generator.rb | 2 | ||||
| -rw-r--r-- | spec/bundler/bundler/dependency_spec.rb | 37 |
3 files changed, 39 insertions, 2 deletions
diff --git a/lib/bundler/dependency.rb b/lib/bundler/dependency.rb index 7f94079e09..52c6fff194 100644 --- a/lib/bundler/dependency.rb +++ b/lib/bundler/dependency.rb @@ -151,7 +151,7 @@ module Bundler def to_lock out = super out << "!" if source - out << "\n" + out end def specific? diff --git a/lib/bundler/lockfile_generator.rb b/lib/bundler/lockfile_generator.rb index 0578a93fdc..23413dbdd6 100644 --- a/lib/bundler/lockfile_generator.rb +++ b/lib/bundler/lockfile_generator.rb @@ -60,7 +60,7 @@ module Bundler handled = [] definition.dependencies.sort_by(&:to_s).each do |dep| next if handled.include?(dep.name) - out << dep.to_lock + out << dep.to_lock << "\n" handled << dep.name end end diff --git a/spec/bundler/bundler/dependency_spec.rb b/spec/bundler/bundler/dependency_spec.rb new file mode 100644 index 0000000000..f470152996 --- /dev/null +++ b/spec/bundler/bundler/dependency_spec.rb @@ -0,0 +1,37 @@ +# frozen_string_literal: true + +RSpec.describe Bundler::Dependency do + let(:options) do + {} + end + let(:dependency) do + described_class.new( + "test_gem", + "1.0.0", + options + ) + end + + describe "to_lock" do + it "returns formatted string" do + expect(dependency.to_lock).to eq(" test_gem (= 1.0.0)") + end + + it "matches format of Gem::Dependency#to_lock" do + gem_dependency = Gem::Dependency.new("test_gem", "1.0.0") + expect(dependency.to_lock).to eq(gem_dependency.to_lock) + end + + context "when source is passed" do + let(:options) do + { + "source" => Bundler::Source::Git.new({}), + } + end + + it "returns formatted string with exclamation mark" do + expect(dependency.to_lock).to eq(" test_gem (= 1.0.0)!") + end + end + end +end |