Add a spec for a runtime path bug

2 files changed, 21 insertions, 2 deletions

diff --git a/bundler.gemspec b/bundler.gemspec
index 05f5ccdaa4..a48fc18884 100644
--- a/bundler.gemspec
+++ b/bundler.gemspec
@@ -2,7 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bundler}
+<<<<<<< Updated upstream
   s.version = "0.9.0.pre3"
+=======
+  s.version = "0.9.0.pre2"
+>>>>>>> Stashed changes
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.5") if s.respond_to? :required_rubygems_version=
   s.authors = ["Carl Lerche", "Yehuda Katz"]
diff --git a/spec/runtime/setup_spec.rb b/spec/runtime/setup_spec.rb
index 99a783674e..c8624b06a9 100644
--- a/spec/runtime/setup_spec.rb
+++ b/spec/runtime/setup_spec.rb
@@ -1,8 +1,23 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
 describe "Bundler.setup" do
+  describe "with paths" do
+    it "activates the gems in the path source" do
+      pending
+      system_gems "rack-1.0.0"
 
-  it "uses gems from pinned git sources even" do
-    pending
+      build_lib "rack", "1.0.0" do |s|
+        s.write "lib/rack.rb", "puts 'WIN'"
+      end
+
+      gemfile <<-G
+        path "#{lib_path('rack-1.0.0')}"
+        source "file://#{gem_repo1}"
+        gem "rack"
+      G
+
+      run "require 'rack'"
+      out.should == "WIN"
+    end
   end
 end
\ No newline at end of file