diff options
author | Rémy Coutable <remy@rymai.me> | 2017-01-27 18:25:04 +0000 |
---|---|---|
committer | DJ Mountney <david@twkie.net> | 2017-01-31 12:32:24 -0800 |
commit | 2ef2d97a8581ab5e13b0e61f3055f98895d6089b (patch) | |
tree | 1dbe1e46f865b598caacd7ef8d905c2a398926fe | |
parent | 440b31ed1602c71e34ec38f53bc3820f85eddaa9 (diff) | |
download | gitlab-ce-2ef2d97a8581ab5e13b0e61f3055f98895d6089b.tar.gz |
Merge branch 'rs-issue-27350' into 'master'
Fix a transient failure in the `Explore::ProjectsController` spec
Closes #27350
See merge request !8847
-rw-r--r-- | spec/controllers/explore/projects_controller_spec.rb | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/spec/controllers/explore/projects_controller_spec.rb b/spec/controllers/explore/projects_controller_spec.rb index 6128091f543..9dceeca168d 100644 --- a/spec/controllers/explore/projects_controller_spec.rb +++ b/spec/controllers/explore/projects_controller_spec.rb @@ -1,29 +1,26 @@ 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) } + context 'sorting by update date' do + let(:project1) { create(:empty_project, :public, updated_at: 3.days.ago) } + let(:project2) { create(:empty_project, :public, updated_at: 1.day.ago) } - before do - sign_in(user) - end + before do + create(:trending_project, project: project1) + create(:trending_project, project: project2) + 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] + + expect(assigns(:projects)).to eq [project2, project1] end it 'sorts by oldest updated' do get :trending, sort: 'updated_asc' - expect(assigns(:projects)).to eq [project_1, project_2] + + expect(assigns(:projects)).to eq [project1, project2] end end end |