diff options
author | Sean McGivern <sean@gitlab.com> | 2019-05-07 09:49:42 +0000 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2019-05-07 09:49:42 +0000 |
commit | 9a6e3c0c1b858f2691f3a19c8c01d71408db3796 (patch) | |
tree | 7466ae5b000664c7c7a3e302b0ccbfe668746120 | |
parent | a44887a87204207e77f56d6d360761e30a5f3ea7 (diff) | |
parent | 4d405acb6a2a7779a6f22772d3089ade90d34058 (diff) | |
download | gitlab-ce-9a6e3c0c1b858f2691f3a19c8c01d71408db3796.tar.gz |
Merge branch 'bvl-fix-ordering-mysql' into 'master'
Set created_at and updated_at for sorting specs
Closes #61541
See merge request gitlab-org/gitlab-ce!28173
-rw-r--r-- | spec/features/dashboard/user_filters_projects_spec.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/features/dashboard/user_filters_projects_spec.rb b/spec/features/dashboard/user_filters_projects_spec.rb index e0553086fd7..5b17c49db2d 100644 --- a/spec/features/dashboard/user_filters_projects_spec.rb +++ b/spec/features/dashboard/user_filters_projects_spec.rb @@ -2,9 +2,9 @@ require 'spec_helper' describe 'Dashboard > User filters projects' do let(:user) { create(:user) } - let(:project) { create(:project, name: 'Victorialand', namespace: user.namespace) } + let(:project) { create(:project, name: 'Victorialand', namespace: user.namespace, created_at: 2.seconds.ago, updated_at: 2.seconds.ago) } let(:user2) { create(:user) } - let(:project2) { create(:project, name: 'Treasure', namespace: user2.namespace) } + let(:project2) { create(:project, name: 'Treasure', namespace: user2.namespace, created_at: 1.second.ago, updated_at: 1.second.ago) } before do project.add_maintainer(user) @@ -129,7 +129,7 @@ describe 'Dashboard > User filters projects' do list = page.all('.projects-list .project-name').map(&:text) - expect(list).to match(["Private project", "Treasure", "Victorialand"]) + expect(list).to contain_exactly("Private project", "Treasure", "Victorialand") end it 'filters internal projects only' do @@ -139,14 +139,14 @@ describe 'Dashboard > User filters projects' do list = page.all('.projects-list .project-name').map(&:text) - expect(list).to match(['Internal project']) + expect(list).to contain_exactly('Internal project') end it 'filters any project' do select_dropdown_option '#filtered-search-visibility-dropdown', 'Any' list = page.all('.projects-list .project-name').map(&:text) - expect(list).to match(["Internal project", "Private project", "Treasure", "Victorialand"]) + expect(list).to contain_exactly("Internal project", "Private project", "Treasure", "Victorialand") end end |