diff options
author | Bundlerbot <bot@bundler.io> | 2019-04-14 12:40:12 +0000 |
---|---|---|
committer | Bundlerbot <bot@bundler.io> | 2019-04-14 12:40:12 +0000 |
commit | 0a20c21d87a85d5ce581480e8f6dd647b76176b2 (patch) | |
tree | 31b9330c07d49757962c3fa88f141571876dbcdd /spec/commands | |
parent | 9424cedb913b738bbd733e30c772524ea054f5fe (diff) | |
parent | 7ce68899d182f84b5a400cf5c5e217e1430b97a6 (diff) | |
download | bundler-0a20c21d87a85d5ce581480e8f6dd647b76176b2.tar.gz |
Merge #7128
7128: Backport to workaround from ruby core. r=deivid-rodriguez a=hsbt
### What was the end-user problem that led to this PR?
The current master branch couldn't invoke with the ruby core repository.
### What was your diagnosis of the problem?
1. We need to add explicitly declare `rspec` in spec_helper.rb
2. Some examples were failed on ruby core repository.
### What is your fix for the problem, implemented in this PR?
1. simply added.
2. update the `ruby_repo` labels for skipping to run.
Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org>
Diffstat (limited to 'spec/commands')
-rw-r--r-- | spec/commands/binstubs_spec.rb | 2 | ||||
-rw-r--r-- | spec/commands/config_spec.rb | 2 | ||||
-rw-r--r-- | spec/commands/exec_spec.rb | 4 | ||||
-rw-r--r-- | spec/commands/info_spec.rb | 2 | ||||
-rw-r--r-- | spec/commands/newgem_spec.rb | 2 | ||||
-rw-r--r-- | spec/commands/show_spec.rb | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/spec/commands/binstubs_spec.rb b/spec/commands/binstubs_spec.rb index 77f23b9a2f..4f310784c7 100644 --- a/spec/commands/binstubs_spec.rb +++ b/spec/commands/binstubs_spec.rb @@ -202,7 +202,7 @@ RSpec.describe "bundle binstubs <gem>" do context "when requesting a different bundler version" do before { lockfile lockfile.gsub(Bundler::VERSION, "999.999.999") } - it "attempts to load that version", :ruby_repo do + it "attempts to load that version" do sys_exec bundled_app("bin/rackup").to_s expect(exitstatus).to eq(42) if exitstatus expect(err).to include("Activating bundler (999.999.999) failed:"). diff --git a/spec/commands/config_spec.rb b/spec/commands/config_spec.rb index f5b3e7c998..40fab95803 100644 --- a/spec/commands/config_spec.rb +++ b/spec/commands/config_spec.rb @@ -389,7 +389,7 @@ E end describe "subcommands" do - it "list" do + it "list", :ruby_repo do bundle! "config list" expect(out).to eq "Settings are listed in order of priority. The top value will be used.\nspec_run\nSet via BUNDLE_SPEC_RUN: \"true\"" diff --git a/spec/commands/exec_spec.rb b/spec/commands/exec_spec.rb index 655313534d..24aa5f46fe 100644 --- a/spec/commands/exec_spec.rb +++ b/spec/commands/exec_spec.rb @@ -530,7 +530,7 @@ RSpec.describe "bundle exec" do expect(out).to include("Installing foo 1.0") end - describe "with gems bundled via :path with invalid gemspecs", :ruby_repo do + describe "with gems bundled via :path with invalid gemspecs" do it "outputs the gemspec validation errors" do build_lib "foo" @@ -836,7 +836,7 @@ __FILE__: #{path.to_s.inspect} bundle :install, :system_bundler => true, :path => "vendor/bundler" end - it "overrides disable_shared_gems so bundler can be found", :rubygems => ">= 2.6.2" do + it "overrides disable_shared_gems so bundler can be found", :ruby_repo, :rubygems => ">= 2.6.2" do system_gems :bundler file = bundled_app("file_that_bundle_execs.rb") create_file(file, <<-RB) diff --git a/spec/commands/info_spec.rb b/spec/commands/info_spec.rb index fc1d97b1da..f0f4b5f87d 100644 --- a/spec/commands/info_spec.rb +++ b/spec/commands/info_spec.rb @@ -116,7 +116,7 @@ RSpec.describe "bundle info" do end end - context "with a valid regexp for gem name" do + context "with a valid regexp for gem name", :ruby_repo do it "presents alternatives" do install_gemfile <<-G source "file://#{gem_repo1}" diff --git a/spec/commands/newgem_spec.rb b/spec/commands/newgem_spec.rb index bb04f33c80..dcd36d3fe4 100644 --- a/spec/commands/newgem_spec.rb +++ b/spec/commands/newgem_spec.rb @@ -178,7 +178,7 @@ RSpec.describe "bundle gem" do end end - it "generates a valid gemspec" do + it "generates a valid gemspec", :ruby_repo do in_app_root bundle! "gem newgem --bin" diff --git a/spec/commands/show_spec.rb b/spec/commands/show_spec.rb index 8fb6631f82..6e1986e35f 100644 --- a/spec/commands/show_spec.rb +++ b/spec/commands/show_spec.rb @@ -173,7 +173,7 @@ RSpec.describe "bundle show", :bundler => "< 3" do end context "with a valid regexp for gem name" do - it "presents alternatives" do + it "presents alternatives", :ruby_repo do install_gemfile <<-G source "file://#{gem_repo1}" gem "rack" |