Skip to content

Commit 82240d9

Browse files
jeroenvisser101kaspth
authored andcommitted
Use new hash syntax (rails#24464)
* Updated syntax * Updated tests to match syntax
1 parent 303456b commit 82240d9

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<%%= stylesheet_link_tag 'application', media: 'all' %>
99
<%- else -%>
1010
<%- if gemfile_entries.any? { |m| m.name == 'turbolinks' } -%>
11-
<%%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => 'reload' %>
12-
<%%= javascript_include_tag 'application', 'data-turbolinks-track' => 'reload' %>
11+
<%%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
12+
<%%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
1313
<%- else -%>
1414
<%%= stylesheet_link_tag 'application', media: 'all' %>
1515
<%%= javascript_include_tag 'application' %>

railties/test/generators/app_generator_test.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ def default_files
6565
def test_assets
6666
run_generator
6767

68-
assert_file("app/views/layouts/application.html.erb", /stylesheet_link_tag\s+'application', media: 'all', 'data-turbolinks-track' => 'reload'/)
69-
assert_file("app/views/layouts/application.html.erb", /javascript_include_tag\s+'application', 'data-turbolinks-track' => 'reload'/)
68+
assert_file("app/views/layouts/application.html.erb", /stylesheet_link_tag\s+'application', media: 'all', 'data-turbolinks-track': 'reload'/)
69+
assert_file("app/views/layouts/application.html.erb", /javascript_include_tag\s+'application', 'data-turbolinks-track': 'reload'/)
7070
assert_file("app/assets/stylesheets/application.css")
7171
assert_file("app/assets/javascripts/application.js")
7272
end

0 commit comments

Comments
 (0)