aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-09-14 11:26:37 -0300
committerGitHub <noreply@github.com>2016-09-14 11:26:37 -0300
commit71ce02d300e2e6eda0ca6344317bce4d7dcd47ee (patch)
tree4232804159729463451353fad89a6ff1f3f57152
parente54601568d1a25b8f913fcdc8967466856788b37 (diff)
parent9106318fdf1f4f23548fe03d5e1d5e4ebe35f45e (diff)
downloadrails-71ce02d300e2e6eda0ca6344317bce4d7dcd47ee.tar.gz
rails-71ce02d300e2e6eda0ca6344317bce4d7dcd47ee.tar.bz2
rails-71ce02d300e2e6eda0ca6344317bce4d7dcd47ee.zip
Merge pull request #26486 from y-yagi/fix_broken_test
fix broken generators test
-rw-r--r--railties/test/generators/plugin_generator_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb
index 0d8e6f8907..15079f2735 100644
--- a/railties/test/generators/plugin_generator_test.rb
+++ b/railties/test/generators/plugin_generator_test.rb
@@ -205,7 +205,7 @@ class PluginGeneratorTest < Rails::Generators::TestCase
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+["']#{Regexp.escape("5-0-stable")}["']$}
+ assert_file "Gemfile", %r{^gem\s+["']rails["'],\s+github:\s+["']#{Regexp.escape("rails/rails")}["']$}
end
def test_generation_does_not_run_bundle_install_with_full_and_mountable