summaryrefslogtreecommitdiff
path: root/features/steps/shared
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 /features/steps/shared
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 'features/steps/shared')
-rw-r--r--features/steps/shared/active_tab.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/features/steps/shared/active_tab.rb b/features/steps/shared/active_tab.rb
index 2bb21a798aa..7c0527065f5 100644
--- a/features/steps/shared/active_tab.rb
+++ b/features/steps/shared/active_tab.rb
@@ -7,11 +7,11 @@ module SharedActiveTab
end
def ensure_active_main_tab(content)
- expect(find('.sidebar-top-level-items > li.active')).to have_content(content)
+ expect(first('.sidebar-top-level-items > li.active')).to have_content(content)
end
def ensure_active_sub_tab(content)
- expect(find('.sidebar-sub-level-items > li.active')).to have_content(content)
+ expect(first('.sidebar-sub-level-items > li.active:not(.fly-out-top-item)')).to have_content(content)
end
def ensure_active_sub_nav(content)
@@ -23,7 +23,7 @@ module SharedActiveTab
end
step 'no other sub tabs should be active' do
- expect(page).to have_selector('.sidebar-sub-level-items > li.active', count: 1)
+ expect(page).to have_selector('.sidebar-sub-level-items > li.active:not(.fly-out-top-item)', count: 1)
end
step 'no other sub navs should be active' do