Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
e68183cc
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e68183cc
编写于
6月 28, 2013
作者:
N
Nikita Fedyashev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Omit turbolinks configuration completely on skip_javascript generator option
上级
569227b0
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
17 addition
and
3 deletion
+17
-3
railties/CHANGELOG.md
railties/CHANGELOG.md
+4
-0
railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
...s/app/templates/app/views/layouts/application.html.erb.tt
+5
-0
railties/test/generators/app_generator_test.rb
railties/test/generators/app_generator_test.rb
+8
-3
未找到文件。
railties/CHANGELOG.md
浏览文件 @
e68183cc
*
Omit turbolinks configuration completely on skip_javascript generator option.
*Nikita Fedyashev*
*
Removed deprecated rake tasks for running tests:
`rake test:uncommitted`
and
`rake test:recent`
.
...
...
railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
浏览文件 @
e68183cc
...
...
@@ -2,8 +2,13 @@
<html>
<head>
<title><
%=
camelized
%
></title>
<
%
-
if
options
[
:skip_javascript
]
-
%
>
<
%%=
stylesheet_link_tag
"
application
",
media:
"
all
"
%
>
<
%%=
javascript_include_tag
"
application
"
%
>
<
%
-
else
-
%
>
<
%%=
stylesheet_link_tag
"
application
",
media:
"
all
",
"
data-turbolinks-track
"
=
>
true %>
<
%%=
javascript_include_tag
"
application
",
"
data-turbolinks-track
"
=
>
true %>
<
%
-
end
-
%
>
<
%%=
csrf_meta_tags
%
>
</head>
<body>
...
...
railties/test/generators/app_generator_test.rb
浏览文件 @
e68183cc
...
...
@@ -53,9 +53,10 @@ def default_files
def
test_assets
run_generator
assert_file
"app/views/layouts/application.html.erb"
,
/stylesheet_link_tag\s+"application"/
assert_file
"app/views/layouts/application.html.erb"
,
/javascript_include_tag\s+"application"/
assert_file
"app/assets/stylesheets/application.css"
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/assets/stylesheets/application.css"
)
end
def
test_invalid_application_name_raises_an_error
...
...
@@ -295,6 +296,10 @@ def test_javascript_is_skipped_if_required
assert_file
"app/assets/javascripts/application.js"
do
|
contents
|
assert_no_match
%r{^//=
\s
+require
\s
}
,
contents
end
assert_file
"app/views/layouts/application.html.erb"
do
|
contents
|
assert_match
(
/stylesheet_link_tag\s+"application", media: "all" %>/
,
contents
)
assert_match
(
/javascript_include_tag\s+"application" \%>/
,
contents
)
end
assert_file
"Gemfile"
do
|
content
|
assert_match
(
/coffee-rails/
,
content
)
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录