Commit 7cfb445c authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Update tests to match new Code tab logic

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 56a17a77
...@@ -50,7 +50,7 @@ class Projects::BranchesController < Projects::ApplicationController ...@@ -50,7 +50,7 @@ class Projects::BranchesController < Projects::ApplicationController
redirect_to namespace_project_branches_path(@project.namespace, redirect_to namespace_project_branches_path(@project.namespace,
@project), status: 303 @project), status: 303
end end
format.js { head :ok } format.js { render nothing: true, status: status[:return_code] }
end end
end end
......
...@@ -10,14 +10,9 @@ Feature: Project Active Tab ...@@ -10,14 +10,9 @@ Feature: Project Active Tab
Then the active main tab should be Home Then the active main tab should be Home
And no other main tabs should be active And no other main tabs should be active
Scenario: On Project Files Scenario: On Project Code
Given I visit my project's files page Given I visit my project's files page
Then the active main tab should be Files Then the active main tab should be Code
And no other main tabs should be active
Scenario: On Project Commits
Given I visit my project's commits page
Then the active main tab should be Commits
And no other main tabs should be active And no other main tabs should be active
Scenario: On Project Issues Scenario: On Project Issues
...@@ -64,40 +59,46 @@ Feature: Project Active Tab ...@@ -64,40 +59,46 @@ Feature: Project Active Tab
And no other sub navs should be active And no other sub navs should be active
And the active main tab should be Settings And the active main tab should be Settings
# Sub Tabs: Commits # Sub Tabs: Code
Scenario: On Project Code/Files
Given I visit my project's files page
Then the active sub tab should be Files
And no other sub tabs should be active
And the active main tab should be Code
Scenario: On Project Commits/Commits Scenario: On Project Code/Commits
Given I visit my project's commits page Given I visit my project's commits page
Then the active sub tab should be Commits Then the active sub tab should be Commits
And no other sub tabs should be active And no other sub tabs should be active
And the active main tab should be Commits And the active main tab should be Code
Scenario: On Project Commits/Network Scenario: On Project Code/Network
Given I visit my project's network page Given I visit my project's network page
Then the active sub tab should be Network Then the active sub tab should be Network
And no other sub tabs should be active And no other sub tabs should be active
And the active main tab should be Commits And the active main tab should be Code
Scenario: On Project Commits/Compare Scenario: On Project Code/Compare
Given I visit my project's commits page Given I visit my project's commits page
And I click the "Compare" tab And I click the "Compare" tab
Then the active sub tab should be Compare Then the active sub tab should be Compare
And no other sub tabs should be active And no other sub tabs should be active
And the active main tab should be Commits And the active main tab should be Code
Scenario: On Project Commits/Branches Scenario: On Project Code/Branches
Given I visit my project's commits page Given I visit my project's commits page
And I click the "Branches" tab And I click the "Branches" tab
Then the active sub tab should be Branches Then the active sub tab should be Branches
And no other sub tabs should be active And no other sub tabs should be active
And the active main tab should be Commits And the active main tab should be Code
Scenario: On Project Commits/Tags Scenario: On Project Code/Tags
Given I visit my project's commits page Given I visit my project's commits page
And I click the "Tags" tab And I click the "Tags" tab
Then the active sub tab should be Tags Then the active sub tab should be Tags
And no other sub tabs should be active And no other sub tabs should be active
And the active main tab should be Commits And the active main tab should be Code
Scenario: On Project Issues/Browse Scenario: On Project Issues/Browse
Given I visit my project's issues page Given I visit my project's issues page
......
...@@ -63,6 +63,10 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps ...@@ -63,6 +63,10 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
click_link('Tags') click_link('Tags')
end end
step 'the active sub tab should be Files' do
ensure_active_sub_tab('Files')
end
step 'the active sub tab should be Commits' do step 'the active sub tab should be Commits' do
ensure_active_sub_tab('Commits') ensure_active_sub_tab('Commits')
end end
......
...@@ -8,12 +8,8 @@ module SharedProjectTab ...@@ -8,12 +8,8 @@ module SharedProjectTab
ensure_active_main_tab('Project') ensure_active_main_tab('Project')
end end
step 'the active main tab should be Files' do step 'the active main tab should be Code' do
ensure_active_main_tab('Files') ensure_active_main_tab('Code')
end
step 'the active main tab should be Commits' do
ensure_active_main_tab('Commits')
end end
step 'the active main tab should be Graphs' do step 'the active main tab should be Graphs' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment