Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
995b1a24
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,发现更多精彩内容 >>
提交
995b1a24
编写于
6月 22, 2010
作者:
K
knapo
提交者:
José Valim
6月 23, 2010
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix controller_name for non default controller paths [#4901 state:resolved]
Signed-off-by:
N
José Valim
<
jose.valim@gmail.com
>
上级
ed5c096d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
39 addition
and
1 deletion
+39
-1
actionpack/lib/action_controller/metal.rb
actionpack/lib/action_controller/metal.rb
+1
-1
actionpack/test/controller/new_base/base_test.rb
actionpack/test/controller/new_base/base_test.rb
+38
-0
未找到文件。
actionpack/lib/action_controller/metal.rb
浏览文件 @
995b1a24
...
...
@@ -61,7 +61,7 @@ class Metal < AbstractController::Base
# ==== Returns
# String
def
self
.
controller_name
@controller_name
||=
controller_path
.
split
(
"/"
).
last
@controller_name
||=
self
.
name
.
demodulize
.
sub
(
/Controller$/
,
''
).
underscore
end
# Delegates to the class' #controller_name
...
...
actionpack/test/controller/new_base/base_test.rb
浏览文件 @
995b1a24
...
...
@@ -31,9 +31,17 @@ def authenticate
end
class
EmptyController
<
ActionController
::
Base
;
end
class
SubEmptyController
<
EmptyController
;
end
class
NonDefaultPathController
<
ActionController
::
Base
def
self
.
controller_path
;
"i_am_not_default"
;
end
end
module
Submodule
class
ContainedEmptyController
<
ActionController
::
Base
;
end
class
ContainedSubEmptyController
<
ContainedEmptyController
;
end
class
ContainedNonDefaultPathController
<
ActionController
::
Base
def
self
.
controller_path
;
"i_am_extremly_not_default"
;
end
end
end
class
BaseTest
<
Rack
::
TestCase
...
...
@@ -65,16 +73,46 @@ class BaseTest < Rack::TestCase
assert_equal
EmptyController
.
controller_path
,
EmptyController
.
new
.
controller_path
end
test
"non-default controller path"
do
assert_equal
'i_am_not_default'
,
NonDefaultPathController
.
controller_path
assert_equal
NonDefaultPathController
.
controller_path
,
NonDefaultPathController
.
new
.
controller_path
end
test
"sub controller path"
do
assert_equal
'dispatching/sub_empty'
,
SubEmptyController
.
controller_path
assert_equal
SubEmptyController
.
controller_path
,
SubEmptyController
.
new
.
controller_path
end
test
"namespaced controller path"
do
assert_equal
'dispatching/submodule/contained_empty'
,
Submodule
::
ContainedEmptyController
.
controller_path
assert_equal
Submodule
::
ContainedEmptyController
.
controller_path
,
Submodule
::
ContainedEmptyController
.
new
.
controller_path
end
test
"namespaced non-default controller path"
do
assert_equal
'i_am_extremly_not_default'
,
Submodule
::
ContainedNonDefaultPathController
.
controller_path
assert_equal
Submodule
::
ContainedNonDefaultPathController
.
controller_path
,
Submodule
::
ContainedNonDefaultPathController
.
new
.
controller_path
end
test
"namespaced sub controller path"
do
assert_equal
'dispatching/submodule/contained_sub_empty'
,
Submodule
::
ContainedSubEmptyController
.
controller_path
assert_equal
Submodule
::
ContainedSubEmptyController
.
controller_path
,
Submodule
::
ContainedSubEmptyController
.
new
.
controller_path
end
test
"controller name"
do
assert_equal
'empty'
,
EmptyController
.
controller_name
assert_equal
'contained_empty'
,
Submodule
::
ContainedEmptyController
.
controller_name
end
test
"non-default path controller name"
do
assert_equal
'non_default_path'
,
NonDefaultPathController
.
controller_name
assert_equal
'contained_non_default_path'
,
Submodule
::
ContainedNonDefaultPathController
.
controller_name
end
test
"sub controller name"
do
assert_equal
'sub_empty'
,
SubEmptyController
.
controller_name
assert_equal
'contained_sub_empty'
,
Submodule
::
ContainedSubEmptyController
.
controller_name
end
test
"action methods"
do
assert_equal
Set
.
new
(
%w(
index
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录