From 2fbbbba5bd684edfd62beb106b48ac93919eb128 Mon Sep 17 00:00:00 2001 From: hsbt Date: Sun, 4 Nov 2018 01:14:48 +0000 Subject: Merge upstream changes from 2-0-stable branch of bundler/bundler. * It update bundler 2 mode to bundler 3. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65523 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- spec/bundler/update/git_spec.rb | 4 ++-- spec/bundler/update/redownload_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'spec/bundler/update') diff --git a/spec/bundler/update/git_spec.rb b/spec/bundler/update/git_spec.rb index b4cbb79434..d97760e84b 100644 --- a/spec/bundler/update/git_spec.rb +++ b/spec/bundler/update/git_spec.rb @@ -299,7 +299,7 @@ RSpec.describe "bundle update" do G end - it "the --source flag updates version of gems that were originally pulled in by the source", :bundler => "< 2" do + it "the --source flag updates version of gems that were originally pulled in by the source", :bundler => "> 3" do spec_lines = lib_path("bar/foo.gemspec").read.split("\n") spec_lines[5] = "s.version = '2.0'" @@ -335,7 +335,7 @@ RSpec.describe "bundle update" do G end - it "the --source flag updates version of gems that were originally pulled in by the source", :bundler => "2" do + it "the --source flag updates version of gems that were originally pulled in by the source", :bundler => "3" do spec_lines = lib_path("bar/foo.gemspec").read.split("\n") spec_lines[5] = "s.version = '2.0'" diff --git a/spec/bundler/update/redownload_spec.rb b/spec/bundler/update/redownload_spec.rb index 018d3ed2e9..2138af510c 100644 --- a/spec/bundler/update/redownload_spec.rb +++ b/spec/bundler/update/redownload_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -RSpec.describe "bundle update", :bundler => "< 2", :ruby => ">= 2.0" do +RSpec.describe "bundle update", :bundler => "< 3", :ruby => ">= 2.0" do before :each do install_gemfile <<-G source "file://#{gem_repo1}" -- cgit v1.2.3