diff options
author | Rémy Coutable <remy@rymai.me> | 2018-05-21 08:27:36 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-05-21 08:27:36 +0000 |
commit | cf7f3606d3bca3dfb481323aaa4f3dc50ca1a089 (patch) | |
tree | 62a645aa0d33e6ef4042af179e5c039ac0c6b3c5 /spec/features | |
parent | b113330fab21d3da547cbee057b825f2225676c6 (diff) | |
parent | d8a9bfb6b7e17812915fe6767158abaca2ea6a74 (diff) | |
download | gitlab-ce-cf7f3606d3bca3dfb481323aaa4f3dc50ca1a089.tar.gz |
Merge branch '45065-users-projects-json-sort' into 'master'
UsersController#projects.json sort order
Closes #45065
See merge request gitlab-org/gitlab-ce!18227
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/users/user_browses_projects_on_user_page_spec.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/features/users/user_browses_projects_on_user_page_spec.rb b/spec/features/users/user_browses_projects_on_user_page_spec.rb index a70637c8370..7bede0b0d48 100644 --- a/spec/features/users/user_browses_projects_on_user_page_spec.rb +++ b/spec/features/users/user_browses_projects_on_user_page_spec.rb @@ -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(project2.name) + expect(page).to have_content(project.name) click_link('Next') - expect(page).to have_content(project.name) + expect(page).to have_content(project2.name) end context 'when not signed in' do |