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/bundler | |
| 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/bundler')
| -rw-r--r-- | spec/bundler/source_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/bundler/source_spec.rb b/spec/bundler/source_spec.rb index 9ae6b3e3eb..46d86937da 100644 --- a/spec/bundler/source_spec.rb +++ b/spec/bundler/source_spec.rb @@ -56,7 +56,7 @@ RSpec.describe Bundler::Source do context "with a different version" do let(:locked_gem) { double(:locked_gem, :name => "nokogiri", :version => "< 1.5") } - context "with color", :non_windows do + context "with color", :no_color_tty do before { Bundler.ui = Bundler::UI::Shell.new } it "should return a string with the spec name and version and locked spec version" do @@ -77,7 +77,7 @@ RSpec.describe Bundler::Source do let(:spec) { double(:spec, :name => "nokogiri", :version => "1.6.1", :platform => rb) } let(:locked_gem) { double(:locked_gem, :name => "nokogiri", :version => "1.7.0") } - context "with color", :non_windows do + context "with color", :no_color_tty do before { Bundler.ui = Bundler::UI::Shell.new } it "should return a string with the locked spec version in yellow" do @@ -98,7 +98,7 @@ RSpec.describe Bundler::Source do let(:spec) { double(:spec, :name => "nokogiri", :version => "1.7.1", :platform => rb) } let(:locked_gem) { double(:locked_gem, :name => "nokogiri", :version => "1.7.0") } - context "with color", :non_windows do + context "with color", :no_color_tty do before { Bundler.ui = Bundler::UI::Shell.new } it "should return a string with the locked spec version in green" do |