Commit d207a31f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix tests and tab highlight

parent 7a167cf1
......@@ -81,8 +81,8 @@ module TabHelper
end
def branches_tab_class
if current_page?(branches_project_repository_path(@project)) ||
current_controller?(:protected_branches) ||
if current_controller?(:protected_branches) ||
current_controller?(:branches) ||
current_page?(project_repository_path(@project))
'active'
end
......
......@@ -189,7 +189,7 @@ module SharedPaths
end
step 'I visit project branches page' do
visit branches_project_repository_path(@project)
visit project_branches_path(@project)
end
step 'I visit compare refs page' do
......
......@@ -41,7 +41,7 @@ describe "GitLab Flavored Markdown" do
end
it "should render title in repositories#branches" do
visit branches_project_repository_path(project)
visit project_branches_path(project)
page.should have_link("##{issue.id}")
end
......
......@@ -187,7 +187,7 @@ describe "Application access" do
end
describe "GET /project_code/repository/branches" do
subject { branches_project_repository_path(project) }
subject { project_branches_path(project) }
before do
# Speed increase
......@@ -429,7 +429,7 @@ describe "Application access" do
end
describe "GET /project_code/repository/branches" do
subject { branches_project_repository_path(project) }
subject { project_branches_path(project) }
before do
# Speed increase
......
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