Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into remove-comment-toggleremove-comment-toggle

1 files changed, 11 insertions, 9 deletions

diff --git a/features/steps/shared/project_tab.rb b/features/steps/shared/project_tab.rb
index 4fc2ece79ff..bfee8793301 100644
--- a/features/steps/shared/project_tab.rb
+++ b/features/steps/shared/project_tab.rb
@@ -8,12 +8,8 @@ module SharedProjectTab
     ensure_active_main_tab('Project')
   end
 
-  step 'the active main tab should be Files' do
-    ensure_active_main_tab('Files')
-  end
-
-  step 'the active main tab should be Commits' do
-    ensure_active_main_tab('Commits')
+  step 'the active main tab should be Code' do
+    ensure_active_main_tab('Code')
   end
 
   step 'the active main tab should be Graphs' do
@@ -41,9 +37,7 @@ module SharedProjectTab
   end
 
   step 'the active main tab should be Settings' do
-    page.within '.nav-sidebar' do
-      expect(page).to have_content('Go to project')
-    end
+    expect(page).to have_selector('.layout-nav .nav-links > li.active', count: 0)
   end
 
   step 'the active main tab should be Activity' do
@@ -53,4 +47,12 @@ module SharedProjectTab
   step 'the active sub tab should be Network' do
     ensure_active_sub_tab('Network')
   end
+
+  step 'the active sub tab should be Files' do
+    ensure_active_sub_tab('Files')
+  end
+
+  step 'the active sub tab should be Commits' do
+    ensure_active_sub_tab('Commits')
+  end
 end