Skip to content

Commit bc6b045

Browse files
deivid-rodriguezhsbt
authored andcommitted
[rubygems/rubygems] Cleanup now unnecessary RUBYOPT handling
ruby/rubygems@ac83c78635
1 parent 32a9f29 commit bc6b045

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

spec/bundler/install/gems/compact_index_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,7 @@ def require(*args)
742742
gem "myrack"
743743
G
744744

745-
bundle :install, env: { "RUBYOPT" => opt_add("-I#{bundled_app("broken_ssl")}", ENV["RUBYOPT"]) }, raise_on_error: false, artifice: nil
745+
bundle :install, env: { "RUBYOPT" => "-I#{bundled_app("broken_ssl")}" }, raise_on_error: false, artifice: nil
746746
expect(err).to include("recompile Ruby").and include("cannot load such file")
747747
end
748748
end

spec/bundler/install/gems/dependency_api_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ def require(*args)
712712
gem "myrack"
713713
G
714714

715-
bundle :install, artifice: "fail", env: { "RUBYOPT" => opt_add("-I#{bundled_app("broken_ssl")}", ENV["RUBYOPT"]) }, raise_on_error: false
715+
bundle :install, artifice: "fail", env: { "RUBYOPT" => "-I#{bundled_app("broken_ssl")}" }, raise_on_error: false
716716
expect(err).to include("recompile Ruby").and include("cannot load such file")
717717
end
718718
end

spec/bundler/runtime/requiring_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
RSpec.describe "Requiring bundler" do
44
it "takes care of requiring rubygems when entrypoint is bundler/setup" do
5-
sys_exec("#{Gem.ruby} -I#{lib_dir} -rbundler/setup -e'puts true'", env: { "RUBYOPT" => opt_add("--disable=gems", ENV["RUBYOPT"]) })
5+
sys_exec("#{Gem.ruby} -I#{lib_dir} -rbundler/setup -e'puts true'", env: { "RUBYOPT" => "--disable=gems" })
66

77
expect(stdboth).to eq("true")
88
end
99

1010
it "takes care of requiring rubygems when requiring just bundler" do
11-
sys_exec("#{Gem.ruby} -I#{lib_dir} -rbundler -e'puts true'", env: { "RUBYOPT" => opt_add("--disable=gems", ENV["RUBYOPT"]) })
11+
sys_exec("#{Gem.ruby} -I#{lib_dir} -rbundler -e'puts true'", env: { "RUBYOPT" => "--disable=gems" })
1212

1313
expect(stdboth).to eq("true")
1414
end

0 commit comments

Comments
 (0)