diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-03-14 19:14:47 +0100 |
---|---|---|
committer | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-03-15 15:35:11 +0100 |
commit | 4c6e2ae1c08153ec0d390d292ee36fecae1f6a1e (patch) | |
tree | ee5261a8dfb594e29bc864911a0f93c0628c1e96 /spec/commands | |
parent | 1591215e636d68117c04158dfe8da81c8ef2b357 (diff) | |
download | bundler-4c6e2ae1c08153ec0d390d292ee36fecae1f6a1e.tar.gz |
Remove ruby version leftoversremove_ruby_version_leftovers
Diffstat (limited to 'spec/commands')
-rw-r--r-- | spec/commands/exec_spec.rb | 11 | ||||
-rw-r--r-- | spec/commands/info_spec.rb | 2 |
2 files changed, 4 insertions, 9 deletions
diff --git a/spec/commands/exec_spec.rb b/spec/commands/exec_spec.rb index 08049cefb8..d339486ed1 100644 --- a/spec/commands/exec_spec.rb +++ b/spec/commands/exec_spec.rb @@ -79,7 +79,7 @@ RSpec.describe "bundle exec" do require 'tempfile' io = Tempfile.new("io-test-fd") args = %W[#{Gem.ruby} -I#{lib} #{bindir.join("bundle")} exec --keep-file-descriptors #{Gem.ruby} #{command.path} \#{io.to_i}] - args << { io.to_i => io } if RUBY_VERSION >= "2.0" + args << { io.to_i => io } exec(*args) end G @@ -87,12 +87,7 @@ RSpec.describe "bundle exec" do install_gemfile "" sys_exec "#{Gem.ruby} #{command.path}" - if Bundler.current_ruby.ruby_2? - expect(out).to eq("") - else - expect(out).to eq("Ruby version #{RUBY_VERSION} defaults to keeping non-standard file descriptors on Kernel#exec.") - end - + expect(out).to eq("") expect(last_command.stderr).to be_empty end @@ -500,7 +495,7 @@ RSpec.describe "bundle exec" do let(:rack) { "RACK: 1.0.0" } let(:process) do title = "PROCESS: #{path}" - title += " arg1 arg2" if RUBY_VERSION >= "2.1" + title += " arg1 arg2" title end let(:exit_code) { 0 } diff --git a/spec/commands/info_spec.rb b/spec/commands/info_spec.rb index 70a304823a..20fe0038a6 100644 --- a/spec/commands/info_spec.rb +++ b/spec/commands/info_spec.rb @@ -25,7 +25,7 @@ RSpec.describe "bundle info" do end context "given a default gem shippped in ruby", :ruby_repo do - it "prints information about the default gem", :if => (RUBY_VERSION >= "2.0") do + it "prints information about the default gem" do bundle "info rdoc" expect(out).to include("* rdoc") expect(out).to include("Default Gem: yes") |