Remove the #to_generic monkey patch to Gem::Platform

2 files changed, 6 insertions, 3 deletions

diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb
index 77e2c7e0e9..8f40caa80f 100644
--- a/spec/support/helpers.rb
+++ b/spec/support/helpers.rb
@@ -1,6 +1,7 @@
 module Spec
   module Helpers
     def reset!
+      @in_p, @out_p, @err_p = nil, nil, nil
       Dir["#{tmp}/{gems/*,*}"].each do |dir|
         next if %(base remote1 gems rubygems_1_3_5 rubygems_1_3_6 rubygems_master).include?(File.basename(dir))
         if File.owned?(dir)
diff --git a/spec/support/platforms.rb b/spec/support/platforms.rb
index b2b9526694..f009de39dd 100644
--- a/spec/support/platforms.rb
+++ b/spec/support/platforms.rb
@@ -1,5 +1,7 @@
 module Spec
   module Platforms
+    include Bundler::GemHelpers
+
     def rb
       Gem::Platform::RUBY
     end
@@ -25,11 +27,11 @@ module Spec
     end
 
     def local
-      Gem::Platform.local.to_generic
+      generic(Gem::Platform.local)
     end
 
     def not_local
-      all_platforms.find { |p| p != Gem::Platform.local.to_generic }
+      all_platforms.find { |p| p != generic(Gem::Platform.local) }
     end
 
     def local_tag
@@ -44,4 +46,4 @@ module Spec
       [:ruby, :jruby].find { |tag| tag != local_tag }
     end
   end
-end
\ No newline at end of file
+end