From 7ff5f60f13c470ca436c75f6102524b0cb6a5b2c Mon Sep 17 00:00:00 2001 From: Alex Ghiculescu Date: Mon, 15 Feb 2021 17:54:06 -0600 Subject: [PATCH] Fix branch for `rails new --edge` https://github.com/rails/rails/commit/077c66d5d6ef3a6f1cc54e4a431bfa5ea6831b97#r47159624 Update app_generator_test.rb fix --- railties/lib/rails/generators/app_base.rb | 2 +- railties/test/generators/app_generator_test.rb | 2 +- railties/test/generators/plugin_generator_test.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 74bae134791d6..11d20f45f9f53 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -301,7 +301,7 @@ def rails_gemfile_entry ] elsif options.edge? [ - GemfileEntry.github("rails", "rails/rails", "main") + GemfileEntry.github("rails", "rails/rails", "6-1-stable") ] elsif options.master? [ diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index bbd3e72e19a8f..30f95d59cb4f5 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -863,7 +863,7 @@ def test_edge_option generator([destination_root], edge: true, skip_webpack_install: true) assert_bundler_command_called("install") - assert_file "Gemfile", %r{^gem\s+["']rails["'],\s+github:\s+["']#{Regexp.escape("rails/rails")}["'],\s+branch:\s+["']main["']$} + assert_file "Gemfile", %r{^gem\s+["']rails["'],\s+github:\s+["']#{Regexp.escape("rails/rails")}["'],\s+branch:\s+["']#{Regexp.escape("6-1-stable")}["']$} end def test_master_option diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb index 0e996a7d5ca69..5bf5f5c34a0cb 100644 --- a/railties/test/generators/plugin_generator_test.rb +++ b/railties/test/generators/plugin_generator_test.rb @@ -216,7 +216,7 @@ def test_dev_option def test_edge_option assert_generates_without_bundler(edge: true) - assert_file "Gemfile", %r{^gem\s+["']rails["'],\s+github:\s+["']#{Regexp.escape("rails/rails")}["'],\s+branch:\s+["']main["']$} + assert_file "Gemfile", %r{^gem\s+["']rails["'],\s+github:\s+["']#{Regexp.escape("rails/rails")}["'],\s+branch:\s+["']#{Regexp.escape("6-1-stable")}["']$} end def test_generation_does_not_run_bundle_install_with_full_and_mountable