diff --git a/bundler/spec/plugins/install_spec.rb b/bundler/spec/plugins/install_spec.rb index 047c92098c45..01707d20c71b 100644 --- a/bundler/spec/plugins/install_spec.rb +++ b/bundler/spec/plugins/install_spec.rb @@ -251,7 +251,7 @@ def exec(command, args) expect(out).to include("Bundle complete!") expect(the_bundle).to include_gems("rack 1.0.0") - plugin_should_be_installed("foo", version: "1.4.0") + plugin_should_be_installed_with_version("foo", "1.4.0") gemfile <<-G source '#{file_uri_for(gem_repo2)}' @@ -265,7 +265,7 @@ def exec(command, args) expect(out).to include("Bundle complete!") expect(the_bundle).to include_gems("rack 1.0.0") - plugin_should_be_installed("foo", version: "1.5.0") + plugin_should_be_installed_with_version("foo", "1.5.0") end it "downgrade plugins version listed in gemfile" do @@ -287,7 +287,7 @@ def exec(command, args) expect(out).to include("Bundle complete!") expect(the_bundle).to include_gems("rack 1.0.0") - plugin_should_be_installed("foo", version: "1.5.0") + plugin_should_be_installed_with_version("foo", "1.5.0") gemfile <<-G source '#{file_uri_for(gem_repo2)}' @@ -301,7 +301,7 @@ def exec(command, args) expect(out).to include("Bundle complete!") expect(the_bundle).to include_gems("rack 1.0.0") - plugin_should_be_installed("foo", version: "1.4.0") + plugin_should_be_installed_with_version("foo", "1.4.0") end it "install only plugins not installed yet listed in gemfile" do diff --git a/bundler/spec/support/matchers.rb b/bundler/spec/support/matchers.rb index e7e2c1d38b21..c2d2abd5321f 100644 --- a/bundler/spec/support/matchers.rb +++ b/bundler/spec/support/matchers.rb @@ -220,16 +220,22 @@ def indent(string, padding = 4, indent_character = " ") RSpec::Matchers.define_negated_matcher :not_include_gems, :include_gems RSpec::Matchers.alias_matcher :include_gem, :include_gems - def plugin_should_be_installed(*names, version: nil) + def plugin_should_be_installed(*names) names.each do |name| expect(Bundler::Plugin).to be_installed(name) path = Pathname.new(Bundler::Plugin.installed?(name)) - - expect(File.basename(path)).to eq("#{name}-#{version}") unless version.nil? expect(path + "plugins.rb").to exist end end + def plugin_should_be_installed_with_version(name, version) + expect(Bundler::Plugin).to be_installed(name) + path = Pathname.new(Bundler::Plugin.installed?(name)) + + expect(File.basename(path)).to eq("#{name}-#{version}") + expect(path + "plugins.rb").to exist + end + def plugin_should_not_be_installed(*names) names.each do |name| expect(Bundler::Plugin).not_to be_installed(name)