diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-01-23 23:03:53 -0300 |
---|---|---|
committer | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-02-21 16:32:23 +0100 |
commit | f626de26bdd4decd66a09a2cd6146e87caf640a2 (patch) | |
tree | f7a9e38cde369c758729fa716536682600a21fb2 | |
parent | 149f1ce04bde47d72a62569143be0484cf4bdbba (diff) | |
download | bundler-f626de26bdd4decd66a09a2cd6146e87caf640a2.tar.gz |
Remove deprecation releases
-rw-r--r-- | lib/bundler/shared_helpers.rb | 3 | ||||
-rw-r--r-- | spec/other/major_deprecation_spec.rb | 16 |
2 files changed, 1 insertions, 18 deletions
diff --git a/lib/bundler/shared_helpers.rb b/lib/bundler/shared_helpers.rb index e28f9e6f39..e0cb61e03f 100644 --- a/lib/bundler/shared_helpers.rb +++ b/lib/bundler/shared_helpers.rb @@ -374,8 +374,7 @@ module Bundler def prints_major_deprecations? require "bundler" - deprecation_release = Bundler::VERSION.split(".").drop(1).include?("99") - return false if !deprecation_release && !Bundler.settings[:major_deprecations] + return false unless Bundler.settings[:major_deprecations] require "bundler/deprecate" return false if Bundler::Deprecate.skip true diff --git a/spec/other/major_deprecation_spec.rb b/spec/other/major_deprecation_spec.rb index 800c7b4b88..2e199c0e79 100644 --- a/spec/other/major_deprecation_spec.rb +++ b/spec/other/major_deprecation_spec.rb @@ -4,22 +4,6 @@ RSpec.describe "major deprecations", :bundler => "< 2" do let(:warnings) { last_command.bundler_err } # change to err in 2.0 let(:warnings_without_version_messages) { warnings.gsub(/#{Spec::Matchers::MAJOR_DEPRECATION}Bundler will only support ruby(gems)? >= .*/, "") } - context "in a .99 version" do - before do - simulate_bundler_version "1.99.1" - bundle "config unset major_deprecations" - end - - it "prints major deprecations without being configured" do - ruby <<-R - require "bundler" - Bundler::SharedHelpers.major_deprecation(Bundler::VERSION) - R - - expect(warnings).to have_major_deprecation("1.99.1") - end - end - before do bundle "config set major_deprecations true" |