diff options
author | Bundlerbot <bot@bundler.io> | 2019-08-16 00:03:01 +0000 |
---|---|---|
committer | Bundlerbot <bot@bundler.io> | 2019-08-16 00:03:01 +0000 |
commit | 982e415d6b7c02c413dab39df31f27088e969435 (patch) | |
tree | 98432320dbaf199d96aee0bcb1047424226cb6a4 /spec/commands | |
parent | 91f91a1ada123cb2da02307b2107aa5119a557f4 (diff) | |
parent | 925617744622b123b6b55b2c9d750ab061097219 (diff) | |
download | bundler-982e415d6b7c02c413dab39df31f27088e969435.tar.gz |
Merge #7301
7301: Track changes from ruby core master r=hsbt a=hsbt
### What was the end-user problem that led to this PR?
I'm going to merge https://github.com/bundler/bundler/pull/7274. But the ruby-core source has some of the changes for bundler source.
### What was your diagnosis of the problem?
### What is your fix for the problem, implemented in this PR?
ruby core team fixed them:
* Removed circular require warning at `shared_helper.rb`
* Support test at GitHub Actions, It helps that bundler will migrate Actions from Azure Pipelines too.
* Fixed broken examples at ruby core repository
### Why did you choose this fix out of the possible options?
Co-authored-by: ohbarye <over.rye@gmail.com>
Co-authored-by: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Co-authored-by: Yusuke Endoh <mame@ruby-lang.org>
Diffstat (limited to 'spec/commands')
-rw-r--r-- | spec/commands/binstubs_spec.rb | 2 | ||||
-rw-r--r-- | spec/commands/exec_spec.rb | 4 | ||||
-rw-r--r-- | spec/commands/newgem_spec.rb | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/spec/commands/binstubs_spec.rb b/spec/commands/binstubs_spec.rb index 748cf6362f..81b4d99064 100644 --- a/spec/commands/binstubs_spec.rb +++ b/spec/commands/binstubs_spec.rb @@ -264,7 +264,7 @@ RSpec.describe "bundle binstubs <gem>" do end context "when using --shebang" do - it "sets the specified shebang for the the binstub" do + it "sets the specified shebang for the binstub" do install_gemfile <<-G source "#{file_uri_for(gem_repo1)}" gem "rack" diff --git a/spec/commands/exec_spec.rb b/spec/commands/exec_spec.rb index 8ad5a3c125..bb13b1b086 100644 --- a/spec/commands/exec_spec.rb +++ b/spec/commands/exec_spec.rb @@ -55,7 +55,7 @@ RSpec.describe "bundle exec" do expect(out).to eq("hi") end - it "respects custom process title when loading through ruby" do + it "respects custom process title when loading through ruby", :github_action_linux do script_that_changes_its_own_title_and_checks_if_picked_up_by_ps_unix_utility = <<~RUBY Process.setproctitle("1-2-3-4-5-6-7-8-9-10-11-12-13-14-15-16") puts `ps -eo args | grep [1]-2-3-4-5-6-7-8-9-10-11-12-13-14-15-16` @@ -299,7 +299,7 @@ RSpec.describe "bundle exec" do G rubylib = ENV["RUBYLIB"] - rubylib = rubylib.to_s.split(File::PATH_SEPARATOR).unshift bundler_path + rubylib = rubylib.to_s.split(File::PATH_SEPARATOR).unshift bundler_path.to_s rubylib = rubylib.uniq.join(File::PATH_SEPARATOR) bundle "exec 'echo $RUBYLIB'" diff --git a/spec/commands/newgem_spec.rb b/spec/commands/newgem_spec.rb index 0b01797810..f4cd29edbc 100644 --- a/spec/commands/newgem_spec.rb +++ b/spec/commands/newgem_spec.rb @@ -311,7 +311,8 @@ RSpec.describe "bundle gem" do end it "sets a minimum ruby version" do - bundler_gemspec = Bundler::GemHelper.new(File.expand_path("../..", __dir__)).gemspec + gemspec_path = ruby_core? ? "../../../lib/bundler" : "../.." + bundler_gemspec = Bundler::GemHelper.new(File.expand_path(gemspec_path, __dir__)).gemspec expect(bundler_gemspec.required_ruby_version).to eq(generated_gemspec.required_ruby_version) end |