mirror of
				https://github.com/ruby/ruby.git
				synced 2022-11-09 12:17:21 -05:00 
			
		
		
		
	Update bundled bundler to 1.16.0.
* lib/bundler, spec/bundler: Merge bundler-1.16.0. * common.mk: rspec examples of bundler-1.16.0 needs require option. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60603 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
		
							parent
							
								
									ae49dbd392
								
							
						
					
					
						commit
						be7b592912
					
				
					 1025 changed files with 13902 additions and 3180 deletions
				
			
		|  | @ -1,7 +1,6 @@ | |||
| # frozen_string_literal: true | ||||
| require "spec_helper" | ||||
| 
 | ||||
| RSpec.describe "bundle inject" do | ||||
| RSpec.describe "bundle inject", :bundler => "< 2" do | ||||
|   before :each do | ||||
|     gemfile <<-G | ||||
|       source "file://#{gem_repo1}" | ||||
|  | @ -80,7 +79,11 @@ Usage: "bundle inject GEM VERSION" | |||
|   context "when frozen" do | ||||
|     before do | ||||
|       bundle "install" | ||||
|       bundle "config --local frozen 1" | ||||
|       if Bundler.feature_flag.bundler_2_mode? | ||||
|         bundle! "config --local deployment true" | ||||
|       else | ||||
|         bundle! "config --local frozen true" | ||||
|       end | ||||
|     end | ||||
| 
 | ||||
|     it "injects anyway" do | ||||
|  | @ -97,7 +100,7 @@ Usage: "bundle inject GEM VERSION" | |||
|     it "restores frozen afterwards" do | ||||
|       bundle "inject 'rack-obama' '> 0'" | ||||
|       config = YAML.load(bundled_app(".bundle/config").read) | ||||
|       expect(config["BUNDLE_FROZEN"]).to eq("1") | ||||
|       expect(config["BUNDLE_DEPLOYMENT"] || config["BUNDLE_FROZEN"]).to eq("true") | ||||
|     end | ||||
| 
 | ||||
|     it "doesn't allow Gemfile changes" do | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 hsbt
						hsbt