diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-05-11 01:07:16 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-05-11 01:07:16 +0000 |
commit | 1ccf101eef7db401317838a453795fa1c28ec036 (patch) | |
tree | 6fa8696471a71c72178e7010b0ed7888a56c566d | |
parent | 62c93ab91218daf176ccbfc1622a6f3c58f1ad82 (diff) | |
parent | 8480118d2baeec3113709febb6a54735c3758be2 (diff) | |
download | gitlab-ce-1ccf101eef7db401317838a453795fa1c28ec036.tar.gz |
Merge branch 'fix-shortcuts_spec-explore-page-transient-failure' into 'master'
Find the nothing-here-block before asserting page content when on explore page of shortcuts_spec.rb
See merge request !11250
-rw-r--r-- | spec/features/dashboard/shortcuts_spec.rb | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/spec/features/dashboard/shortcuts_spec.rb b/spec/features/dashboard/shortcuts_spec.rb index 4c9adcabe34..349b948eaee 100644 --- a/spec/features/dashboard/shortcuts_spec.rb +++ b/spec/features/dashboard/shortcuts_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -feature 'Dashboard shortcuts', feature: true, js: true do +feature 'Dashboard shortcuts', :feature, :js do context 'logged in' do before do login_as :user @@ -8,21 +8,21 @@ feature 'Dashboard shortcuts', feature: true, js: true do end scenario 'Navigate to tabs' do - find('body').native.send_keys([:shift, 'P']) - - check_page_title('Projects') - - find('body').native.send_key([:shift, 'I']) + find('body').send_keys([:shift, 'I']) check_page_title('Issues') - find('body').native.send_key([:shift, 'M']) + find('body').send_keys([:shift, 'M']) check_page_title('Merge Requests') - find('body').native.send_keys([:shift, 'T']) + find('body').send_keys([:shift, 'T']) check_page_title('Todos') + + find('body').send_keys([:shift, 'P']) + + check_page_title('Projects') end end @@ -32,17 +32,20 @@ feature 'Dashboard shortcuts', feature: true, js: true do end scenario 'Navigate to tabs' do - find('body').native.send_keys([:shift, 'P']) - - expect(page).to have_content('No projects found') - - find('body').native.send_keys([:shift, 'G']) + find('body').send_keys([:shift, 'G']) + find('.nothing-here-block') expect(page).to have_content('No public groups') - find('body').native.send_keys([:shift, 'S']) + find('body').send_keys([:shift, 'S']) + find('.nothing-here-block') expect(page).to have_selector('.snippets-list-holder') + + find('body').send_keys([:shift, 'P']) + + find('.nothing-here-block') + expect(page).to have_content('No projects found') end end |