Update tests for shortcuts and layout

4 files changed, 51 insertions, 5 deletions

diff --git a/features/project/active_tab.feature b/features/project/active_tab.feature
index 1dd2bdd9b36..e7f36332faf 100644
--- a/features/project/active_tab.feature
+++ b/features/project/active_tab.feature
@@ -7,8 +7,10 @@ Feature: Project Active Tab
 
   Scenario: On Project Home
     Given I visit my project's home page
-    Then the active main tab should be Home
-    And no other main tabs should be active
+    And I click the "Home" tab
+    Then the active sub nav should be Home
+    And no other sub navs should be active
+    And the active main tab should be Project
 
   Scenario: On Project Repository
     Given I visit my project's files page
@@ -34,9 +36,16 @@ Feature: Project Active Tab
 
   Scenario: On Project Home/Show
     Given I visit my project's home page
-    Then the active main tab should be Home
+    Then the active main tab should be Project
     And no other main tabs should be active
 
+  Scenario: On Project Home/Activity
+    Given I visit my project's home page
+    And I click the "Activity" tab
+    Then the active sub nav should be Activity
+    And no other sub navs should be active
+    And the active main tab should be Project
+
   # Sub Tabs: Settings
 
   Scenario: On Project Settings/Integrations
@@ -93,6 +102,13 @@ Feature: Project Active Tab
     And no other sub tabs should be active
     And the active main tab should be Repository
 
+  Scenario: On Project Repository/Charts
+    Given I visit my project's commits page
+    And I click the "Charts" tab
+    Then the active sub tab should be Charts
+    And no other sub tabs should be active
+    And the active main tab should be Repository
+
   Scenario: On Project Repository/Branches
     Given I visit my project's commits page
     And I click the "Branches" tab
diff --git a/features/project/shortcuts.feature b/features/project/shortcuts.feature
index 95de63ba21a..b47fca31ef2 100644
--- a/features/project/shortcuts.feature
+++ b/features/project/shortcuts.feature
@@ -25,6 +25,12 @@ Feature: Project Shortcuts
     And the active main tab should be Repository
 
   @javascript
+  Scenario: Navigate to repository charts tab
+    Given I press "g" and "g"
+    Then the active sub tab should be Charts
+    And the active main tab should be Repository
+
+  @javascript
   Scenario: Navigate to issues tab
     Given I press "g" and "i"
     Then the active main tab should be Issues
@@ -47,4 +53,11 @@ Feature: Project Shortcuts
   @javascript
   Scenario: Navigate to project home
     Given I press "g" and "p"
-    Then the active main tab should be Home
+    Then the active sub tab should be Home
+    And the active main tab should be Project
+
+  @javascript
+  Scenario: Navigate to project feed
+    Given I press "g" and "e"
+    Then the active sub tab should be Activity
+    And the active main tab should be Project
diff --git a/features/steps/project/project_shortcuts.rb b/features/steps/project/project_shortcuts.rb
index 02c08b784bc..8143b01ca40 100644
--- a/features/steps/project/project_shortcuts.rb
+++ b/features/steps/project/project_shortcuts.rb
@@ -34,4 +34,9 @@ class Spinach::Features::ProjectShortcuts < Spinach::FeatureSteps
     find('body').native.send_key('g')
     find('body').native.send_key('w')
   end
+
+  step 'I press "g" and "e"' do
+    find('body').native.send_key('g')
+    find('body').native.send_key('e')
+  end
 end
diff --git a/features/steps/shared/project_tab.rb b/features/steps/shared/project_tab.rb
index 83446afe424..400114f03c0 100644
--- a/features/steps/shared/project_tab.rb
+++ b/features/steps/shared/project_tab.rb
@@ -4,7 +4,7 @@ module SharedProjectTab
   include Spinach::DSL
   include SharedActiveTab
 
-  step 'the active main tab should be Home' do
+  step 'the active main tab should be Project' do
     ensure_active_main_tab('Project')
   end
 
@@ -47,4 +47,16 @@ module SharedProjectTab
   step 'the active sub tab should be Commits' do
     ensure_active_sub_tab('Commits')
   end
+
+  step 'the active sub tab should be Home' do
+    ensure_active_sub_tab('Home')
+  end
+
+  step 'the active sub tab should be Activity' do
+    ensure_active_sub_tab('Activity')
+  end
+
+  step 'the active sub tab should be Charts' do
+    ensure_active_sub_tab('Charts')
+  end
 end