Change spinach tab tests to fit new tabs navigation

3 files changed, 38 insertions, 29 deletions

diff --git a/features/project/active_tab.feature b/features/project/active_tab.feature
index 2d3e41d3d33..f33e4b9e369 100644
--- a/features/project/active_tab.feature
+++ b/features/project/active_tab.feature
@@ -49,51 +49,52 @@ Feature: Project active tab
 
   Scenario: On Project Home/Show
     Given I visit my project's home page
-    Then the active sub tab should be Show
-    And no other sub tabs should be active
-    And the active main tab should be Home
+    Then the active main tab should be Home
+    And no other main tabs should be active
 
-  Scenario: On Project Home/Team
-    Given I visit my project's home page
-    And I click the "Team" tab
-    Then the active sub tab should be Team
-    And no other sub tabs should be active
-    And the active main tab should be Home
+  #Scenario: On Project Settings/Attachments
+    #Given I visit my project's home page
+    #And I click the "Attachments" tab
+    #Then the active sub tab should be Attachments
+    #And no other sub tabs should be active
+    #And the active main tab should be Home
 
-  Scenario: On Project Home/Attachments
-    Given I visit my project's home page
-    And I click the "Attachments" tab
-    Then the active sub tab should be Attachments
-    And no other sub tabs should be active
-    And the active main tab should be Home
+  #Scenario: On Project Settings/Snippets
+    #Given I visit my project's home page
+    #And I click the "Snippets" tab
+    #Then the active sub tab should be Snippets
+    #And no other sub tabs should be active
+    #And the active main tab should be Home
 
-  Scenario: On Project Home/Snippets
-    Given I visit my project's home page
-    And I click the "Snippets" tab
-    Then the active sub tab should be Snippets
+  # Sub Tabs: Settings
+
+  Scenario: On Project Settings/Team
+    Given I visit my project's settings page
+    And I click the "Team" tab
+    Then the active sub tab should be Team
     And no other sub tabs should be active
-    And the active main tab should be Home
+    And the active main tab should be Settings
 
-  Scenario: On Project Home/Edit
-    Given I visit my project's home page
+  Scenario: On Project Settings/Edit
+    Given I visit my project's settings page
     And I click the "Edit" tab
     Then the active sub tab should be Edit
     And no other sub tabs should be active
-    And the active main tab should be Home
+    And the active main tab should be Settings
 
-  Scenario: On Project Home/Hooks
-    Given I visit my project's home page
+  Scenario: On Project Settings/Hooks
+    Given I visit my project's settings page
     And I click the "Hooks" tab
     Then the active sub tab should be Hooks
     And no other sub tabs should be active
-    And the active main tab should be Home
+    And the active main tab should be Settings
 
-  Scenario: On Project Home/Deploy Keys
-    Given I visit my project's home page
+  Scenario: On Project Settings/Deploy Keys
+    Given I visit my project's settings page
     And I click the "Deploy Keys" tab
     Then the active sub tab should be Deploy Keys
     And no other sub tabs should be active
-    And the active main tab should be Home
+    And the active main tab should be Settings
 
   # Sub Tabs: Commits
 
diff --git a/features/steps/project/project_active_tab.rb b/features/steps/project/project_active_tab.rb
index bce67c82962..4c6d890fe4b 100644
--- a/features/steps/project/project_active_tab.rb
+++ b/features/steps/project/project_active_tab.rb
@@ -10,6 +10,10 @@ class ProjectActiveTab < Spinach::FeatureSteps
     ensure_active_main_tab('Home')
   end
 
+  Then 'the active main tab should be Settings' do
+    ensure_active_main_tab('Settings')
+  end
+
   Then 'the active main tab should be Files' do
     ensure_active_main_tab('Files')
   end
diff --git a/features/steps/shared/paths.rb b/features/steps/shared/paths.rb
index 54cdbd4ba2f..2713e20a91e 100644
--- a/features/steps/shared/paths.rb
+++ b/features/steps/shared/paths.rb
@@ -125,6 +125,10 @@ module SharedPaths
     visit project_path(@project)
   end
 
+  Given "I visit my project's settings page" do
+    visit edit_project_path(@project)
+  end
+
   Given "I visit my project's files page" do
     visit project_tree_path(@project, root_ref)
   end