mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #33587 from bogdanvlviv/follow-up-33202 

`bundle binstubs bundler` should be executed after `bundle install`
This commit is contained in:
Kasper Timm Hansen 2018-08-11 21:14:54 +02:00 committed by GitHub
parent 76b3c18558 2c667814c8
commit 317efa5c35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
railties/lib/rails/generators/rails/app/app_generator.rb
View File

@ -298,8 +298,6 @@ module Rails
build(:bin)
end
public_task :generate_bundler_binstub
def update_bin_files
build(:bin_when_updating)
end
@ -471,7 +469,8 @@ module Rails
end
public_task :apply_rails_template, :run_bundle
public_task :run_webpack, :generate_spring_binstubs
public_task :generate_bundler_binstub, :generate_spring_binstubs
public_task :run_webpack
def run_after_bundle_callbacks
@after_bundle_callbacks.each(&:call)

2
railties/test/generators/app_generator_test.rb
View File

@ -972,7 +972,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
template
end
sequence = ["git init", "binstubs bundler", "install", "exec spring binstub --all", "echo ran after_bundle"]
sequence = ["git init", "install", "binstubs bundler", "exec spring binstub --all", "echo ran after_bundle"]
@sequence_step ||= 0
ensure_bundler_first = -> command, options = nil do
assert_equal sequence[@sequence_step], command, "commands should be called in sequence #{sequence}"