Fix tests and tab highlight
This commit is contained in:
parent
7a167cf1f7
commit
d207a31fc9
4 changed files with 6 additions and 6 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue