Move Network page from separate tab to sub tab of Commits

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

3 files changed, 10 insertions, 9 deletions

diff --git a/features/project/active_tab.feature b/features/project/active_tab.feature
index 8661ea98c20..2fd097d100b 100644
--- a/features/project/active_tab.feature
+++ b/features/project/active_tab.feature
@@ -20,11 +20,6 @@ Feature: Project Active Tab
     Then the active main tab should be Commits
     And no other main tabs should be active
 
-  Scenario: On Project Network
-    Given I visit my project's network page
-    Then the active main tab should be Network
-    And no other main tabs should be active
-
   Scenario: On Project Issues
     Given I visit my project's issues page
     Then the active main tab should be Issues
@@ -83,6 +78,12 @@ Feature: Project Active Tab
     And no other sub tabs should be active
     And the active main tab should be Commits
 
+  Scenario: On Project Commits/Network
+    Given I visit my project's network page
+    Then the active sub tab should be Network
+    And no other sub tabs should be active
+    And the active main tab should be Commits
+
   Scenario: On Project Commits/Compare
     Given I visit my project's commits page
     And I click the "Compare" tab
diff --git a/features/steps/project/active_tab.rb b/features/steps/project/active_tab.rb
index 9e96fa5ba49..94a5dd744d0 100644
--- a/features/steps/project/active_tab.rb
+++ b/features/steps/project/active_tab.rb
@@ -67,6 +67,10 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
     ensure_active_sub_tab('Commits')
   end
 
+  step 'the active sub tab should be Network' do
+    ensure_active_sub_tab('Network')
+  end
+
   step 'the active sub tab should be Compare' do
     ensure_active_sub_tab('Compare')
   end
diff --git a/features/steps/shared/project_tab.rb b/features/steps/shared/project_tab.rb
index 33ff7084e30..3bad28dc283 100644
--- a/features/steps/shared/project_tab.rb
+++ b/features/steps/shared/project_tab.rb
@@ -16,10 +16,6 @@ module SharedProjectTab
     ensure_active_main_tab('Commits')
   end
 
-  step 'the active main tab should be Network' do
-    ensure_active_main_tab('Network')
-  end
-
   step 'the active main tab should be Graphs' do
     ensure_active_main_tab('Graphs')
   end