Download as
Browse Code »

Commit d207a31fc97edf4e19a50c4a650d6a34b4f5a2cf

Authored by Dmitriy Zaporozhets
1 parent 7a167cf1
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix tests and tab highlight

Showing 4 changed files with 6 additions and 6 deletions   Show diff stats
app/helpers/tab_helper.rb
  Diff comments   View file @d207a31
... ... @@ -81,8 +81,8 @@ module TabHelper
81 81 end
82 82  
83 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 86 current_page?(project_repository_path(@project))
87 87 'active'
88 88 end
... ...
features/steps/shared/paths.rb
  Diff comments   View file @d207a31
... ... @@ -189,7 +189,7 @@ module SharedPaths
189 189 end
190 190  
191 191 step 'I visit project branches page' do
192   - visit branches_project_repository_path(@project)
  192 + visit project_branches_path(@project)
193 193 end
194 194  
195 195 step 'I visit compare refs page' do
... ...
spec/features/gitlab_flavored_markdown_spec.rb
  Diff comments   View file @d207a31
... ... @@ -41,7 +41,7 @@ describe "GitLab Flavored Markdown" do
41 41 end
42 42  
43 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 46 page.should have_link("##{issue.id}")
47 47 end
... ...
spec/features/security/project_access_spec.rb
  Diff comments   View file @d207a31
... ... @@ -187,7 +187,7 @@ describe "Application access" do
187 187 end
188 188  
189 189 describe "GET /project_code/repository/branches" do
190   - subject { branches_project_repository_path(project) }
  190 + subject { project_branches_path(project) }
191 191  
192 192 before do
193 193 # Speed increase
... ... @@ -429,7 +429,7 @@ describe "Application access" do
429 429 end
430 430  
431 431 describe "GET /project_code/repository/branches" do
432   - subject { branches_project_repository_path(project) }
  432 + subject { project_branches_path(project) }
433 433  
434 434 before do
435 435 # Speed increase
... ...