diff options
author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-04 01:14:48 +0000 |
---|---|---|
committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-04 01:14:48 +0000 |
commit | 2fbbbba5bd684edfd62beb106b48ac93919eb128 (patch) | |
tree | e535fdc50a2c7112a76d1c430fc8d080ce491369 /spec/bundler/update | |
parent | 3e063ca7ae85d97f24c6b2933d02f80daffd7e7b (diff) | |
download | ruby-2fbbbba5bd684edfd62beb106b48ac93919eb128.tar.gz |
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
Diffstat (limited to 'spec/bundler/update')
-rw-r--r-- | spec/bundler/update/git_spec.rb | 4 | ||||
-rw-r--r-- | spec/bundler/update/redownload_spec.rb | 2 |
2 files changed, 3 insertions, 3 deletions
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}" |