diff options
| author | Lukas Oberhuber <lukas.oberhuber@simplybusiness.co.uk> | 2015-09-29 16:37:00 +0100 |
|---|---|---|
| committer | Lukas Oberhuber <lukas.oberhuber@simplybusiness.co.uk> | 2015-09-29 16:37:00 +0100 |
| commit | ced3616171d9236da2e296ebafc9c483de79077c (patch) | |
| tree | 448d2097ef3bb906209e025f6e5836843df4aac6 | |
| parent | 04c3ac41e074ec0d2fbe5743d3ab97341ed33746 (diff) | |
| download | bundler-ced3616171d9236da2e296ebafc9c483de79077c.tar.gz | |
remove newline from error message.
| -rw-r--r-- | lib/bundler/installer/parallel_installer.rb | 2 | ||||
| -rw-r--r-- | spec/install/parallel/spec_installation_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/bundler/installer/parallel_installer.rb b/lib/bundler/installer/parallel_installer.rb index fd677c70c7..1fe86c4030 100644 --- a/lib/bundler/installer/parallel_installer.rb +++ b/lib/bundler/installer/parallel_installer.rb @@ -45,7 +45,7 @@ class ParallelInstaller deps = all_dependencies.reject {|dep| ignorable_dependency? dep } missing = deps.reject {|dep| all_spec_names.include? dep.name } if missing.size > 0 - raise Bundler::GemfileError, "Your Gemfile.lock is corrupt. The following #{missing.size > 1 ? "gems are" : "gem is"} missing\n" \ + raise Bundler::GemfileError, "Your Gemfile.lock is corrupt. The following #{missing.size > 1 ? "gems are" : "gem is"} missing " \ "from the DEPENDENCIES section: '#{missing.map(&:name).join('\' \'')}'" end deps diff --git a/spec/install/parallel/spec_installation_spec.rb b/spec/install/parallel/spec_installation_spec.rb index 8a32107bc1..77bfe1cf9c 100644 --- a/spec/install/parallel/spec_installation_spec.rb +++ b/spec/install/parallel/spec_installation_spec.rb @@ -69,7 +69,7 @@ describe ParallelInstaller::SpecInstallation do spec = ParallelInstaller::SpecInstallation.new(dep) allow(spec).to receive(:all_dependencies).and_return(dependencies) expect { spec.dependencies_installed?(all_specs) }. - to raise_error(Bundler::GemfileError, /Your Gemfile.lock is corrupt\. The following.*\n.*'beta' 'delta'/) + to raise_error(Bundler::GemfileError, /Your Gemfile.lock is corrupt\. The following.*'beta' 'delta'/) end end end |