Skip to content

R
rails

张重言 / rails

通知 1
Star 0
Fork 0
R
rails

体验新版 GitCode，发现更多精彩内容 >>

提交 df4ed0cc 编写于 作者: R Rafael França 提交者： Rafael Mendonça França
浏览文件
操作

Merge pull request #32089 from bogdanvlviv/fix-plugin-generated-files 

Fix plugin generated files
上级 b2f0a894
显示空白变更内容
内联 并排
Showing with 17 addition and 3 deletion
railties/lib/rails/generators/rails/plugin/templates/app/views/layouts/%namespaced_name%/application.html.erb.tt
浏览文件 @ df4ed0cc
...@@ -2,9 +2,13 @@ ...@@ -2,9 +2,13 @@
<html> <html>
<head> <head>
<title><%= humanized %></title> <title><%= humanized %></title>
<%%= csrf_meta_tags %>
<%%= csp_meta_tag %>
<%%= stylesheet_link_tag "<%= namespaced_name %>/application", media: "all" %> <%%= stylesheet_link_tag "<%= namespaced_name %>/application", media: "all" %>
<%- unless options[:skip_javascript] -%>
<%%= javascript_include_tag "<%= namespaced_name %>/application" %> <%%= javascript_include_tag "<%= namespaced_name %>/application" %>
<%%= csrf_meta_tags %> <%- end -%>
</head> </head>
<body> <body>
......
railties/lib/rails/generators/rails/plugin/templates/bin/rails.tt
浏览文件 @ df4ed0cc
...@@ -19,10 +19,10 @@ require "rails" ...@@ -19,10 +19,10 @@ require "rails"
require "active_model/railtie" require "active_model/railtie"
require "active_job/railtie" require "active_job/railtie"
<%= comment_if :skip_active_record %>require "active_record/railtie" <%= comment_if :skip_active_record %>require "active_record/railtie"
<%= comment_if :skip_active_storage %>require "active_storage/engine"
require "action_controller/railtie" require "action_controller/railtie"
<%= comment_if :skip_action_mailer %>require "action_mailer/railtie" <%= comment_if :skip_action_mailer %>require "action_mailer/railtie"
require "action_view/railtie" require "action_view/railtie"
require "active_storage/engine"
<%= comment_if :skip_action_cable %>require "action_cable/engine" <%= comment_if :skip_action_cable %>require "action_cable/engine"
<%= comment_if :skip_sprockets %>require "sprockets/railtie" <%= comment_if :skip_sprockets %>require "sprockets/railtie"
<%= comment_if :skip_test %>require "rails/test_unit/railtie" <%= comment_if :skip_test %>require "rails/test_unit/railtie"
......
railties/test/generators/plugin_generator_test.rb
浏览文件 @ df4ed0cc
...@@ -82,11 +82,12 @@ def test_generating_without_options ...@@ -82,11 +82,12 @@ def test_generating_without_options
end end
def test_generating_in_full_mode_with_almost_of_all_skip_options def test_generating_in_full_mode_with_almost_of_all_skip_options
run_generator [destination_root, "--full", "-M", "-O", "-C", "-S", "-T"] run_generator [destination_root, "--full", "-M", "-O", "-C", "-S", "-T", "--skip-active-storage"]
assert_file "bin/rails" do |content| assert_file "bin/rails" do |content|
assert_no_match(/\s+require\s+["']rails\/all["']/, content) assert_no_match(/\s+require\s+["']rails\/all["']/, content)
end end
assert_file "bin/rails", /#\s+require\s+["']active_record\/railtie["']/ assert_file "bin/rails", /#\s+require\s+["']active_record\/railtie["']/
assert_file "bin/rails", /#\s+require\s+["']active_storage\/engine["']/
assert_file "bin/rails", /#\s+require\s+["']action_mailer\/railtie["']/ assert_file "bin/rails", /#\s+require\s+["']action_mailer\/railtie["']/
assert_file "bin/rails", /#\s+require\s+["']action_cable\/engine["']/ assert_file "bin/rails", /#\s+require\s+["']action_cable\/engine["']/
assert_file "bin/rails", /#\s+require\s+["']sprockets\/railtie["']/ assert_file "bin/rails", /#\s+require\s+["']sprockets\/railtie["']/
...@@ -217,11 +218,17 @@ def test_skipping_javascripts_without_mountable_option ...@@ -217,11 +218,17 @@ def test_skipping_javascripts_without_mountable_option
def test_javascripts_generation def test_javascripts_generation
run_generator [destination_root, "--mountable"] run_generator [destination_root, "--mountable"]
assert_file "app/assets/javascripts/bukkits/application.js" assert_file "app/assets/javascripts/bukkits/application.js"
assert_file "app/views/layouts/bukkits/application.html.erb" do |content|
assert_match "javascript_include_tag", content
end
end end
def test_skip_javascripts def test_skip_javascripts
run_generator [destination_root, "--skip-javascript", "--mountable"] run_generator [destination_root, "--skip-javascript", "--mountable"]
assert_no_file "app/assets/javascripts/bukkits/application.js" assert_no_file "app/assets/javascripts/bukkits/application.js"
assert_file "app/views/layouts/bukkits/application.html.erb" do |content|
assert_no_match "javascript_include_tag", content
end
end end
def test_template_from_dir_pwd def test_template_from_dir_pwd
...@@ -320,8 +327,11 @@ def test_create_mountable_application_with_mountable_option ...@@ -320,8 +327,11 @@ def test_create_mountable_application_with_mountable_option
assert_file "app/helpers/bukkits/application_helper.rb", /module Bukkits\n module ApplicationHelper/ assert_file "app/helpers/bukkits/application_helper.rb", /module Bukkits\n module ApplicationHelper/
assert_file "app/views/layouts/bukkits/application.html.erb" do |contents| assert_file "app/views/layouts/bukkits/application.html.erb" do |contents|
assert_match "<title>Bukkits</title>", contents assert_match "<title>Bukkits</title>", contents
assert_match "<%= csrf_meta_tags %>", contents
assert_match "<%= csp_meta_tag %>", contents
assert_match(/stylesheet_link_tag\s+['"]bukkits\/application['"]/, contents) assert_match(/stylesheet_link_tag\s+['"]bukkits\/application['"]/, contents)
assert_match(/javascript_include_tag\s+['"]bukkits\/application['"]/, contents) assert_match(/javascript_include_tag\s+['"]bukkits\/application['"]/, contents)
assert_match "<%= yield %>", contents
end end
assert_file "test/test_helper.rb" do |content| assert_file "test/test_helper.rb" do |content|
assert_match(/ActiveRecord::Migrator\.migrations_paths.+\.\.\/test\/dummy\/db\/migrate/, content) assert_match(/ActiveRecord::Migrator\.migrations_paths.+\.\.\/test\/dummy\/db\/migrate/, content)
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或