Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
523f9809
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,发现更多精彩内容 >>
提交
523f9809
编写于
9月 28, 2010
作者:
E
Emilio Tagua
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove more warnings on AP.
上级
ad2c2108
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
5 addition
and
4 deletion
+5
-4
actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
.../lib/action_dispatch/middleware/session/abstract_store.rb
+2
-2
actionpack/lib/action_dispatch/testing/assertions/selector.rb
...onpack/lib/action_dispatch/testing/assertions/selector.rb
+2
-1
actionpack/test/controller/filters_test.rb
actionpack/test/controller/filters_test.rb
+1
-1
未找到文件。
actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
浏览文件 @
523f9809
...
...
@@ -102,8 +102,8 @@ def loaded?
def
destroy
clear
@by
.
send
(
:destroy
,
@env
)
if
@by
@env
[
ENV_SESSION_OPTIONS_KEY
][
:id
]
=
nil
if
@env
&&
@env
[
ENV_SESSION_OPTIONS_KEY
]
@by
.
send
(
:destroy
,
@env
)
if
defined?
(
@by
)
&&
@by
@env
[
ENV_SESSION_OPTIONS_KEY
][
:id
]
=
nil
if
defined?
(
@env
)
&&
@env
&&
@env
[
ENV_SESSION_OPTIONS_KEY
]
@loaded
=
false
end
...
...
actionpack/lib/action_dispatch/testing/assertions/selector.rb
浏览文件 @
523f9809
...
...
@@ -67,7 +67,7 @@ def css_select(*args)
arg
=
args
.
shift
elsif
arg
==
nil
raise
ArgumentError
,
"First argument is either selector or element to select, but nil found. Perhaps you called assert_select with an element that does not exist?"
elsif
@selected
elsif
defined?
(
@selected
)
&&
@selected
matches
=
[]
@selected
.
each
do
|
selected
|
...
...
@@ -443,6 +443,7 @@ def assert_select_rjs(*args, &block)
assert_block
(
""
)
{
true
}
# to count the assertion
if
block_given?
&&
!
([
:remove
,
:show
,
:hide
,
:toggle
].
include?
rjs_type
)
begin
@selected
||=
nil
in_scope
,
@selected
=
@selected
,
matches
yield
matches
ensure
...
...
actionpack/test/controller/filters_test.rb
浏览文件 @
523f9809
...
...
@@ -669,7 +669,7 @@ def test_conditional_skipping_of_filters
assert_equal
%w( ensure_login find_user )
,
assigns
[
"ran_filter"
]
test_process
(
ConditionalSkippingController
,
"login"
)
assert
_nil
@controller
.
instance_variable_get
(
"@ran_after_filter"
)
assert
!
@controller
.
instance_variable_defined?
(
"@ran_after_filter"
)
test_process
(
ConditionalSkippingController
,
"change_password"
)
assert_equal
%w( clean_up )
,
@controller
.
instance_variable_get
(
"@ran_after_filter"
)
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录