diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-08-12 08:23:27 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-08-14 22:51:39 +0900 |
| commit | 060f31bb132afe20547a61d490d86fa509c59f26 (patch) | |
| tree | e2c50fdf654e2dd4841e53b914d8174e9e19fdd9 | |
| parent | 7a971a3aaaf9e61456749ab7da4bd4c99575f29e (diff) | |
| download | bundler-060f31bb132afe20547a61d490d86fa509c59f26.tar.gz | |
Re-use GITHUB_ACTION variables for filtering bundler examples.
| -rw-r--r-- | spec/bundler/source_spec.rb | 6 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 2 |
2 files changed, 4 insertions, 4 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 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 80e6d475f3..6810fcf3ce 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -71,7 +71,7 @@ RSpec.configure do |config| config.filter_run_excluding :git => RequirementChecker.against(git_version) config.filter_run_excluding :bundler => RequirementChecker.against(Bundler::VERSION.split(".")[0]) config.filter_run_excluding :ruby_repo => !(ENV["BUNDLE_RUBY"] && ENV["BUNDLE_GEM"]).nil? - config.filter_run_excluding :non_windows => Gem.win_platform? || ENV["CI"] + config.filter_run_excluding :no_color_tty => Gem.win_platform? || !!ENV["GITHUB_ACTION"] config.filter_run_when_matching :focus unless ENV["CI"] |