From 029351ecdb07461a08bf3e65491730a93497af57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Tue, 10 May 2016 02:34:26 -0300 Subject: [PATCH] Point to 5-0-stable branch in the edge generator --- railties/lib/rails/generators/app_base.rb | 8 +++----- railties/test/generators/shared_generator_tests.rb | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 151bf9a879162..8a5579e7c6d93 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -234,16 +234,14 @@ def version end def rails_gemfile_entry - dev_edge_common = [ - ] if options.dev? [ GemfileEntry.path('rails', Rails::Generators::RAILS_DEV_PATH) - ] + dev_edge_common + ] elsif options.edge? [ - GemfileEntry.github('rails', 'rails/rails') - ] + dev_edge_common + GemfileEntry.github('rails', 'rails/rails', '5-0-stable') + ] else [GemfileEntry.version('rails', rails_version_specifier, diff --git a/railties/test/generators/shared_generator_tests.rb b/railties/test/generators/shared_generator_tests.rb index e83d54890a342..1aec14d15921b 100644 --- a/railties/test/generators/shared_generator_tests.rb +++ b/railties/test/generators/shared_generator_tests.rb @@ -122,7 +122,7 @@ def test_dev_option def test_edge_option assert_generates_with_bundler edge: true - assert_file 'Gemfile', %r{^gem\s+["']rails["'],\s+github:\s+["']#{Regexp.escape("rails/rails")}["']$} + assert_file 'Gemfile', %r{^gem\s+["']rails["'],\s+github:\s+["']#{Regexp.escape("rails/rails")}["'],\s+branch:\s+["']#{Regexp.escape("5-0-stable")}["']$} end def test_skip_gemfile