ruby-changes:69711
From: David <ko1@a...>
Date: Fri, 12 Nov 2021 06:05:22 +0900 (JST)
Subject: [ruby-changes:69711] 1f91009d24 (master): [rubygems/rubygems] Remove `have_lockfile` matcher too
https://git.ruby-lang.org/ruby.git/commit/?id=1f91009d24 From 1f91009d2409e65bb293006eba9a1d90247101cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...> Date: Thu, 11 Nov 2021 20:26:21 +0100 Subject: [rubygems/rubygems] Remove `have_lockfile` matcher too https://github.com/rubygems/rubygems/commit/635f3f2605 --- spec/bundler/install/gemfile/path_spec.rb | 4 ++-- spec/bundler/support/matchers.rb | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/spec/bundler/install/gemfile/path_spec.rb b/spec/bundler/install/gemfile/path_spec.rb index 539fe242851..4143b04c2aa 100644 --- a/spec/bundler/install/gemfile/path_spec.rb +++ b/spec/bundler/install/gemfile/path_spec.rb @@ -127,9 +127,9 @@ RSpec.describe "bundle install with explicit source paths" do https://github.com/ruby/ruby/blob/trunk/spec/bundler/install/gemfile/path_spec.rb#L127 L bundle :install, :dir => lib_path("demo") - expect(lib_path("demo/Gemfile.lock")).to have_lockfile(lockfile) + expect(lib_path("demo/Gemfile.lock")).to read_as(lockfile) bundle :update, :all => true, :dir => lib_path("demo") - expect(lib_path("demo/Gemfile.lock")).to have_lockfile(lockfile) + expect(lib_path("demo/Gemfile.lock")).to read_as(lockfile) end it "expands paths when comparing locked paths to Gemfile paths" do diff --git a/spec/bundler/support/matchers.rb b/spec/bundler/support/matchers.rb index f648321383a..8b16b4e5b52 100644 --- a/spec/bundler/support/matchers.rb +++ b/spec/bundler/support/matchers.rb @@ -208,10 +208,6 @@ module Spec https://github.com/ruby/ruby/blob/trunk/spec/bundler/support/matchers.rb#L208 RSpec::Matchers.define_negated_matcher :not_include_gems, :include_gems RSpec::Matchers.alias_matcher :include_gem, :include_gems - def have_lockfile(expected) - read_as(strip_whitespace(expected)) - end - def plugin_should_be_installed(*names) names.each do |name| expect(Bundler::Plugin).to be_installed(name) -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/