Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
8de11d88
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,发现更多精彩内容 >>
提交
8de11d88
编写于
2月 12, 2014
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of github.com:gitlabhq/gitlabhq
上级
331d9576
1bcf0aa2
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
56 addition
and
1 deletion
+56
-1
app/controllers/profiles/keys_controller.rb
app/controllers/profiles/keys_controller.rb
+1
-1
spec/controllers/profile_keys_controller_spec.rb
spec/controllers/profile_keys_controller_spec.rb
+49
-0
spec/factories.rb
spec/factories.rb
+6
-0
未找到文件。
app/controllers/profiles/keys_controller.rb
浏览文件 @
8de11d88
...
...
@@ -41,7 +41,7 @@ class Profiles::KeysController < ApplicationController
begin
user
=
User
.
find_by_username
(
params
[
:username
])
if
user
.
present?
render
text:
user
.
all_ssh_keys
.
join
(
'\n'
)
render
text:
user
.
all_ssh_keys
.
join
(
"
\n
"
)
else
render_404
and
return
end
...
...
spec/controllers/profile_keys_controller_spec.rb
0 → 100644
浏览文件 @
8de11d88
require
'spec_helper'
describe
Profiles
::
KeysController
do
let
(
:user
)
{
create
(
:user
)
}
describe
"#get_keys"
do
describe
"non existant user"
do
it
"should generally not work"
do
get
:get_keys
,
username:
'not-existent'
expect
(
response
).
not_to
be_success
end
end
describe
"user with no keys"
do
it
"should generally work"
do
get
:get_keys
,
username:
user
.
username
expect
(
response
).
to
be_success
end
it
"should render all keys separated with a new line"
do
get
:get_keys
,
username:
user
.
username
expect
(
response
.
body
).
to
eq
(
""
)
end
end
describe
"user with keys"
do
before
do
user
.
keys
<<
create
(
:key
)
user
.
keys
<<
create
(
:another_key
)
end
it
"should generally work"
do
get
:get_keys
,
username:
user
.
username
expect
(
response
).
to
be_success
end
it
"should render all keys separated with a new line"
do
get
:get_keys
,
username:
user
.
username
expect
(
response
.
body
).
not_to
eq
(
""
)
expect
(
response
.
body
).
to
eq
(
user
.
all_ssh_keys
.
join
(
"
\n
"
))
end
end
end
end
spec/factories.rb
浏览文件 @
8de11d88
...
...
@@ -207,6 +207,12 @@ FactoryGirl.define do
end
end
factory
:another_key
do
key
do
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDmTillFzNTrrGgwaCKaSj+QCz81E6jBc/s9av0+3b1Hwfxgkqjl4nAK/OD2NjgyrONDTDfR8cRN4eAAy6nY8GLkOyYBDyuc5nTMqs5z3yVuTwf3koGm/YQQCmo91psZ2BgDFTor8SVEE5Mm1D1k3JDMhDFxzzrOtRYFPci9lskTJaBjpqWZ4E9rDTD2q/QZntCqbC3wE9uSemRQB5f8kik7vD/AD8VQXuzKladrZKkzkONCPWsXDspUitjM8HkQdOf0PsYn1CMUC1xKYbCxkg5TkEosIwGv6CoEArUrdu/4+10LVslq494mAvEItywzrluCLCnwELfW+h/m8UHoVhZ"
end
end
factory
:invalid_key
do
key
do
"ssh-rsa this_is_invalid_key=="
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录