summaryrefslogtreecommitdiff
path: root/spec/features/admin
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-09-01 08:41:31 +0100
committerPhil Hughes <me@iamphill.com>2017-09-06 14:54:17 +0100
commitc56100b3ec26a0f5d71bb80f94c661674b3226b8 (patch)
tree37a6d9d31b278550cc6b6d948ad5629db9dffc17 /spec/features/admin
parent5d2b7aa200e0ce5a66672259d468be4ccc5f9124 (diff)
downloadgitlab-ce-c56100b3ec26a0f5d71bb80f94c661674b3226b8.tar.gz
Add top level items to fly-out navigation
This only appears when in the collapsed sidebar. If the sidebar is expanded, then these items are hidden & no fly-out navigation is displayed. Closes #36294
Diffstat (limited to 'spec/features/admin')
-rw-r--r--spec/features/admin/admin_active_tab_spec.rb4
-rw-r--r--spec/features/admin/admin_settings_spec.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/features/admin/admin_active_tab_spec.rb b/spec/features/admin/admin_active_tab_spec.rb
index 5ff791fc36a..1215908f5ea 100644
--- a/spec/features/admin/admin_active_tab_spec.rb
+++ b/spec/features/admin/admin_active_tab_spec.rb
@@ -14,8 +14,8 @@ RSpec.describe 'admin active tab' do
shared_examples 'page has active sub tab' do |title|
it "activates #{title} sub tab" do
- expect(page).to have_selector('.sidebar-sub-level-items li.active', count: 1)
- expect(page.find('.sidebar-sub-level-items li.active')).to have_content(title)
+ expect(page).to have_selector('.sidebar-sub-level-items > li.active', count: 2)
+ expect(page.all('.sidebar-sub-level-items > li.active')[1]).to have_content(title)
end
end
diff --git a/spec/features/admin/admin_settings_spec.rb b/spec/features/admin/admin_settings_spec.rb
index 563818e8761..c490dce7ab0 100644
--- a/spec/features/admin/admin_settings_spec.rb
+++ b/spec/features/admin/admin_settings_spec.rb
@@ -48,7 +48,7 @@ feature 'Admin updates settings' do
end
scenario 'Change Slack Notifications Service template settings' do
- click_link 'Service Templates'
+ first(:link, 'Service Templates').click
click_link 'Slack notifications'
fill_in 'Webhook', with: 'http://localhost'
fill_in 'Username', with: 'test_user'