Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
763d54b1
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,发现更多精彩内容 >>
提交
763d54b1
编写于
8月 08, 2014
作者:
S
Santiago Pastorino
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #16429 from arunagw/aa-build-fix-gemfile-spring
Fixes test for Gemfile entry changes
上级
c69e21d3
301b5fd5
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
13 addition
and
8 deletion
+13
-8
railties/lib/rails/generators/rails/app/templates/Gemfile
railties/lib/rails/generators/rails/app/templates/Gemfile
+1
-1
railties/lib/rails/generators/rails/plugin/templates/Gemfile
railties/lib/rails/generators/rails/plugin/templates/Gemfile
+1
-1
railties/test/generators/app_generator_test.rb
railties/test/generators/app_generator_test.rb
+11
-6
未找到文件。
railties/lib/rails/generators/rails/app/templates/Gemfile
浏览文件 @
763d54b1
...
...
@@ -29,7 +29,7 @@ group :development, :test do
<
%- else -%>
gem 'byebug'
<%- end -%>
# Access an IRB console on exceptions page and /console in development
gem
'web-console'
<
%- if spring_install? %>
...
...
railties/lib/rails/generators/rails/plugin/templates/Gemfile
浏览文件 @
763d54b1
...
...
@@ -31,7 +31,7 @@ end
<
% end
-
%>
<%= gem.commented_out ? '# ' : '' %>
gem
'<%= gem.name %>'
<
%= %(, '#{gem.version}') if gem.version -%>
<% if gem.options.any? -%>
,
<%=
gem
.
padding
(
max_width
)
%>
<
%= gem.options.map { |k,v|
,
<%=
gem
.
options
.
map
{
|
k
,
v
|
"
#{
k
}
:
#{
v
.
inspect
}
"
}.
join
(
', '
)
%>
<
% end
-
%>
<% end -%>
...
...
railties/test/generators/app_generator_test.rb
浏览文件 @
763d54b1
...
...
@@ -299,7 +299,7 @@ def test_inclusion_of_javascript_runtime
if
defined?
(
JRUBY_VERSION
)
assert_gem
"therubyrhino"
else
assert_file
"Gemfile"
,
/# gem
\s+["']therubyracer["']+, \s+platforms: :ruby$
/
assert_file
"Gemfile"
,
/# gem
'therubyracer', platforms: :ruby
/
end
end
...
...
@@ -340,7 +340,7 @@ def test_javascript_is_skipped_if_required
def
test_inclusion_of_jbuilder
run_generator
assert_
file
"Gemfile"
,
/gem 'jbuilder'/
assert_
gem
'jbuilder'
end
def
test_inclusion_of_a_debugger
...
...
@@ -351,9 +351,9 @@ def test_inclusion_of_a_debugger
assert_no_match
(
/debugger/
,
content
)
end
elsif
RUBY_VERSION
<
'2.0.0'
assert_
file
"Gemfile"
,
/# gem 'debugger'/
assert_
gem
'debugger'
else
assert_
file
"Gemfile"
,
/# gem 'byebug'/
assert_
gem
'byebug'
end
end
...
...
@@ -419,9 +419,14 @@ def test_application_name_with_spaces
assert_file
"foo bar/config/initializers/session_store.rb"
,
/key: '_foo_bar/
end
def
test_web_console
run_generator
assert_gem
'web-console'
end
def
test_spring
run_generator
assert_
file
"Gemfile"
,
/gem 'spring', \s+group: :development/
assert_
gem
'spring'
end
def
test_spring_binstubs
...
...
@@ -523,6 +528,6 @@ def action(*args, &block)
end
def
assert_gem
(
gem
)
assert_file
"Gemfile"
,
/^
gem\s+["']
#{
gem
}
["']$
/
assert_file
"Gemfile"
,
/^
\s*gem\s+["']
#{
gem
}
["']$*
/
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录