Fix the specs on rubygems 1.4.1

dtsato · Jan 19, 2011 · e11fde0 · e11fde0
1 parent 4d6c3da
commit e11fde0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/spec/other/help_spec.rb b/spec/other/help_spec.rb
@@ -1,7 +1,9 @@
 require "spec_helper"
 
 describe "bundle help" do
-  it "complains if older versions of bundler are installed" do
+  # Rubygems 1.4+ no longer load gem plugins so this test is no longer needed
+  rubygems_under_14 = Gem::Requirement.new("< 1.4").satisfied_by?(Gem::Version.new(Gem::VERSION))
+  it "complains if older versions of bundler are installed", :if => rubygems_under_14 do
     system_gems "bundler-0.8.1"
 
     bundle "help", :expect_err => true

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -26,7 +26,7 @@
 
 Spec::Rubygems.setup
 FileUtils.rm_rf(Spec::Path.gem_repo1)
-ENV['RUBYOPT'] = "-I#{Spec::Path.root}/spec/support/rubygems_hax #{ENV['RUBYOPT']}"
+ENV['RUBYOPT'] = "#{ENV['RUBYOPT']} -r#{Spec::Path.root}/spec/support/rubygems_hax/platform.rb"
 ENV['BUNDLE_SPEC_RUN'] = "true"
 
 RSpec.configure do |config|

diff --git a/spec/support/rubygems_hax/rubygems_plugin.rb → spec/support/rubygems_hax/platform.rb b/spec/support/rubygems_hax/rubygems_plugin.rb → spec/support/rubygems_hax/platform.rb
@@ -1,3 +1,5 @@
+require 'rubygems'
+
 class Gem::Platform
   @local = new(ENV['BUNDLER_SPEC_PLATFORM']) if ENV['BUNDLER_SPEC_PLATFORM']
 end