From 6a6a33452288542aa93354f6ce5a7720721e0688 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 19 Feb 2015 17:24:34 -0800
Subject: [PATCH] Fix active tab tests

---
 .../stylesheets/sections/nav_sidebar.scss       |  1 +
 app/views/layouts/nav/_project.html.haml        |  2 +-
 features/project/active_tab.feature             | 17 ++++++-----------
 features/steps/project/active_tab.rb            |  8 ++++----
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/app/assets/stylesheets/sections/nav_sidebar.scss b/app/assets/stylesheets/sections/nav_sidebar.scss
index de97be30b7d..3ef2a578b7f 100644
--- a/app/assets/stylesheets/sections/nav_sidebar.scss
+++ b/app/assets/stylesheets/sections/nav_sidebar.scss
@@ -49,6 +49,7 @@
 
     &.no-highlight {
       background: none;
+      border: none;
     }
 
     i {
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index 96d156e00d6..caf319899f8 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -6,7 +6,7 @@
         %span
           Back to project
 
-    = nav_link(html_options: {class: "separate-item"}) do
+    = nav_link(html_options: {class: "#{project_tab_class} separate-item"}) do
       = link_to edit_project_path(@project), title: 'Settings', class: "stat-tab tab no-highlight" do
         %i.fa.fa-cogs
         %span
diff --git a/features/project/active_tab.feature b/features/project/active_tab.feature
index ed548177837..05faad4e645 100644
--- a/features/project/active_tab.feature
+++ b/features/project/active_tab.feature
@@ -106,24 +106,19 @@ Feature: Project Active Tab
     And no other sub tabs should be active
     And the active main tab should be Commits
 
-  # Sub Tabs: Issues
-
   Scenario: On Project Issues/Browse
     Given I visit my project's issues page
-    Then the active sub tab should be Issues
-    And no other sub tabs should be active
-    And the active main tab should be Issues
+    Then the active main tab should be Issues
+    And no other main tabs should be active
 
   Scenario: On Project Issues/Milestones
     Given I visit my project's issues page
     And I click the "Milestones" tab
-    Then the active sub tab should be Milestones
-    And no other sub tabs should be active
-    And the active main tab should be Issues
+    Then the active main tab should be Milestones
+    And no other main tabs should be active
 
   Scenario: On Project Issues/Labels
     Given I visit my project's issues page
     And I click the "Labels" tab
-    Then the active sub tab should be Labels
-    And no other sub tabs should be active
-    And the active main tab should be Issues
+    Then the active main tab should be Labels
+    And no other main tabs should be active
diff --git a/features/steps/project/active_tab.rb b/features/steps/project/active_tab.rb
index bb42d15eae5..dd3215adb1a 100644
--- a/features/steps/project/active_tab.rb
+++ b/features/steps/project/active_tab.rb
@@ -93,11 +93,11 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
     ensure_active_sub_tab('Issues')
   end
 
-  step 'the active sub tab should be Milestones' do
-    ensure_active_sub_tab('Milestones')
+  step 'the active main tab should be Milestones' do
+    ensure_active_main_tab('Milestones')
   end
 
-  step 'the active sub tab should be Labels' do
-    ensure_active_sub_tab('Labels')
+  step 'the active main tab should be Labels' do
+    ensure_active_main_tab('Labels')
   end
 end
-- 
GitLab