Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
c51db4d7
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,发现更多精彩内容 >>
提交
c51db4d7
编写于
10月 13, 2008
作者:
G
gbuesing
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Enhance testing for fractional days and weeks. Update changelog.
上级
a6e5d29e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
19 addition
and
13 deletion
+19
-13
activesupport/CHANGELOG
activesupport/CHANGELOG
+2
-0
activesupport/test/core_ext/duration_test.rb
activesupport/test/core_ext/duration_test.rb
+9
-13
activesupport/test/core_ext/time_ext_test.rb
activesupport/test/core_ext/time_ext_test.rb
+8
-0
未找到文件。
activesupport/CHANGELOG
浏览文件 @
c51db4d7
*Edge*
* Time#advance recognizes fractional days and weeks. Deprecate Durations of fractional months and years #970 [Tom Lea]
* Add ActiveSupport::Rescuable module abstracting ActionController::Base rescue_from features. [Norbert Crombach, Pratik]
* Switch from String#chars to String#mb_chars for the unicode proxy. [Manfred Stienstra]
...
...
activesupport/test/core_ext/duration_test.rb
浏览文件 @
c51db4d7
...
...
@@ -30,21 +30,17 @@ def test_argument_error
end
end
uses_mocha
'TestDurationSinceAndAgoWithCurrentTime'
do
def
test_fractional_weeks
Time
.
stubs
(
:now
).
returns
Time
.
local
(
2000
)
assert_in_delta
((
24
*
7
*
1.5
).
hours
,
1.5
.
weeks
,
2
**
-
20
)
assert_in_delta
((
24
*
7
*
1.7
).
hours
,
1.7
.
weeks
,
2
**
-
20
)
end
def
test_fractional_days
Time
.
stubs
(
:now
).
returns
Time
.
local
(
2000
)
def
test_fractional_weeks
assert_equal
(
86400
*
7
)
*
1.5
,
1.5
.
weeks
assert_equal
(
86400
*
7
)
*
1.7
,
1.7
.
weeks
end
assert_in_delta
((
24
*
1.5
).
hours
,
1.5
.
days
,
2
**
-
20
)
assert_in_delta
((
24
*
1.7
).
hours
,
1.7
.
days
,
2
**
-
20
)
end
def
test_fractional_days
assert_equal
86400
*
1.5
,
1.5
.
days
assert_equal
86400
*
1.7
,
1.7
.
days
end
uses_mocha
'TestDurationSinceAndAgoWithCurrentTime'
do
def
test_since_and_ago_with_fractional_days
Time
.
stubs
(
:now
).
returns
Time
.
local
(
2000
)
# since
...
...
activesupport/test/core_ext/time_ext_test.rb
浏览文件 @
c51db4d7
...
...
@@ -381,7 +381,11 @@ def test_advance
assert_equal
Time
.
local
(
2006
,
2
,
28
,
15
,
15
,
10
),
Time
.
local
(
2005
,
2
,
28
,
15
,
15
,
10
).
advance
(
:years
=>
1
)
assert_equal
Time
.
local
(
2005
,
6
,
28
,
15
,
15
,
10
),
Time
.
local
(
2005
,
2
,
28
,
15
,
15
,
10
).
advance
(
:months
=>
4
)
assert_equal
Time
.
local
(
2005
,
3
,
21
,
15
,
15
,
10
),
Time
.
local
(
2005
,
2
,
28
,
15
,
15
,
10
).
advance
(
:weeks
=>
3
)
assert_equal
Time
.
local
(
2005
,
3
,
25
,
3
,
15
,
10
),
Time
.
local
(
2005
,
2
,
28
,
15
,
15
,
10
).
advance
(
:weeks
=>
3.5
)
assert_equal
Time
.
local
(
2005
,
3
,
26
,
12
,
51
,
10
),
Time
.
local
(
2005
,
2
,
28
,
15
,
15
,
10
).
advance
(
:weeks
=>
3.7
)
assert_equal
Time
.
local
(
2005
,
3
,
5
,
15
,
15
,
10
),
Time
.
local
(
2005
,
2
,
28
,
15
,
15
,
10
).
advance
(
:days
=>
5
)
assert_equal
Time
.
local
(
2005
,
3
,
6
,
3
,
15
,
10
),
Time
.
local
(
2005
,
2
,
28
,
15
,
15
,
10
).
advance
(
:days
=>
5.5
)
assert_equal
Time
.
local
(
2005
,
3
,
6
,
8
,
3
,
10
),
Time
.
local
(
2005
,
2
,
28
,
15
,
15
,
10
).
advance
(
:days
=>
5.7
)
assert_equal
Time
.
local
(
2012
,
9
,
28
,
15
,
15
,
10
),
Time
.
local
(
2005
,
2
,
28
,
15
,
15
,
10
).
advance
(
:years
=>
7
,
:months
=>
7
)
assert_equal
Time
.
local
(
2013
,
10
,
3
,
15
,
15
,
10
),
Time
.
local
(
2005
,
2
,
28
,
15
,
15
,
10
).
advance
(
:years
=>
7
,
:months
=>
19
,
:days
=>
5
)
assert_equal
Time
.
local
(
2013
,
10
,
17
,
15
,
15
,
10
),
Time
.
local
(
2005
,
2
,
28
,
15
,
15
,
10
).
advance
(
:years
=>
7
,
:months
=>
19
,
:weeks
=>
2
,
:days
=>
5
)
...
...
@@ -399,7 +403,11 @@ def test_utc_advance
assert_equal
Time
.
utc
(
2006
,
2
,
22
,
15
,
15
,
10
),
Time
.
utc
(
2005
,
2
,
22
,
15
,
15
,
10
).
advance
(
:years
=>
1
)
assert_equal
Time
.
utc
(
2005
,
6
,
22
,
15
,
15
,
10
),
Time
.
utc
(
2005
,
2
,
22
,
15
,
15
,
10
).
advance
(
:months
=>
4
)
assert_equal
Time
.
utc
(
2005
,
3
,
21
,
15
,
15
,
10
),
Time
.
utc
(
2005
,
2
,
28
,
15
,
15
,
10
).
advance
(
:weeks
=>
3
)
assert_equal
Time
.
utc
(
2005
,
3
,
25
,
3
,
15
,
10
),
Time
.
utc
(
2005
,
2
,
28
,
15
,
15
,
10
).
advance
(
:weeks
=>
3.5
)
assert_equal
Time
.
utc
(
2005
,
3
,
26
,
12
,
51
,
10
),
Time
.
utc
(
2005
,
2
,
28
,
15
,
15
,
10
).
advance
(
:weeks
=>
3.7
)
assert_equal
Time
.
utc
(
2005
,
3
,
5
,
15
,
15
,
10
),
Time
.
utc
(
2005
,
2
,
28
,
15
,
15
,
10
).
advance
(
:days
=>
5
)
assert_equal
Time
.
utc
(
2005
,
3
,
6
,
3
,
15
,
10
),
Time
.
utc
(
2005
,
2
,
28
,
15
,
15
,
10
).
advance
(
:days
=>
5.5
)
assert_equal
Time
.
utc
(
2005
,
3
,
6
,
8
,
3
,
10
),
Time
.
utc
(
2005
,
2
,
28
,
15
,
15
,
10
).
advance
(
:days
=>
5.7
)
assert_equal
Time
.
utc
(
2012
,
9
,
22
,
15
,
15
,
10
),
Time
.
utc
(
2005
,
2
,
22
,
15
,
15
,
10
).
advance
(
:years
=>
7
,
:months
=>
7
)
assert_equal
Time
.
utc
(
2013
,
10
,
3
,
15
,
15
,
10
),
Time
.
utc
(
2005
,
2
,
22
,
15
,
15
,
10
).
advance
(
:years
=>
7
,
:months
=>
19
,
:days
=>
11
)
assert_equal
Time
.
utc
(
2013
,
10
,
17
,
15
,
15
,
10
),
Time
.
utc
(
2005
,
2
,
28
,
15
,
15
,
10
).
advance
(
:years
=>
7
,
:months
=>
19
,
:weeks
=>
2
,
:days
=>
5
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录