Make the tests more platform agnostic -- all green on jruby

6 files changed, 15 insertions, 3 deletions

diff --git a/lib/bundler/shared_helpers.rb b/lib/bundler/shared_helpers.rb
index 5cb5fa7de1..162e4d2cdd 100644
--- a/lib/bundler/shared_helpers.rb
+++ b/lib/bundler/shared_helpers.rb
@@ -34,7 +34,7 @@ module Bundler
       until !File.directory?(current) || current == previous
         filename = File.join(current, 'Gemfile')
         return filename if File.file?(filename)
-        current, previous = File.expand_path("#{current}/.."), current
+        current, previous = File.expand_path("..", current), current
       end
     end
 
diff --git a/spec/install/gems_spec.rb b/spec/install/gems_spec.rb
index d36f10daf4..79d32818b8 100644
--- a/spec/install/gems_spec.rb
+++ b/spec/install/gems_spec.rb
@@ -122,7 +122,7 @@ describe "gemfile install with gem sources" do
     G
 
     run "require 'platform_specific' ; puts PLATFORM_SPECIFIC"
-    out.should == '1.0.0 RUBY'
+    out.should == "1.0.0 #{Gem::Platform.local}"
   end
 
   it "works with repositories that don't provide prerelease_specs.4.8.gz" do
diff --git a/spec/install/git_spec.rb b/spec/install/git_spec.rb
index abeb10baea..cf94d85506 100644
--- a/spec/install/git_spec.rb
+++ b/spec/install/git_spec.rb
@@ -49,6 +49,7 @@ describe "gemfile install with git sources" do
     end
 
     it "setups executables" do
+      pending_jruby_shebang_fix
       bundle "exec foobar"
       out.should == "1.0"
     end
diff --git a/spec/install/path_spec.rb b/spec/install/path_spec.rb
index 0e77485cec..afab356531 100644
--- a/spec/install/path_spec.rb
+++ b/spec/install/path_spec.rb
@@ -73,6 +73,8 @@ describe "gemfile install with explicit source paths" do
   end
 
   it "setups up executables" do
+    pending_jruby_shebang_fix
+
     build_lib "foo" do |s|
       s.executables = "foobar"
     end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 0c8e1b922e..d92e9571a5 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -11,7 +11,7 @@ Dir["#{File.expand_path('../support', __FILE__)}/*.rb"].each do |file|
 end
 
 $debug    = false
-$show_err = false
+$show_err = true
 
 Spec::Rubygems.setup
 FileUtils.rm_rf(Spec::Path.gem_repo1)
@@ -28,6 +28,10 @@ Spec::Runner.configure do |config|
   original_path     = ENV['PATH']
   original_gem_home = ENV['GEM_HOME']
 
+  def pending_jruby_shebang_fix
+    pending "JRuby executables do not have a proper shebang" if RUBY_PLATFORM == "java"
+  end
+
   config.before :all do
     build_repo1
   end
diff --git a/spec/support/builders.rb b/spec/support/builders.rb
index a50cb82267..7f01c5dd3e 100644
--- a/spec/support/builders.rb
+++ b/spec/support/builders.rb
@@ -55,6 +55,11 @@ module Spec
         end
 
         build_gem "platform_specific" do |s|
+          s.platform = Gem::Platform.local
+          s.write "lib/platform_specific.rb", "PLATFORM_SPECIFIC = '1.0.0 #{Gem::Platform.local}'"
+        end
+
+        build_gem "platform_specific" do |s|
           s.platform = "java"
           s.write "lib/platform_specific.rb", "PLATFORM_SPECIFIC = '1.0.0 JAVA'"
         end