diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-02-11 00:14:29 +0100 |
---|---|---|
committer | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-02-14 00:46:02 +0100 |
commit | 8ba4916ebc6777104027ecb0d654825ea13824a9 (patch) | |
tree | 24f103ec50c6869f08e99efdc82a140aebfd2a5d | |
parent | dac69e7b21cb05ad9df27941aab004abcb80b4ef (diff) | |
download | bundler-8ba4916ebc6777104027ecb0d654825ea13824a9.tar.gz |
Remove now unnecessary `lack_errors` matcher
Since the errors are checked on their own stream, no filtering is
needed.
-rw-r--r-- | spec/commands/exec_spec.rb | 4 | ||||
-rw-r--r-- | spec/commands/package_spec.rb | 2 | ||||
-rw-r--r-- | spec/commands/show_spec.rb | 2 | ||||
-rw-r--r-- | spec/install/gemfile/git_spec.rb | 6 | ||||
-rw-r--r-- | spec/install/gemfile/path_spec.rb | 2 | ||||
-rw-r--r-- | spec/install/gemspecs_spec.rb | 4 | ||||
-rw-r--r-- | spec/realworld/edgecases_spec.rb | 6 | ||||
-rw-r--r-- | spec/runtime/inline_spec.rb | 2 | ||||
-rw-r--r-- | spec/runtime/require_spec.rb | 6 | ||||
-rw-r--r-- | spec/runtime/setup_spec.rb | 26 | ||||
-rw-r--r-- | spec/support/matchers.rb | 7 | ||||
-rw-r--r-- | spec/update/git_spec.rb | 2 |
12 files changed, 31 insertions, 38 deletions
diff --git a/spec/commands/exec_spec.rb b/spec/commands/exec_spec.rb index 04e15757fd..c66faed8f5 100644 --- a/spec/commands/exec_spec.rb +++ b/spec/commands/exec_spec.rb @@ -93,14 +93,14 @@ RSpec.describe "bundle exec" do expect(out).to eq("Ruby version #{RUBY_VERSION} defaults to keeping non-standard file descriptors on Kernel#exec.") end - expect(err).to lack_errors + expect(err).to be_empty end it "accepts --keep-file-descriptors" do install_gemfile "" bundle "exec --keep-file-descriptors echo foobar" - expect(err).to lack_errors + expect(err).to be_empty end it "can run a command named --verbose" do diff --git a/spec/commands/package_spec.rb b/spec/commands/package_spec.rb index ef579da5ec..302d30db97 100644 --- a/spec/commands/package_spec.rb +++ b/spec/commands/package_spec.rb @@ -266,7 +266,7 @@ RSpec.describe "bundle install with gem sources" do end bundle :install - expect(err).to lack_errors + expect(err).to be_empty expect(the_bundle).to include_gems "rack 1.0" end diff --git a/spec/commands/show_spec.rb b/spec/commands/show_spec.rb index 70c8e66297..50288e7696 100644 --- a/spec/commands/show_spec.rb +++ b/spec/commands/show_spec.rb @@ -157,7 +157,7 @@ RSpec.describe "bundle show" do it "does not output git errors" do bundle :show - expect(err).to lack_errors + expect(err).to be_empty end end diff --git a/spec/install/gemfile/git_spec.rb b/spec/install/gemfile/git_spec.rb index 3be2a19698..1bcc18bc73 100644 --- a/spec/install/gemfile/git_spec.rb +++ b/spec/install/gemfile/git_spec.rb @@ -204,7 +204,7 @@ RSpec.describe "bundle install with git sources" do gem "foo" end G - expect(err).to lack_errors + expect(err).to be_empty run <<-RUBY require 'foo' @@ -234,7 +234,7 @@ RSpec.describe "bundle install with git sources" do gem "foo" end G - expect(err).to lack_errors + expect(err).to be_empty run! <<-RUBY require 'foo' @@ -270,7 +270,7 @@ RSpec.describe "bundle install with git sources" do gem "foo" end G - expect(err).to lack_errors + expect(err).to be_empty run! <<-RUBY require 'foo' diff --git a/spec/install/gemfile/path_spec.rb b/spec/install/gemfile/path_spec.rb index d570ad99b9..c1b8527994 100644 --- a/spec/install/gemfile/path_spec.rb +++ b/spec/install/gemfile/path_spec.rb @@ -313,7 +313,7 @@ RSpec.describe "bundle install with explicit source paths" do install_gemfile <<-G gem 'foo', '1.0', :path => "#{lib_path("foo-1.0")}" G - expect(err).to lack_errors + expect(err).to be_empty end it "removes the .gem file after installing" do diff --git a/spec/install/gemspecs_spec.rb b/spec/install/gemspecs_spec.rb index 1cc4045089..7ff1ca70c5 100644 --- a/spec/install/gemspecs_spec.rb +++ b/spec/install/gemspecs_spec.rb @@ -15,7 +15,7 @@ RSpec.describe "bundle install" do gem "yaml_spec" G bundle :install - expect(err).to lack_errors + expect(err).to be_empty end it "still installs correctly when using path" do @@ -24,7 +24,7 @@ RSpec.describe "bundle install" do install_gemfile <<-G gem 'yaml_spec', :path => "#{lib_path("yaml_spec-1.0")}" G - expect(err).to lack_errors + expect(err).to be_empty end end diff --git a/spec/realworld/edgecases_spec.rb b/spec/realworld/edgecases_spec.rb index 7fb2313941..ae749746a2 100644 --- a/spec/realworld/edgecases_spec.rb +++ b/spec/realworld/edgecases_spec.rb @@ -26,7 +26,7 @@ RSpec.describe "real world edgecases", :realworld => true, :sometimes => true do gem "linecache", "0.46" G bundle :lock - expect(err).to lack_errors + expect(err).to be_empty expect(exitstatus).to eq(0) if exitstatus end @@ -241,7 +241,7 @@ RSpec.describe "real world edgecases", :realworld => true, :sometimes => true do bundle! :install, forgotten_command_line_options(:path => "vendor/bundle") expect(err).not_to include("Could not find rake") - expect(err).to lack_errors + expect(err).to be_empty end it "checks out git repos when the lockfile is corrupted" do @@ -368,7 +368,7 @@ RSpec.describe "real world edgecases", :realworld => true, :sometimes => true do L bundle! :lock - expect(last_command.stderr).to lack_errors + expect(last_command.stderr).to be_empty end it "outputs a helpful error message when gems have invalid gemspecs" do diff --git a/spec/runtime/inline_spec.rb b/spec/runtime/inline_spec.rb index 09493e0cbf..4c1cc35a4a 100644 --- a/spec/runtime/inline_spec.rb +++ b/spec/runtime/inline_spec.rb @@ -90,7 +90,7 @@ RSpec.describe "bundler/inline#gemfile" do expect(out).to include("Installing activesupport") err.gsub! %r{.*lib/sinatra/base\.rb:\d+: warning: constant ::Fixnum is deprecated$}, "" err.strip! - expect(err).to lack_errors + expect(err).to be_empty expect(exitstatus).to be_zero if exitstatus end diff --git a/spec/runtime/require_spec.rb b/spec/runtime/require_spec.rb index 3eccd60fba..38c25f1e82 100644 --- a/spec/runtime/require_spec.rb +++ b/spec/runtime/require_spec.rb @@ -198,7 +198,7 @@ RSpec.describe "Bundler.require" do RUBY ruby(cmd) - expect(err).to lack_errors + expect(err).to be_empty end it "does not mangle explicitly given requires" do @@ -432,7 +432,7 @@ RSpec.describe "Bundler.require with platform specific dependencies" do G run "Bundler.require" - expect(err).to lack_errors + expect(err).to be_empty end it "requires gems pinned to multiple platforms, including the current one" do @@ -447,6 +447,6 @@ RSpec.describe "Bundler.require with platform specific dependencies" do run "Bundler.require; puts RACK" expect(out).to eq("1.0.0") - expect(err).to lack_errors + expect(err).to be_empty end end diff --git a/spec/runtime/setup_spec.rb b/spec/runtime/setup_spec.rb index 8bd42882ad..e577b62b5c 100644 --- a/spec/runtime/setup_spec.rb +++ b/spec/runtime/setup_spec.rb @@ -16,7 +16,7 @@ RSpec.describe "Bundler.setup" do require 'rack' puts RACK RUBY - expect(err).to lack_errors + expect(err).to be_empty expect(out).to eq("1.0.0") end end @@ -42,7 +42,7 @@ RSpec.describe "Bundler.setup" do puts "WIN" end RUBY - expect(err).to lack_errors + expect(err).to be_empty expect(out).to eq("WIN") end @@ -55,7 +55,7 @@ RSpec.describe "Bundler.setup" do require 'rack' puts RACK RUBY - expect(err).to lack_errors + expect(err).to be_empty expect(out).to eq("1.0.0") end @@ -69,7 +69,7 @@ RSpec.describe "Bundler.setup" do require 'rack' puts RACK RUBY - expect(err).to lack_errors + expect(err).to be_empty expect(out).to eq("1.0.0") end @@ -87,7 +87,7 @@ RSpec.describe "Bundler.setup" do puts "FAIL" end RUBY - expect(err).to lack_errors + expect(err).to be_empty expect(out).to match("WIN") end @@ -361,7 +361,7 @@ RSpec.describe "Bundler.setup" do end R - expect(err).to lack_errors + expect(err).to be_empty end it "replaces #gem but raises when the version is wrong" do @@ -387,7 +387,7 @@ RSpec.describe "Bundler.setup" do end R - expect(err).to lack_errors + expect(err).to be_empty end end @@ -701,7 +701,7 @@ RSpec.describe "Bundler.setup" do end R - expect(err).to lack_errors + expect(err).to be_empty end end end @@ -764,7 +764,7 @@ end ENV["GEM_HOME"] = "" bundle %(exec ruby -e "require 'set'") - expect(err).to lack_errors + expect(err).to be_empty end describe "$MANPATH" do @@ -933,7 +933,7 @@ end require 'foo' R end - expect(err).to lack_errors + expect(err).to be_empty end it "should make sure the Bundler.root is really included in the path relative to the Gemfile" do @@ -958,7 +958,7 @@ end R end - expect(err).to lack_errors + expect(err).to be_empty end end @@ -1108,7 +1108,7 @@ end Bundler.load RUBY - expect(err).to lack_errors + expect(err).to be_empty expect(out).to eq("") end end @@ -1120,7 +1120,7 @@ end G bundle %(exec ruby -e "require 'bundler'; Bundler.setup") - expect(err).to lack_errors + expect(err).to be_empty end end diff --git a/spec/support/matchers.rb b/spec/support/matchers.rb index 8e17be3a02..c56aa56a00 100644 --- a/spec/support/matchers.rb +++ b/spec/support/matchers.rb @@ -62,13 +62,6 @@ module Spec MAJOR_DEPRECATION = /^\[DEPRECATED FOR 2\.0\]\s*/ - RSpec::Matchers.define :lack_errors do - diffable - match do |actual| - actual.gsub(/#{MAJOR_DEPRECATION}.+[\n]?/, "") == "" - end - end - RSpec::Matchers.define :eq_err do |expected| diffable match do |actual| diff --git a/spec/update/git_spec.rb b/spec/update/git_spec.rb index b4cbb79434..37621b3552 100644 --- a/spec/update/git_spec.rb +++ b/spec/update/git_spec.rb @@ -88,7 +88,7 @@ RSpec.describe "bundle update" do gem "foo", "1.0", :git => "#{lib_path("foo_two")}" G - expect(err).to lack_errors + expect(err).to be_empty expect(out).to include("Fetching #{lib_path}/foo_two") expect(out).to include("Bundle complete!") end |