diff options
author | Stan Hu <stanhu@gmail.com> | 2017-09-01 06:50:05 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2017-09-01 06:50:05 +0300 |
commit | f045903541ace5cf4fd3c6e4a05ecfd264c1c621 (patch) | |
tree | ee6aaf013d92766e7184b3e0772e1e5fa99a20e4 /spec/features/dashboard | |
parent | f2c60eba25fc001974a61373bc380528416932a2 (diff) | |
parent | 8713afe61fb1beaff4d550a60b88d274c47006ea (diff) |
Merge branch 'master' into sh-headless-chrome-support
Diffstat (limited to 'spec/features/dashboard')
-rw-r--r-- | spec/features/dashboard/activity_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/dashboard/archived_projects_spec.rb | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/spec/features/dashboard/activity_spec.rb b/spec/features/dashboard/activity_spec.rb index 582868bac1e..bd115785646 100644 --- a/spec/features/dashboard/activity_spec.rb +++ b/spec/features/dashboard/activity_spec.rb @@ -17,7 +17,7 @@ feature 'Dashboard > Activity' do end context 'event filters', :js do - let(:project) { create(:project) } + let(:project) { create(:project, :repository) } let(:merge_request) do create(:merge_request, author: user, source_project: project, target_project: project) diff --git a/spec/features/dashboard/archived_projects_spec.rb b/spec/features/dashboard/archived_projects_spec.rb index 814ec0e59c7..e8d699ff5e0 100644 --- a/spec/features/dashboard/archived_projects_spec.rb +++ b/spec/features/dashboard/archived_projects_spec.rb @@ -26,6 +26,13 @@ RSpec.describe 'Dashboard Archived Project' do expect(page).to have_link(archived_project.name) end + it 'renders only archived projects' do + click_link 'Show archived projects only' + + expect(page).to have_content(archived_project.name) + expect(page).not_to have_content(project.name) + end + it 'searchs archived projects', :js do click_button 'Last updated' click_link 'Show archived projects' |