Remove more pending specs

3 files changed, 42 insertions, 20 deletions

diff --git a/spec/install/gems/simple_case_spec.rb b/spec/install/gems/simple_case_spec.rb
index 8657218ac6..5cfe488ff0 100644
--- a/spec/install/gems/simple_case_spec.rb
+++ b/spec/install/gems/simple_case_spec.rb
@@ -465,7 +465,6 @@ describe "bundle install with gem sources" do
 
   describe_sudo "it working when $GEM_HOME is owned by root" do
     it "installs gems" do
-      pending "specs should never require user intervention. plus this passes even if it times out."
       install_gemfile <<-G
         source "file://#{gem_repo1}"
         gem 'rack'
diff --git a/spec/install/git_spec.rb b/spec/install/git_spec.rb
index c63a90b83e..3337b1d5d5 100644
--- a/spec/install/git_spec.rb
+++ b/spec/install/git_spec.rb
@@ -83,25 +83,6 @@ describe "bundle install with git sources" do
 
       out.should == "WIN"
     end
-
-    it "floats on a branch when :branch is used" do
-      pending_bundle_update
-      build_git  "foo", "1.0"
-      update_git "foo", :branch => "omg"
-
-      install_gemfile <<-G
-        git "#{lib_path('foo-1.0')}", :branch => "omg"
-        gem 'foo'
-      G
-
-      update_git "foo", :branch => "omg" do |s|
-        s.write "lib/foo.rb", "FOO = '1.1'"
-      end
-
-      bundle :install
-
-      should_be_installed "foo 1.1"
-    end
   end
 
   describe "specified inline" do
diff --git a/spec/update/git_spec.rb b/spec/update/git_spec.rb
new file mode 100644
index 0000000000..31ad77e5ba
--- /dev/null
+++ b/spec/update/git_spec.rb
@@ -0,0 +1,42 @@
+require "spec_helper"
+
+describe "bundle update" do
+  describe "git sources" do
+    it "floats on a branch when :branch is used" do
+      build_git  "foo", "1.0"
+      update_git "foo", :branch => "omg"
+
+      install_gemfile <<-G
+        git "#{lib_path('foo-1.0')}", :branch => "omg"
+        gem 'foo'
+      G
+
+      update_git "foo", :branch => "omg" do |s|
+        s.write "lib/foo.rb", "FOO = '1.1'"
+      end
+
+      bundle "update"
+
+      should_be_installed "foo 1.1"
+    end
+
+    it "floats on a branch when :branch is used and the source is specified in the update" do
+      build_git  "foo", "1.0", :path => lib_path("foo")
+      update_git "foo", :branch => "omg", :path => lib_path("foo")
+
+      install_gemfile <<-G
+        git "#{lib_path('foo')}", :branch => "omg" do
+          gem 'foo'
+        end
+      G
+
+      update_git "foo", :branch => "omg", :path => lib_path("foo") do |s|
+        s.write "lib/foo.rb", "FOO = '1.1'"
+      end
+
+      bundle "update --source foo"
+
+      should_be_installed "foo 1.1"
+    end
+  end
+end
\ No newline at end of file