From 1d250b48922ef88b14ad8ce2af157e2f2d256773 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 9 Dec 2015 02:50:46 +0100 Subject: Move Network page from separate tab to sub tab of Commits Signed-off-by: Dmitriy Zaporozhets --- features/project/active_tab.feature | 11 ++++++----- features/steps/project/active_tab.rb | 4 ++++ features/steps/shared/project_tab.rb | 4 ---- 3 files changed, 10 insertions(+), 9 deletions(-) (limited to 'features') 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 -- cgit v1.2.1 From 2c61e3c057af02068bfb57f1c3f921d9f0c87b1d Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 9 Dec 2015 17:47:45 +0100 Subject: Fix test for network shortcut Signed-off-by: Dmitriy Zaporozhets --- features/project/shortcuts.feature | 3 ++- features/steps/project/active_tab.rb | 4 ---- features/steps/shared/project_tab.rb | 4 ++++ 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'features') diff --git a/features/project/shortcuts.feature b/features/project/shortcuts.feature index 0f71c32380b..10e7c234610 100644 --- a/features/project/shortcuts.feature +++ b/features/project/shortcuts.feature @@ -19,7 +19,8 @@ Feature: Project Shortcuts @javascript Scenario: Navigate to network tab Given I press "g" and "n" - Then the active main tab should be Network + Then the active sub tab should be Network + And the active main tab should be Commits @javascript Scenario: Navigate to graphs tab diff --git a/features/steps/project/active_tab.rb b/features/steps/project/active_tab.rb index 94a5dd744d0..9e96fa5ba49 100644 --- a/features/steps/project/active_tab.rb +++ b/features/steps/project/active_tab.rb @@ -67,10 +67,6 @@ 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 3bad28dc283..4fc2ece79ff 100644 --- a/features/steps/shared/project_tab.rb +++ b/features/steps/shared/project_tab.rb @@ -49,4 +49,8 @@ module SharedProjectTab step 'the active main tab should be Activity' do ensure_active_main_tab('Activity') end + + step 'the active sub tab should be Network' do + ensure_active_sub_tab('Network') + end end -- cgit v1.2.1