Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
9b5c2903
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,发现更多精彩内容 >>
提交
9b5c2903
编写于
5月 06, 2011
作者:
A
Aditya Sanghi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
default orm and test_framework to false; change application.rb template accordingly
上级
75e1e217
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
12 addition
and
12 deletion
+12
-12
railties/lib/rails/generators.rb
railties/lib/rails/generators.rb
+2
-2
railties/lib/rails/generators/rails/app/templates/config/application.rb
...ails/generators/rails/app/templates/config/application.rb
+3
-7
railties/test/generators/app_generator_test.rb
railties/test/generators/app_generator_test.rb
+7
-3
未找到文件。
railties/lib/rails/generators.rb
浏览文件 @
9b5c2903
...
@@ -52,13 +52,13 @@ module Generators
...
@@ -52,13 +52,13 @@ module Generators
:integration_tool
=>
nil
,
:integration_tool
=>
nil
,
:javascripts
=>
true
,
:javascripts
=>
true
,
:javascript_engine
=>
nil
,
:javascript_engine
=>
nil
,
:orm
=>
nil
,
:orm
=>
false
,
:performance_tool
=>
nil
,
:performance_tool
=>
nil
,
:resource_controller
=>
:controller
,
:resource_controller
=>
:controller
,
:scaffold_controller
=>
:scaffold_controller
,
:scaffold_controller
=>
:scaffold_controller
,
:stylesheets
=>
true
,
:stylesheets
=>
true
,
:stylesheet_engine
=>
nil
,
:stylesheet_engine
=>
nil
,
:test_framework
=>
nil
,
:test_framework
=>
false
,
:template_engine
=>
:erb
:template_engine
=>
:erb
},
},
...
...
railties/lib/rails/generators/rails/app/templates/config/application.rb
浏览文件 @
9b5c2903
require
File
.
expand_path
(
'../boot'
,
__FILE__
)
require
File
.
expand_path
(
'../boot'
,
__FILE__
)
<
%
unless
options
[
:skip_active_record
]
-
%>
<
%
if
!
options
[
:skip_active_record
]
&&
!
options
[
:skip_test_unit
]
-
%>
require 'rails/all'
require 'rails/all'
<% else -%>
<% else -%>
# Pick the frameworks you want:
# Pick the frameworks you want:
#
require "active_record/railtie"
<
%= options[:skip_active_record] ? "#" : "" %>
require "active_record/railtie"
require "action_controller/railtie"
require "action_controller/railtie"
require "action_mailer/railtie"
require "action_mailer/railtie"
require "active_resource/railtie"
require "active_resource/railtie"
require
"rails/test_unit/railtie"
<%=
options
[
:skip_test_unit
]
?
"#"
:
""
%>
require
"rails/test_unit/railtie"
<
% end
-
%>
<
% end
-
%>
# If you have a Gemfile, require the gems listed there, including any gems
# If you have a Gemfile, require the gems listed there, including any gems
...
@@ -50,10 +50,6 @@ class Application < Rails::Application
...
@@ -50,10 +50,6 @@ class Application < Rails::Application
# config.action_view.javascript_expansions[:defaults] = %w(prototype prototype_ujs)
# config.action_view.javascript_expansions[:defaults] = %w(prototype prototype_ujs)
<
% end
-
%>
<
% end
-
%>
<% if options[:skip_test_unit] -%>
config
.
generators
.
test_framework
=
false
<
% end
-
%>
# Configure the default encoding used in templates for Ruby 1.9.
# Configure the default encoding used in templates for Ruby 1.9.
config.encoding = "utf-8"
config.encoding = "utf-8"
...
...
railties/test/generators/app_generator_test.rb
浏览文件 @
9b5c2903
...
@@ -230,9 +230,13 @@ def test_file_is_added_for_backwards_compatibility
...
@@ -230,9 +230,13 @@ def test_file_is_added_for_backwards_compatibility
def
test_test_unit_is_removed_from_frameworks_if_skip_test_unit_is_given
def
test_test_unit_is_removed_from_frameworks_if_skip_test_unit_is_given
run_generator
[
destination_root
,
"--skip-test-unit"
]
run_generator
[
destination_root
,
"--skip-test-unit"
]
assert_file
"config/application.rb"
do
|
file
|
assert_file
"config/application.rb"
,
/#\s+require\s+["']rails\/test_unit\/railtie["']/
assert_match
/config.generators.test_framework = false/
,
file
end
end
def
test_no_active_record_or_test_unit_if_skips_given
run_generator
[
destination_root
,
"--skip-test-unit"
,
"--skip-active-record"
]
assert_file
"config/application.rb"
,
/#\s+require\s+["']rails\/test_unit\/railtie["']/
assert_file
"config/application.rb"
,
/#\s+require\s+["']active_record\/railtie["']/
end
end
def
test_new_hash_style
def
test_new_hash_style
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录