Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
e6cfd853
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,发现更多精彩内容 >>
提交
e6cfd853
编写于
11月 23, 2011
作者:
J
José Valim
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3739 from lest/config-always-write-cookie
configuration option to always write cookie
上级
40b19e06
98a1717e
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
56 addition
and
4 deletion
+56
-4
actionpack/lib/action_dispatch/middleware/cookies.rb
actionpack/lib/action_dispatch/middleware/cookies.rb
+4
-1
actionpack/lib/action_dispatch/railtie.rb
actionpack/lib/action_dispatch/railtie.rb
+3
-1
actionpack/test/dispatch/cookies_test.rb
actionpack/test/dispatch/cookies_test.rb
+2
-2
railties/test/application/middleware/cookies_test.rb
railties/test/application/middleware/cookies_test.rb
+47
-0
未找到文件。
actionpack/lib/action_dispatch/middleware/cookies.rb
浏览文件 @
e6cfd853
...
...
@@ -243,10 +243,13 @@ def recycle! #:nodoc:
@delete_cookies
.
clear
end
mattr_accessor
:always_write_cookie
self
.
always_write_cookie
=
false
private
def
write_cookie?
(
cookie
)
@secure
||
!
cookie
[
:secure
]
||
defined?
(
Rails
.
env
)
&&
Rails
.
env
.
development?
@secure
||
!
cookie
[
:secure
]
||
always_write_cookie
end
end
...
...
actionpack/lib/action_dispatch/railtie.rb
浏览文件 @
e6cfd853
...
...
@@ -10,10 +10,12 @@ class Railtie < Rails::Railtie
config
.
action_dispatch
.
tld_length
=
1
config
.
action_dispatch
.
ignore_accept_header
=
false
config
.
action_dispatch
.
rack_cache
=
{
:metastore
=>
"rails:/"
,
:entitystore
=>
"rails:/"
,
:verbose
=>
true
}
initializer
"action_dispatch.configure"
do
|
app
|
ActionDispatch
::
Http
::
URL
.
tld_length
=
app
.
config
.
action_dispatch
.
tld_length
ActionDispatch
::
Request
.
ignore_accept_header
=
app
.
config
.
action_dispatch
.
ignore_accept_header
config
.
action_dispatch
.
always_write_cookie
=
Rails
.
env
.
development?
if
config
.
action_dispatch
.
always_write_cookie
.
nil?
ActionDispatch
::
Cookies
::
CookieJar
.
always_write_cookie
=
config
.
action_dispatch
.
always_write_cookie
end
end
end
actionpack/test/dispatch/cookies_test.rb
浏览文件 @
e6cfd853
...
...
@@ -210,8 +210,8 @@ def test_setting_cookie_with_secure
assert_equal
({
"user_name"
=>
"david"
},
@response
.
cookies
)
end
def
test_setting_cookie_with_secure_
in_development
Rails
.
env
.
stubs
(
:development?
).
returns
(
true
)
def
test_setting_cookie_with_secure_
when_always_write_cookie_is_true
ActionDispatch
::
Cookies
::
CookieJar
.
any_instance
.
stubs
(
:always_write_cookie
).
returns
(
true
)
get
:authenticate_with_secure
assert_cookie_header
"user_name=david; path=/; secure"
assert_equal
({
"user_name"
=>
"david"
},
@response
.
cookies
)
...
...
railties/test/application/middleware/cookies_test.rb
0 → 100644
浏览文件 @
e6cfd853
require
'isolation/abstract_unit'
module
ApplicationTests
class
CookiesTest
<
Test
::
Unit
::
TestCase
include
ActiveSupport
::
Testing
::
Isolation
def
new_app
File
.
expand_path
(
"
#{
app_path
}
/../new_app"
)
end
def
setup
build_app
boot_rails
FileUtils
.
rm_rf
(
"
#{
app_path
}
/config/environments"
)
end
def
teardown
teardown_app
FileUtils
.
rm_rf
(
new_app
)
if
File
.
directory?
(
new_app
)
end
test
'always_write_cookie is true by default in development'
do
require
'rails'
Rails
.
env
=
'development'
require
"
#{
app_path
}
/config/environment"
assert_equal
true
,
ActionDispatch
::
Cookies
::
CookieJar
.
always_write_cookie
end
test
'always_write_cookie is false by default in production'
do
require
'rails'
Rails
.
env
=
'production'
require
"
#{
app_path
}
/config/environment"
assert_equal
false
,
ActionDispatch
::
Cookies
::
CookieJar
.
always_write_cookie
end
test
'always_write_cookie can be overrided'
do
add_to_config
<<-
RUBY
config.action_dispatch.always_write_cookie = false
RUBY
require
'rails'
Rails
.
env
=
'development'
require
"
#{
app_path
}
/config/environment"
assert_equal
false
,
ActionDispatch
::
Cookies
::
CookieJar
.
always_write_cookie
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录