diff options
author | Matthew Draper <matthew@trebex.net> | 2015-04-12 04:38:40 +0930 |
---|---|---|
committer | Matthew Draper <matthew@trebex.net> | 2015-04-12 04:38:40 +0930 |
commit | cab53734e8c30f36310224f9a87a02e0c4e98dbe (patch) | |
tree | 7e0968c9a3ec2132d5901dcb05cf8f6a2685acf7 /railties/test | |
parent | 24970a69cbfa91e3e9322c88e620663a84035bda (diff) | |
parent | 4521aadae00b3c39fb46124e7c76e6527d3f3273 (diff) | |
download | rails-cab53734e8c30f36310224f9a87a02e0c4e98dbe.tar.gz rails-cab53734e8c30f36310224f9a87a02e0c4e98dbe.tar.bz2 rails-cab53734e8c30f36310224f9a87a02e0c4e98dbe.zip |
Merge pull request #19731 from wazery/rename_bin_to_exe
Rename railties/bin to railties/exe to match the new Bundler convention
Diffstat (limited to 'railties/test')
-rw-r--r-- | railties/test/isolation/abstract_unit.rb | 2 | ||||
-rw-r--r-- | railties/test/railties/generators_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb index 63209559d7..4509797da1 100644 --- a/railties/test/isolation/abstract_unit.rb +++ b/railties/test/isolation/abstract_unit.rb @@ -322,7 +322,7 @@ Module.new do environment = File.expand_path('../../../../load_paths', __FILE__) require_environment = "-r #{environment}" - `#{Gem.ruby} #{require_environment} #{RAILS_FRAMEWORK_ROOT}/railties/bin/rails new #{app_template_path} --skip-gemfile --no-rc` + `#{Gem.ruby} #{require_environment} #{RAILS_FRAMEWORK_ROOT}/railties/exe/rails new #{app_template_path} --skip-gemfile --no-rc` File.open("#{app_template_path}/config/boot.rb", 'w') do |f| f.puts "require '#{environment}'" f.puts "require 'rails/all'" diff --git a/railties/test/railties/generators_test.rb b/railties/test/railties/generators_test.rb index 7348d70c56..423ece277e 100644 --- a/railties/test/railties/generators_test.rb +++ b/railties/test/railties/generators_test.rb @@ -30,7 +30,7 @@ module RailtiesTests if File.exist?("#{environment}.rb") require_environment = "-r #{environment}" end - `#{Gem.ruby} #{require_environment} #{RAILS_FRAMEWORK_ROOT}/railties/bin/rails #{cmd}` + `#{Gem.ruby} #{require_environment} #{RAILS_FRAMEWORK_ROOT}/railties/exe/rails #{cmd}` end def build_engine(is_mountable=false) |