kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix tests and tab highlight

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-07-16 22:25:59 +03:00
parent 7a167cf1f7
commit d207a31fc9
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/helpers/tab_helper.rb
View file

@ -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

2
features/steps/shared/paths.rb
View file

@ -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

2
spec/features/gitlab_flavored_markdown_spec.rb
View file

@ -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

4
spec/features/security/project_access_spec.rb
View file

@ -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