Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
c5bea1d2
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,发现更多精彩内容 >>
提交
c5bea1d2
编写于
1月 26, 2017
作者:
F
Fatih Acet
浏览文件
操作
浏览文件
下载
差异文件
Merge branch '27044-fix-explore-sorting-on-trending' into 'master'
Fix /explore sorting (trending) Closes #27044 See merge request !8792
上级
04e01b67
6fbf24af
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
41 addition
and
0 deletion
+41
-0
app/controllers/explore/projects_controller.rb
app/controllers/explore/projects_controller.rb
+1
-0
changelogs/unreleased/27044-fix-explore-sorting-on-trending.yml
...logs/unreleased/27044-fix-explore-sorting-on-trending.yml
+4
-0
spec/controllers/explore/projects_controller_spec.rb
spec/controllers/explore/projects_controller_spec.rb
+30
-0
spec/factories/trending_project.rb
spec/factories/trending_project.rb
+6
-0
未找到文件。
app/controllers/explore/projects_controller.rb
浏览文件 @
c5bea1d2
...
...
@@ -22,6 +22,7 @@ class Explore::ProjectsController < Explore::ApplicationController
def
trending
@projects
=
filter_projects
(
Project
.
trending
)
@projects
=
@projects
.
sort
(
@sort
=
params
[
:sort
])
@projects
=
@projects
.
page
(
params
[
:page
])
respond_to
do
|
format
|
...
...
changelogs/unreleased/27044-fix-explore-sorting-on-trending.yml
0 → 100644
浏览文件 @
c5bea1d2
---
title
:
Fix /explore sorting
merge_request
:
author
:
spec/controllers/explore/projects_controller_spec.rb
0 → 100644
浏览文件 @
c5bea1d2
require
'spec_helper'
describe
Explore
::
ProjectsController
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:visibility
)
{
:public
}
describe
'GET #trending'
do
let!
(
:project_1
)
{
create
(
:project
,
visibility
,
ci_id:
1
)
}
let!
(
:project_2
)
{
create
(
:project
,
visibility
,
ci_id:
2
)
}
let!
(
:trending_project_1
)
{
create
(
:trending_project
,
project:
project_1
)
}
let!
(
:trending_project_2
)
{
create
(
:trending_project
,
project:
project_2
)
}
before
do
sign_in
(
user
)
end
context
'sorting by update date'
do
it
'sorts by last updated'
do
get
:trending
,
sort:
'updated_desc'
expect
(
assigns
(
:projects
)).
to
eq
[
project_2
,
project_1
]
end
it
'sorts by oldest updated'
do
get
:trending
,
sort:
'updated_asc'
expect
(
assigns
(
:projects
)).
to
eq
[
project_1
,
project_2
]
end
end
end
end
spec/factories/trending_project.rb
0 → 100644
浏览文件 @
c5bea1d2
FactoryGirl
.
define
do
# TrendingProject
factory
:trending_project
,
class:
'TrendingProject'
do
project
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录