From 25a3b7fab905d09f6f064108f457a4e20c8915ff Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 30 Aug 2017 14:40:07 +0100
Subject: [PATCH] more navigation spec fixes

---
 features/steps/explore/projects.rb                         | 4 ++--
 features/steps/project/active_tab.rb                       | 6 +++---
 spec/features/merge_requests/user_posts_diff_notes_spec.rb | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/features/steps/explore/projects.rb b/features/steps/explore/projects.rb
index f1288c15084..8fb2ac34c32 100644
--- a/features/steps/explore/projects.rb
+++ b/features/steps/explore/projects.rb
@@ -36,13 +36,13 @@ class Spinach::Features::ExploreProjects < Spinach::FeatureSteps
   end
 
   step 'I should see project "Community" home page' do
-    page.within '.navbar-gitlab .title' do
+    page.within '.breadcrumbs .title' do
       expect(page).to have_content 'Community'
     end
   end
 
   step 'I should see project "Internal" home page' do
-    page.within '.navbar-gitlab .title' do
+    page.within '.breadcrumbs .title' do
       expect(page).to have_content 'Internal'
     end
   end
diff --git a/features/steps/project/active_tab.rb b/features/steps/project/active_tab.rb
index 4e0d85f6730..1a18f1d7065 100644
--- a/features/steps/project/active_tab.rb
+++ b/features/steps/project/active_tab.rb
@@ -34,13 +34,13 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
   end
 
   step 'I click the "Repository" tab' do
-    page.within '.nav-sidebar' do
+    page.within '.sidebar-top-level-items > .active' do
       click_link('Repository')
     end
   end
 
   step 'I click the "Activity" tab' do
-    page.within '.nav-sidebar' do
+    page.within '.sidebar-top-level-items > .active' do
       click_link('Activity')
     end
   end
@@ -82,7 +82,7 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
   end
 
   step 'I click the "Charts" tab' do
-    page.within '.nav-sidebar' do
+    page.within('.sidebar-top-level-items > .active') do
       click_link('Charts')
     end
   end
diff --git a/spec/features/merge_requests/user_posts_diff_notes_spec.rb b/spec/features/merge_requests/user_posts_diff_notes_spec.rb
index 162b9ccc1ff..877f305120e 100644
--- a/spec/features/merge_requests/user_posts_diff_notes_spec.rb
+++ b/spec/features/merge_requests/user_posts_diff_notes_spec.rb
@@ -6,6 +6,8 @@ feature 'Merge requests > User posts diff notes', :js do
   let(:project) { merge_request.source_project }
 
   before do
+    allow_any_instance_of(ApplicationHelper).to receive(:collapsed_sidebar?).and_return(true)
+
     project.add_developer(user)
     sign_in(user)
   end
@@ -17,8 +19,6 @@ feature 'Merge requests > User posts diff notes', :js do
 
   context 'when hovering over a parallel view diff file' do
     before do
-      allow_any_instance_of(ApplicationHelper).to receive(:collapsed_sidebar?).and_return(true)
-
       visit diffs_project_merge_request_path(project, merge_request, view: 'parallel')
     end