summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2017-07-11 15:29:35 -0500
committerSamuel Giddins <segiddins@segiddins.me>2017-07-19 13:10:40 -0500
commit79fb4b0e7e4fd55d8e83193b11e64817566fbd93 (patch)
tree30ef83caa1e36919398b70e2b1065528412d2b88
parent118e0d9dab903adcc94b982423f6bfd954c59cf4 (diff)
downloadbundler-79fb4b0e7e4fd55d8e83193b11e64817566fbd93.tar.gz
Fix the realworld specs under Bundler 2
-rw-r--r--spec/install/gems/sudo_spec.rb9
-rw-r--r--spec/realworld/edgecases_spec.rb2
-rw-r--r--spec/realworld/parallel_spec.rb6
3 files changed, 2 insertions, 15 deletions
diff --git a/spec/install/gems/sudo_spec.rb b/spec/install/gems/sudo_spec.rb
index f2dce52c78..afcc33cc74 100644
--- a/spec/install/gems/sudo_spec.rb
+++ b/spec/install/gems/sudo_spec.rb
@@ -161,16 +161,9 @@ RSpec.describe "when using sudo", :sudo => true do
end
end
- context "when silence_root_warning is passed as an option" do
- it "skips the warning" do
- bundle :install, :sudo => true, :silence_root_warning => true
- expect(out).to_not include(warning)
- end
- end
-
context "when silence_root_warning = false" do
it "warns against that" do
- bundle :install, :sudo => true, :silence_root_warning => false
+ bundle :install, :sudo => true, :env => { "BUNDLE_SILENCE_ROOT_WARNING" => "false" }
expect(out).to include(warning)
end
end
diff --git a/spec/realworld/edgecases_spec.rb b/spec/realworld/edgecases_spec.rb
index fbf885778a..aa60e20b8a 100644
--- a/spec/realworld/edgecases_spec.rb
+++ b/spec/realworld/edgecases_spec.rb
@@ -239,7 +239,7 @@ RSpec.describe "real world edgecases", :realworld => true, :sometimes => true do
gem 'rack', '1.0.1'
G
- bundle "install --path vendor/bundle"
+ bundle! :install, forgotten_command_line_options(:path => "vendor/bundle")
expect(err).not_to include("Could not find rake")
expect(err).to lack_errors
end
diff --git a/spec/realworld/parallel_spec.rb b/spec/realworld/parallel_spec.rb
index 2f5bc9fbaf..e8d9771b09 100644
--- a/spec/realworld/parallel_spec.rb
+++ b/spec/realworld/parallel_spec.rb
@@ -22,9 +22,6 @@ RSpec.describe "parallel", :realworld => true, :sometimes => true do
bundle "show faker"
expect(out).to match(/faker/)
-
- bundle "config jobs"
- expect(out).to match(/: "4"/)
end
it "updates" do
@@ -54,9 +51,6 @@ RSpec.describe "parallel", :realworld => true, :sometimes => true do
bundle "show faker"
expect(out).to match(/faker/)
-
- bundle "config jobs"
- expect(out).to match(/: "4"/)
end
it "works with --standalone" do