summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Oberhuber <lukas.oberhuber@simplybusiness.co.uk>2015-09-29 17:34:27 +0100
committerLukas Oberhuber <lukas.oberhuber@simplybusiness.co.uk>2015-09-29 17:34:27 +0100
commitc34e2d9750c107c4f2a784404906fba18b17d236 (patch)
tree7c30ec0789a7e9e95f84cef7065dc82ec06ead93
parentced3616171d9236da2e296ebafc9c483de79077c (diff)
downloadbundler-c34e2d9750c107c4f2a784404906fba18b17d236.tar.gz
Change error type to LockfileError
-rw-r--r--lib/bundler/installer/parallel_installer.rb2
-rw-r--r--spec/install/parallel/spec_installation_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/bundler/installer/parallel_installer.rb b/lib/bundler/installer/parallel_installer.rb
index 1fe86c4030..c1a8065a09 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 " \
+ raise Bundler::LockfileError, "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 77bfe1cf9c..6e92bb4cb8 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.*'beta' 'delta'/)
+ to raise_error(Bundler::LockfileError, /Your Gemfile.lock is corrupt\. The following.*'beta' 'delta'/)
end
end
end