diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-02-22 11:07:39 +0100 |
---|---|---|
committer | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-02-25 21:09:10 +0100 |
commit | 289014761b510192863bfd9fc0fadac69819b456 (patch) | |
tree | 4ecb59b3a2db7275fc0d7b6a4cb1c5a0c2177fb8 /spec | |
parent | 2f712047bcaf61f690fa1795a0057ba7850aae93 (diff) | |
download | bundler-289014761b510192863bfd9fc0fadac69819b456.tar.gz |
Remove more unnecessary rubygems version checks
Diffstat (limited to 'spec')
-rw-r--r-- | spec/bundler/stub_specification_spec.rb | 10 | ||||
-rw-r--r-- | spec/quality_spec.rb | 10 | ||||
-rw-r--r-- | spec/realworld/parallel_spec.rb | 12 |
3 files changed, 9 insertions, 23 deletions
diff --git a/spec/bundler/stub_specification_spec.rb b/spec/bundler/stub_specification_spec.rb index 5521d83769..7495b5d661 100644 --- a/spec/bundler/stub_specification_spec.rb +++ b/spec/bundler/stub_specification_spec.rb @@ -13,12 +13,10 @@ RSpec.describe Bundler::StubSpecification do described_class.from_stub(gemspec) end - if Bundler.rubygems.provides?(">= 2.1") - describe "#from_stub" do - it "returns the same stub if already a Bundler::StubSpecification" do - stub = described_class.from_stub(with_bundler_stub_spec) - expect(stub).to be(with_bundler_stub_spec) - end + describe "#from_stub" do + it "returns the same stub if already a Bundler::StubSpecification" do + stub = described_class.from_stub(with_bundler_stub_spec) + expect(stub).to be(with_bundler_stub_spec) end end end diff --git a/spec/quality_spec.rb b/spec/quality_spec.rb index cbeabb3b6e..8bdef33a79 100644 --- a/spec/quality_spec.rb +++ b/spec/quality_spec.rb @@ -226,14 +226,10 @@ RSpec.describe "The library itself" do gem_command! :build, gemspec end - if Bundler.rubygems.provides?(">= 2.4") - # there's no way around this warning - last_command.stderr.sub!(/^YAML safe loading.*/, "") + # there's no way around this warning + last_command.stderr.sub!(/^YAML safe loading.*/, "") - # older rubygems have weird warnings, and we won't actually be using them - # to build the gem for releases anyways - expect(last_command.stderr).to be_empty, "bundler should build as a gem without warnings, but\n#{err}" - end + expect(last_command.stderr).to be_empty, "bundler should build as a gem without warnings, but\n#{err}" ensure # clean up the .gem generated FileUtils.rm("bundler-#{Bundler::VERSION}.gem") diff --git a/spec/realworld/parallel_spec.rb b/spec/realworld/parallel_spec.rb index ed4430c68b..ebb7987e0b 100644 --- a/spec/realworld/parallel_spec.rb +++ b/spec/realworld/parallel_spec.rb @@ -11,11 +11,7 @@ RSpec.describe "parallel", :realworld => true, :sometimes => true do bundle :install, :jobs => 4, :env => { "DEBUG" => "1" } - if Bundler.rubygems.provides?(">= 2.1.0") - expect(out).to match(/[1-3]: /) - else - expect(out).to include("is not threadsafe") - end + expect(out).to match(/[1-3]: /) bundle "info activesupport --path" expect(out).to match(/activesupport/) @@ -40,11 +36,7 @@ RSpec.describe "parallel", :realworld => true, :sometimes => true do bundle :update, :jobs => 4, :env => { "DEBUG" => "1" }, :all => bundle_update_requires_all? - if Bundler.rubygems.provides?(">= 2.1.0") - expect(out).to match(/[1-3]: /) - else - expect(out).to include("is not threadsafe") - end + expect(out).to match(/[1-3]: /) bundle "info activesupport --path" expect(out).to match(/activesupport-3\.2\.\d+/) |