diff options
author | Carlhuda <carlhuda@engineyard.com> | 2010-04-22 13:14:25 -0700 |
---|---|---|
committer | Carlhuda <carlhuda@engineyard.com> | 2010-04-22 13:14:25 -0700 |
commit | aaa1c1960ec43566eb5a3928cf8681e2b6e2493d (patch) | |
tree | 64f5d1a546a3b7dc02ff76f2e4e69496ed1af04b /spec/install | |
parent | 51c157893516ae1903e9c64282c583000307f78d (diff) | |
download | bundler-aaa1c1960ec43566eb5a3928cf8681e2b6e2493d.tar.gz |
Fix git with the new lockfile format
Diffstat (limited to 'spec/install')
-rw-r--r-- | spec/install/gems/locked_spec.rb | 1 | ||||
-rw-r--r-- | spec/install/git_spec.rb | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/spec/install/gems/locked_spec.rb b/spec/install/gems/locked_spec.rb index de2903f2..4b5ee7cc 100644 --- a/spec/install/gems/locked_spec.rb +++ b/spec/install/gems/locked_spec.rb @@ -21,6 +21,7 @@ describe "bundle install with gem sources" do end it "allows --relock to update the dependencies" do + pending_bundle_update system_gems "rack-0.9.1" do bundle "install --relock" should_be_installed "rack 1.0.0" diff --git a/spec/install/git_spec.rb b/spec/install/git_spec.rb index ba96abab..83826b6d 100644 --- a/spec/install/git_spec.rb +++ b/spec/install/git_spec.rb @@ -29,6 +29,7 @@ describe "bundle install with git sources" do end it "floats on master if no ref is specified" do + pending_bundle_update update_git "foo" in_app_root2 do @@ -85,6 +86,7 @@ describe "bundle install with git sources" do end it "floats on a branch when :branch is used" do + pending_bundle_update build_git "foo", "1.0" update_git "foo", :branch => "omg" @@ -286,6 +288,7 @@ describe "bundle install with git sources" do end it "handles repos that have been force-pushed" do + pending_bundle_update build_git "forced", "1.0" install_gemfile <<-G git "#{lib_path('forced-1.0')}" |