Fixes specs for 1.8.7

6 files changed, 18 insertions, 16 deletions

diff --git a/spec/commands/console_spec.rb b/spec/commands/console_spec.rb
index b771c6a940..b60ac2c9f6 100644
--- a/spec/commands/console_spec.rb
+++ b/spec/commands/console_spec.rb
@@ -12,7 +12,7 @@ describe "bundle console" do
   end
 
   it "starts IRB with the default group loaded" do
-    bundle "console" do |input|
+    bundle "console" do |input, _, _|
       input.puts("puts RACK")
       input.puts("exit")
     end
@@ -20,7 +20,7 @@ describe "bundle console" do
   end
 
   it "uses IRB as default console" do
-    bundle "console" do |input|
+    bundle "console" do |input, _, _|
       input.puts("__method__")
       input.puts("exit")
     end
@@ -34,7 +34,7 @@ describe "bundle console" do
     G
     bundle "config console pry"
 
-    bundle "console" do |input|
+    bundle "console" do |input, _, _|
       input.puts("__method__")
       input.puts("exit")
     end
@@ -45,7 +45,7 @@ describe "bundle console" do
     bundle "config console pry"
     # make sure pry isn't there
 
-    bundle "console" do |input|
+    bundle "console" do |input, _, _|
       input.puts("__method__")
       input.puts("exit")
     end
@@ -53,7 +53,7 @@ describe "bundle console" do
   end
 
   it "doesn't load any other groups" do
-    bundle "console" do |input|
+    bundle "console" do |input, _, _|
       input.puts("puts ACTIVESUPPORT")
       input.puts("exit")
     end
@@ -62,7 +62,7 @@ describe "bundle console" do
 
   describe "when given a group" do
     it "loads the given group" do
-      bundle "console test" do |input|
+      bundle "console test" do |input, _, _|
         input.puts("puts ACTIVESUPPORT")
         input.puts("exit")
       end
@@ -70,7 +70,7 @@ describe "bundle console" do
     end
 
     it "loads the default group" do
-      bundle "console test" do |input|
+      bundle "console test" do |input, _, _|
         input.puts("puts RACK")
         input.puts("exit")
       end
@@ -78,7 +78,7 @@ describe "bundle console" do
     end
 
     it "doesn't load other groups" do
-      bundle "console test" do |input|
+      bundle "console test" do |input, _, _|
         input.puts("puts RACK_MIDDLEWARE")
         input.puts("exit")
       end
@@ -96,7 +96,7 @@ describe "bundle console" do
     G
 
     bundle "config auto_install 1"
-    bundle :console do |input|
+    bundle :console do |input, _, _|
       input.puts("puts 'hello'")
       input.puts("exit")
     end
diff --git a/spec/commands/exec_spec.rb b/spec/commands/exec_spec.rb
index beb1783e9c..81b2af7413 100644
--- a/spec/commands/exec_spec.rb
+++ b/spec/commands/exec_spec.rb
@@ -561,6 +561,8 @@ describe "bundle exec" do
       RUBY
 
       it do
+        skip "popen3 doesn't provide a way to get pid " unless RUBY_VERSION >= "1.9.3"
+
         bundle("exec #{path}") do |_, o, thr|
           o.gets # Consumes 'Started' and ensures that thread has started
           Process.kill("INT", thr.pid)
diff --git a/spec/commands/newgem_spec.rb b/spec/commands/newgem_spec.rb
index 6414a0902e..cb3c48132a 100644
--- a/spec/commands/newgem_spec.rb
+++ b/spec/commands/newgem_spec.rb
@@ -743,7 +743,7 @@ describe "bundle gem" do
     it "asks about test framework" do
       global_config "BUNDLE_GEM__MIT" => "false", "BUNDLE_GEM__COC" => "false"
 
-      bundle "gem foobar" do |input|
+      bundle "gem foobar" do |input, _, _|
         input.puts "rspec"
       end
 
@@ -766,7 +766,7 @@ describe "bundle gem" do
 
       bundle :config
 
-      bundle "gem foobar" do |input|
+      bundle "gem foobar" do |input, _, _|
         input.puts "yes"
       end
 
@@ -776,7 +776,7 @@ describe "bundle gem" do
     it "asks about CoC" do
       global_config "BUNDLE_GEM__MIT" => "false", "BUNDLE_GEM__TEST" => "false"
 
-      bundle "gem foobar" do |input|
+      bundle "gem foobar" do |input, _, _|
         input.puts "yes"
       end
 
diff --git a/spec/commands/open_spec.rb b/spec/commands/open_spec.rb
index 1776eed6e9..8ae18cea6a 100644
--- a/spec/commands/open_spec.rb
+++ b/spec/commands/open_spec.rb
@@ -60,7 +60,7 @@ describe "bundle open" do
 
   it "select the gem from many match gems" do
     env = { "EDITOR" => "echo editor", "VISUAL" => "echo visual", "BUNDLER_EDITOR" => "echo bundler_editor" }
-    bundle "open active", :env => env do |input|
+    bundle "open active", :env => env do |input, _, _|
       input.puts "2"
     end
 
diff --git a/spec/other/platform_spec.rb b/spec/other/platform_spec.rb
index a219853e2f..c0d121c7b1 100644
--- a/spec/other/platform_spec.rb
+++ b/spec/other/platform_spec.rb
@@ -929,7 +929,7 @@ G
         #{ruby_version_correct}
       G
 
-      bundle "console" do |input|
+      bundle "console" do |input, _, _|
         input.puts("puts RACK")
         input.puts("exit")
       end
@@ -947,7 +947,7 @@ G
           #{ruby_version_correct_engineless}
         G
 
-        bundle "console" do |input|
+        bundle "console" do |input, _, _|
           input.puts("puts RACK")
           input.puts("exit")
         end
diff --git a/spec/quality_spec.rb b/spec/quality_spec.rb
index eafbf3750b..41f7d58425 100644
--- a/spec/quality_spec.rb
+++ b/spec/quality_spec.rb
@@ -202,7 +202,7 @@ describe "The library itself" do
       lib_files = `git ls-files -z`.split("\x0").grep(/\.rb$/) - exclusions
       lib_files.reject! {|f| f.start_with?("bundler/vendor") }
       lib_files.map! {|f| f.chomp(".rb") }
-      sys_exec("ruby -w -I. ", :expect_err) do |input|
+      sys_exec("ruby -w -I. ", :expect_err) do |input, _, _|
         lib_files.each do |f|
           input.puts "require '#{f}'"
         end