diff options
author | Bundlerbot <bot@bundler.io> | 2019-04-01 13:48:21 +0000 |
---|---|---|
committer | Bundlerbot <bot@bundler.io> | 2019-04-01 13:48:21 +0000 |
commit | 543f230a6a92b1ca9deb006826339aa14f626405 (patch) | |
tree | f525e0996f3849201798408fb35262b30a02217c | |
parent | 3b6c6e35b36fc056ec3610f9f22f1cea2ef0b06f (diff) | |
parent | 94aea34a9df3f50fdafceee500bd8080fe9fc55d (diff) | |
download | bundler-543f230a6a92b1ca9deb006826339aa14f626405.tar.gz |
Merge #7082
7082: Complete some missing specs r=deivid-rodriguez a=deivid-rodriguez
This is a follow up to #7052.
### What was the end-user problem that led to this PR?
The problem was that the `Bundle.with_clean_env` & `Bundle.with_original_env` family was missing some deprecation specs, and also the specs were spread out across different files.
### What is your fix for the problem, implemented in this PR?
My fix is to add the missing specs, and centralize them in the deprecation specs file.
Co-authored-by: David RodrÃguez <deivid.rodriguez@riseup.net>
-rw-r--r-- | spec/other/major_deprecation_spec.rb | 54 | ||||
-rw-r--r-- | spec/runtime/with_unbundled_env_spec.rb | 36 |
2 files changed, 54 insertions, 36 deletions
diff --git a/spec/other/major_deprecation_spec.rb b/spec/other/major_deprecation_spec.rb index f4d55a450c..39bba9c3da 100644 --- a/spec/other/major_deprecation_spec.rb +++ b/spec/other/major_deprecation_spec.rb @@ -30,6 +30,60 @@ RSpec.describe "major deprecations" do end end + describe ".with_clean_env" do + before do + source = "Bundler.with_clean_env {}" + bundle "exec ruby -e #{source.dump}" + end + + it "is not deprecated", :bundler => "< 2" do + expect(deprecations).to be_empty + end + + it "is deprecated in favor of .unbundled_env", :bundler => "2" do + expect(deprecations).to include( + "`Bundler.with_clean_env` has been deprecated in favor of `Bundler.with_unbundled_env`. " \ + "If you instead want the environment before bundler was originally loaded, use `Bundler.with_original_env`" + ) + end + end + + describe ".clean_system" do + before do + source = "Bundler.clean_system('ls')" + bundle "exec ruby -e #{source.dump}" + end + + it "is not deprecated", :bundler => "< 2" do + expect(deprecations).to be_empty + end + + it "is deprecated in favor of .unbundled_system", :bundler => "2" do + expect(deprecations).to include( + "`Bundler.clean_system` has been deprecated in favor of `Bundler.unbundled_system`. " \ + "If you instead want to run the command in the environment before bundler was originally loaded, use `Bundler.original_system`" + ) + end + end + + describe ".clean_exec" do + before do + source = "Bundler.clean_exec('ls')" + bundle "exec ruby -e #{source.dump}" + end + + it "is not deprecated", :bundler => "< 2" do + expect(deprecations).to be_empty + end + + it "is deprecated in favor of .unbundled_exec", :bundler => "2" do + expect(deprecations).to include( + "`Bundler.clean_exec` has been deprecated in favor of `Bundler.unbundled_exec`. " \ + "If you instead want to exec to a command in the environment before bundler was originally loaded, use `Bundler.original_exec`" + ) + end + end + describe ".environment" do before do source = "Bundler.environment" diff --git a/spec/runtime/with_unbundled_env_spec.rb b/spec/runtime/with_unbundled_env_spec.rb index 1ed853f467..24a08992b2 100644 --- a/spec/runtime/with_unbundled_env_spec.rb +++ b/spec/runtime/with_unbundled_env_spec.rb @@ -102,24 +102,6 @@ RSpec.describe "Bundler.with_env helpers" do let(:modified_env) { "Bundler.clean_env" } it_behaves_like "an unbundling helper" - - it "prints a deprecation", :bundler => 2 do - code = "Bundler.clean_env" - bundle_exec_ruby! code.dump - expect(err).to include( - "[DEPRECATED] `Bundler.clean_env` has been deprecated in favor of `Bundler.unbundled_env`. " \ - "If you instead want the environment before bundler was originally loaded, use `Bundler.original_env`" - ) - end - - it "does not print a deprecation", :bundler => "< 2" do - code = "Bundler.clean_env" - bundle_exec_ruby! code.dump - expect(out).not_to include( - "[DEPRECATED] `Bundler.clean_env` has been deprecated in favor of `Bundler.unbundled_env`. " \ - "If you instead want the environment before bundler was originally loaded, use `Bundler.original_env`" - ) - end end describe "Bundler.with_original_env" do @@ -152,24 +134,6 @@ RSpec.describe "Bundler.with_env helpers" do expect(ENV).not_to have_key("FOO") end - - it "prints a deprecation", :bundler => 2 do - code = "Bundler.with_clean_env {}" - bundle_exec_ruby! code.dump - expect(err).to include( - "[DEPRECATED] `Bundler.with_clean_env` has been deprecated in favor of `Bundler.with_unbundled_env`. " \ - "If you instead want the environment before bundler was originally loaded, use `Bundler.with_original_env`" - ) - end - - it "does not print a deprecation", :bundler => "< 2" do - code = "Bundler.with_clean_env {}" - bundle_exec_ruby! code.dump - expect(out).not_to include( - "[DEPRECATED] `Bundler.with_clean_env` has been deprecated in favor of `Bundler.with_unbundled_env`. " \ - "If you instead want the environment before bundler was originally loaded, use `Bundler.with_original_env`" - ) - end end describe "Bundler.with_unbundled_env" do |