aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/generators/app_generator_test.rb
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-02-23 23:55:56 -0300
committerRafael França <rafaelmfranca@gmail.com>2016-02-23 23:55:56 -0300
commit8b794c9f1fc4b2f6641e4ced08d1741a4ba129e1 (patch)
tree248ebe8be74f25f1a9c18d1a4bdb1912ae923903 /railties/test/generators/app_generator_test.rb
parentea6a21d1eed3d5ed80d3abf268dc3477cf4c8cdf (diff)
parent2f792616ab01754f432d8642de12faee6aff3535 (diff)
downloadrails-8b794c9f1fc4b2f6641e4ced08d1741a4ba129e1.tar.gz
rails-8b794c9f1fc4b2f6641e4ced08d1741a4ba129e1.tar.bz2
rails-8b794c9f1fc4b2f6641e4ced08d1741a4ba129e1.zip
Merge pull request #23836 from sstephenson/turbolinks-5
Turbolinks 5 compatibility changes
Diffstat (limited to 'railties/test/generators/app_generator_test.rb')
-rw-r--r--railties/test/generators/app_generator_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 921a5b36b5..c2c3638f07 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -64,8 +64,8 @@ class AppGeneratorTest < Rails::Generators::TestCase
def test_assets
run_generator
- assert_file("app/views/layouts/application.html.erb", /stylesheet_link_tag\s+'application', media: 'all', 'data-turbolinks-track' => true/)
- assert_file("app/views/layouts/application.html.erb", /javascript_include_tag\s+'application', 'data-turbolinks-track' => true/)
+ assert_file("app/views/layouts/application.html.erb", /stylesheet_link_tag\s+'application', media: 'all', 'data-turbolinks-track' => 'reload'/)
+ assert_file("app/views/layouts/application.html.erb", /javascript_include_tag\s+'application', 'data-turbolinks-track' => 'reload'/)
assert_file("app/assets/stylesheets/application.css")
assert_file("app/assets/javascripts/application.js")
end