Commit d207a31fc97edf4e19a50c4a650d6a34b4f5a2cf
1 parent
7a167cf1
Exists in
master
and in
4 other branches
Fix tests and tab highlight
Showing
4 changed files
with
6 additions
and
6 deletions
Show diff stats
app/helpers/tab_helper.rb
| @@ -81,8 +81,8 @@ module TabHelper | @@ -81,8 +81,8 @@ module TabHelper | ||
| 81 | end | 81 | end |
| 82 | 82 | ||
| 83 | def branches_tab_class | 83 | def branches_tab_class |
| 84 | - if current_page?(branches_project_repository_path(@project)) || | ||
| 85 | - current_controller?(:protected_branches) || | 84 | + if current_controller?(:protected_branches) || |
| 85 | + current_controller?(:branches) || | ||
| 86 | current_page?(project_repository_path(@project)) | 86 | current_page?(project_repository_path(@project)) |
| 87 | 'active' | 87 | 'active' |
| 88 | end | 88 | end |
features/steps/shared/paths.rb
| @@ -189,7 +189,7 @@ module SharedPaths | @@ -189,7 +189,7 @@ module SharedPaths | ||
| 189 | end | 189 | end |
| 190 | 190 | ||
| 191 | step 'I visit project branches page' do | 191 | step 'I visit project branches page' do |
| 192 | - visit branches_project_repository_path(@project) | 192 | + visit project_branches_path(@project) |
| 193 | end | 193 | end |
| 194 | 194 | ||
| 195 | step 'I visit compare refs page' do | 195 | step 'I visit compare refs page' do |
spec/features/gitlab_flavored_markdown_spec.rb
| @@ -41,7 +41,7 @@ describe "GitLab Flavored Markdown" do | @@ -41,7 +41,7 @@ describe "GitLab Flavored Markdown" do | ||
| 41 | end | 41 | end |
| 42 | 42 | ||
| 43 | it "should render title in repositories#branches" do | 43 | it "should render title in repositories#branches" do |
| 44 | - visit branches_project_repository_path(project) | 44 | + visit project_branches_path(project) |
| 45 | 45 | ||
| 46 | page.should have_link("##{issue.id}") | 46 | page.should have_link("##{issue.id}") |
| 47 | end | 47 | end |
spec/features/security/project_access_spec.rb
| @@ -187,7 +187,7 @@ describe "Application access" do | @@ -187,7 +187,7 @@ describe "Application access" do | ||
| 187 | end | 187 | end |
| 188 | 188 | ||
| 189 | describe "GET /project_code/repository/branches" do | 189 | describe "GET /project_code/repository/branches" do |
| 190 | - subject { branches_project_repository_path(project) } | 190 | + subject { project_branches_path(project) } |
| 191 | 191 | ||
| 192 | before do | 192 | before do |
| 193 | # Speed increase | 193 | # Speed increase |
| @@ -429,7 +429,7 @@ describe "Application access" do | @@ -429,7 +429,7 @@ describe "Application access" do | ||
| 429 | end | 429 | end |
| 430 | 430 | ||
| 431 | describe "GET /project_code/repository/branches" do | 431 | describe "GET /project_code/repository/branches" do |
| 432 | - subject { branches_project_repository_path(project) } | 432 | + subject { project_branches_path(project) } |
| 433 | 433 | ||
| 434 | before do | 434 | before do |
| 435 | # Speed increase | 435 | # Speed increase |