Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
d8a9bfb6
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,体验更适合开发者的 AI 搜索 >>
提交
d8a9bfb6
编写于
4月 05, 2018
作者:
T
Takuya Noguchi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Order UsersController#projects.json by updated_at
上级
2e350216
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
17 addition
and
10 deletion
+17
-10
app/finders/personal_projects_finder.rb
app/finders/personal_projects_finder.rb
+1
-1
changelogs/unreleased/45065-users-projects-json-sort.yml
changelogs/unreleased/45065-users-projects-json-sort.yml
+5
-0
spec/features/users/user_browses_projects_on_user_page_spec.rb
...features/users/user_browses_projects_on_user_page_spec.rb
+4
-4
spec/finders/personal_projects_finder_spec.rb
spec/finders/personal_projects_finder_spec.rb
+7
-5
未找到文件。
app/finders/personal_projects_finder.rb
浏览文件 @
d8a9bfb6
...
...
@@ -13,7 +13,7 @@ class PersonalProjectsFinder < UnionFinder
def
execute
(
current_user
=
nil
)
segments
=
all_projects
(
current_user
)
find_union
(
segments
,
Project
).
includes
(
:namespace
).
order_
i
d_desc
find_union
(
segments
,
Project
).
includes
(
:namespace
).
order_
update
d_desc
end
private
...
...
changelogs/unreleased/45065-users-projects-json-sort.yml
0 → 100644
浏览文件 @
d8a9bfb6
---
title
:
Order UsersController#projects.json by updated_at
merge_request
:
18227
author
:
Takuya Noguchi
type
:
other
spec/features/users/user_browses_projects_on_user_page_spec.rb
浏览文件 @
d8a9bfb6
...
...
@@ -27,8 +27,8 @@ describe 'Users > User browses projects on user page', :js do
end
it
'paginates projects'
,
:js
do
project
=
create
(
:project
,
namespace:
user
.
namespace
)
project2
=
create
(
:project
,
namespace:
user
.
namespace
)
project
=
create
(
:project
,
namespace:
user
.
namespace
,
updated_at:
2
.
minutes
.
since
)
project2
=
create
(
:project
,
namespace:
user
.
namespace
,
updated_at:
1
.
minute
.
since
)
allow
(
Project
).
to
receive
(
:default_per_page
).
and_return
(
1
)
sign_in
(
user
)
...
...
@@ -41,11 +41,11 @@ describe 'Users > User browses projects on user page', :js do
wait_for_requests
expect
(
page
).
to
have_content
(
project
2
.
name
)
expect
(
page
).
to
have_content
(
project
.
name
)
click_link
(
'Next'
)
expect
(
page
).
to
have_content
(
project
.
name
)
expect
(
page
).
to
have_content
(
project
2
.
name
)
end
context
'when not signed in'
do
...
...
spec/finders/personal_projects_finder_spec.rb
浏览文件 @
d8a9bfb6
...
...
@@ -4,14 +4,16 @@ describe PersonalProjectsFinder do
let
(
:source_user
)
{
create
(
:user
)
}
let
(
:current_user
)
{
create
(
:user
)
}
let
(
:finder
)
{
described_class
.
new
(
source_user
)
}
let!
(
:public_project
)
{
create
(
:project
,
:public
,
namespace:
source_user
.
namespace
)
}
let!
(
:public_project
)
do
create
(
:project
,
:public
,
namespace:
source_user
.
namespace
,
updated_at:
1
.
hour
.
ago
)
end
let!
(
:private_project
)
do
create
(
:project
,
:private
,
namespace:
source_user
.
namespace
,
path:
'mepmep'
)
create
(
:project
,
:private
,
namespace:
source_user
.
namespace
,
updated_at:
3
.
hours
.
ago
,
path:
'mepmep'
)
end
let!
(
:internal_project
)
do
create
(
:project
,
:internal
,
namespace:
source_user
.
namespace
,
path:
'C'
)
create
(
:project
,
:internal
,
namespace:
source_user
.
namespace
,
updated_at:
2
.
hours
.
ago
,
path:
'C'
)
end
before
do
...
...
@@ -28,7 +30,7 @@ describe PersonalProjectsFinder do
subject
{
finder
.
execute
(
current_user
)
}
context
'normal user'
do
it
{
is_expected
.
to
eq
([
internal_project
,
private_project
,
public
_project
])
}
it
{
is_expected
.
to
eq
([
public_project
,
internal_project
,
private
_project
])
}
end
context
'external'
do
...
...
@@ -36,7 +38,7 @@ describe PersonalProjectsFinder do
current_user
.
update_attributes
(
external:
true
)
end
it
{
is_expected
.
to
eq
([
p
rivate_project
,
public
_project
])
}
it
{
is_expected
.
to
eq
([
p
ublic_project
,
private
_project
])
}
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录