summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2019-10-30 16:13:53 +0100
committerDavid Rodríguez <deivid.rodriguez@riseup.net>2019-10-30 16:13:53 +0100
commit59c18e63e951682aebaf687de020fa5d20f79f3d (patch)
treea2943b9565d1f732b56cc0e1cc7dff5c23c433c3
parent91f26d6b1dcf9e842fd312dbb472ae4e8c184835 (diff)
downloadbundler-59c18e63e951682aebaf687de020fa5d20f79f3d.tar.gz
Revert "Avoid printing deprecation messages during specs"
This reverts commit 0a67ac4dc2bad753e33e11352e97f73c9c1ddeee.
-rw-r--r--spec/runtime/with_unbundled_env_spec.rb26
1 files changed, 8 insertions, 18 deletions
diff --git a/spec/runtime/with_unbundled_env_spec.rb b/spec/runtime/with_unbundled_env_spec.rb
index 05f3c8e3ab..a5140ae463 100644
--- a/spec/runtime/with_unbundled_env_spec.rb
+++ b/spec/runtime/with_unbundled_env_spec.rb
@@ -1,7 +1,5 @@
# frozen_string_literal: true
-require_relative "../support/streams"
-
RSpec.describe "Bundler.with_env helpers" do
def bundle_exec_ruby!(code, options = {})
build_bundler_context options
@@ -129,17 +127,13 @@ RSpec.describe "Bundler.with_env helpers" do
describe "Bundler.with_clean_env", :bundler => 2 do
it "should set ENV to unbundled_env in the block" do
expected = Bundler.unbundled_env
- actual = nil
- capture(:stderr) do
- actual = Bundler.with_clean_env { ENV.to_hash }
- end
-
+ actual = Bundler.with_clean_env { ENV.to_hash }
expect(actual).to eq(expected)
end
it "should restore the environment after execution" do
- capture(:stderr) do
- Bundler.with_clean_env { ENV["FOO"] = "hello" }
+ Bundler.with_clean_env do
+ ENV["FOO"] = "hello"
end
expect(ENV).not_to have_key("FOO")
@@ -181,9 +175,7 @@ RSpec.describe "Bundler.with_env helpers" do
describe "Bundler.clean_system", :bundler => 2 do
let(:code) do
<<~RUBY
- capture(:stderr) do
- Bundler.clean_system(%([ "\$BUNDLE_FOO" = "bar" ] || exit 42))
- end
+ Bundler.clean_system(%([ "\$BUNDLE_FOO" = "bar" ] || exit 42))
exit $?.exitstatus
RUBY
@@ -191,7 +183,7 @@ RSpec.describe "Bundler.with_env helpers" do
it "runs system inside with_clean_env" do
lib = File.expand_path("../../lib", __dir__)
- system({ "BUNDLE_FOO" => "bar" }, "ruby -I#{lib}:#{spec} -rsupport/streams -rbundler -e '#{code}'")
+ system({ "BUNDLE_FOO" => "bar" }, "ruby -I#{lib} -rbundler -e '#{code}'")
expect($?.exitstatus).to eq(42)
end
end
@@ -237,10 +229,8 @@ RSpec.describe "Bundler.with_env helpers" do
describe "Bundler.clean_exec", :bundler => 2 do
let(:code) do
<<~RUBY
- capture(:stderr) do
- Process.fork do
- exit Bundler.clean_exec(%(test "\$BUNDLE_FOO" = "bar"))
- end
+ Process.fork do
+ exit Bundler.clean_exec(%(test "\$BUNDLE_FOO" = "bar"))
end
_, status = Process.wait2
@@ -253,7 +243,7 @@ RSpec.describe "Bundler.with_env helpers" do
skip "Fork not implemented" if Gem.win_platform?
lib = File.expand_path("../../lib", __dir__)
- system({ "BUNDLE_FOO" => "bar" }, "ruby -I#{lib}:#{spec} -rsupport/streams -rbundler -e '#{code}'")
+ system({ "BUNDLE_FOO" => "bar" }, "ruby -I#{lib} -rbundler -e '#{code}'")
expect($?.exitstatus).to eq(1)
end
end