Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
18a15693
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
18a15693
编写于
4月 06, 2018
作者:
M
Mayra Cabrera
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Handles default expires_at date directly into DeployToken model
上级
8c276580
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
17 addition
and
7 deletion
+17
-7
app/helpers/deploy_tokens_helper.rb
app/helpers/deploy_tokens_helper.rb
+2
-2
app/models/deploy_token.rb
app/models/deploy_token.rb
+3
-1
app/services/deploy_tokens/create_service.rb
app/services/deploy_tokens/create_service.rb
+1
-1
db/migrate/20180319190020_create_deploy_tokens.rb
db/migrate/20180319190020_create_deploy_tokens.rb
+1
-1
db/schema.rb
db/schema.rb
+1
-1
spec/services/deploy_tokens/create_service_spec.rb
spec/services/deploy_tokens/create_service_spec.rb
+9
-1
未找到文件。
app/helpers/deploy_tokens_helper.rb
浏览文件 @
18a15693
...
...
@@ -11,10 +11,10 @@ module DeployTokensHelper
end
def
expires_at_value
(
expires_at
)
expires_at
unless
expires_at
>=
DeployToken
::
F
UTURE_DATE
expires_at
unless
expires_at
>=
DeployToken
::
F
OREVER
end
def
show_expire_at?
(
token
)
token
.
expires?
&&
token
.
expires_at
!=
DeployToken
::
F
UTURE_DATE
token
.
expires?
&&
token
.
expires_at
!=
DeployToken
::
F
OREVER
end
end
app/models/deploy_token.rb
浏览文件 @
18a15693
...
...
@@ -4,7 +4,9 @@ class DeployToken < ActiveRecord::Base
add_authentication_token_field
:token
AVAILABLE_SCOPES
=
%i(read_repository read_registry)
.
freeze
FUTURE_DATE
=
Date
.
new
(
3000
-
01
-
01
)
FOREVER
=
DateTime
.
new
(
3000
,
1
,
1
)
default_value_for
:expires_at
,
FOREVER
has_many
:project_deploy_tokens
,
inverse_of: :deploy_token
has_many
:projects
,
through: :project_deploy_tokens
...
...
app/services/deploy_tokens/create_service.rb
浏览文件 @
18a15693
...
...
@@ -16,7 +16,7 @@ module DeployTokens
end
def
default_expires_at
DeployToken
::
F
UTURE_DATE
DeployToken
::
F
OREVER
end
end
end
db/migrate/20180319190020_create_deploy_tokens.rb
浏览文件 @
18a15693
...
...
@@ -7,7 +7,7 @@ class CreateDeployTokens < ActiveRecord::Migration
t
.
boolean
:read_repository
,
null:
false
,
default:
false
t
.
boolean
:read_registry
,
null:
false
,
default:
false
t
.
datetime_with_timezone
:expires_at
,
null:
false
,
default:
'3000-01-01'
t
.
datetime_with_timezone
:expires_at
,
null:
false
t
.
datetime_with_timezone
:created_at
,
null:
false
t
.
string
:name
,
null:
false
...
...
db/schema.rb
浏览文件 @
18a15693
...
...
@@ -687,7 +687,7 @@ ActiveRecord::Schema.define(version: 20180405142733) do
t
.
boolean
"revoked"
,
default:
false
t
.
boolean
"read_repository"
,
default:
false
,
null:
false
t
.
boolean
"read_registry"
,
default:
false
,
null:
false
t
.
datetime_with_timezone
"expires_at"
,
default:
'3000-01-01 00:00:00'
,
null:
false
t
.
datetime_with_timezone
"expires_at"
,
null:
false
t
.
datetime_with_timezone
"created_at"
,
null:
false
t
.
string
"name"
,
null:
false
t
.
string
"token"
,
null:
false
...
...
spec/services/deploy_tokens/create_service_spec.rb
浏览文件 @
18a15693
require
'spec_helper'
describe
DeployTokens
::
CreateService
,
:clean_gitlab_redis_shared_state
do
describe
DeployTokens
::
CreateService
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:deploy_token_params
)
{
attributes_for
(
:deploy_token
)
}
...
...
@@ -22,6 +22,14 @@ describe DeployTokens::CreateService, :clean_gitlab_redis_shared_state do
end
end
context
'when expires at date is not passed'
do
let
(
:deploy_token_params
)
{
attributes_for
(
:deploy_token
,
expires_at:
''
)
}
it
'should set FOREVER date'
do
expect
(
subject
.
expires_at
).
to
eq
(
DeployToken
::
FOREVER
)
end
end
context
'when the deploy token is invalid'
do
let
(
:deploy_token_params
)
{
attributes_for
(
:deploy_token
,
read_repository:
false
,
read_registry:
false
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录