aboutsummaryrefslogtreecommitdiffstats
path: root/spec
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2011-03-31 11:04:39 -0700
committerAndre Arko <andre@arko.net>2011-03-31 11:06:05 -0700
commitf7b7cc6920ad12fc1ea198bcdcb10eca2f8dcbd6 (patch)
tree152395e58abb025d120fd5811b298948a43d5895 /spec
parent4cb0437a803737b4af2d7c47a8a34a28f8d8ea58 (diff)
downloadbundler-f7b7cc6920ad12fc1ea198bcdcb10eca2f8dcbd6.tar.gz
fix the double-dep ordering spec
Diffstat (limited to 'spec')
-rw-r--r--spec/lock/lockfile_spec.rb14
-rw-r--r--spec/support/builders.rb7
2 files changed, 11 insertions, 10 deletions
diff --git a/spec/lock/lockfile_spec.rb b/spec/lock/lockfile_spec.rb
index 30e58207..c8a30bf1 100644
--- a/spec/lock/lockfile_spec.rb
+++ b/spec/lock/lockfile_spec.rb
@@ -332,23 +332,23 @@ describe "the lockfile format" do
it "orders dependencies according to version" do
install_gemfile <<-G
source "file://#{gem_repo1}"
-
- gem 'like-capistrano'
+ gem 'double_deps'
G
lockfile_should_be <<-G
GEM
remote: file:#{gem_repo1}/
specs:
- capistrano (2.5.20)
- net-scp
- net-scp (>= 1.0.0)
+ double_deps (1.0)
+ net-ssh (>= 1.0.0)
+ net-ssh
+ net-ssh (1.0)
PLATFORMS
- #{generic(Gem::Platform.local)}
+ #{generic(Gem::Platform.local)}
DEPENDENCIES
- capistrano
+ double_deps
G
end
diff --git a/spec/support/builders.rb b/spec/support/builders.rb
index ef27e54f..90290f15 100644
--- a/spec/support/builders.rb
+++ b/spec/support/builders.rb
@@ -217,9 +217,10 @@ module Spec
s.add_dependency "net_d"
end
- build_gem "like-capistrano" do |s|
- s.add_dependency "net-scp"
- s.add_dependency "net-scp", ">= 1.0.0"
+ # Capistrano did this (at least until version 2.5.10)
+ build_gem "double_deps" do |s|
+ s.add_dependency "net-ssh", ">= 1.0.0"
+ s.add_dependency "net-ssh"
end
build_gem "foo"