Commit 62e9bb16 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'rs-fix-master' into 'master'

Fix spec/features/projects/branches_spec

See merge request !13163
parents afdb3ccb 8aaaefa5
...@@ -29,7 +29,7 @@ describe 'Branches' do ...@@ -29,7 +29,7 @@ describe 'Branches' do
it 'sorts the branches by name' do it 'sorts the branches by name' do
visit project_branches_path(project) visit project_branches_path(project)
click_button "Name" # Open sorting dropdown click_button "Last updated" # Open sorting dropdown
click_link "Name" click_link "Name"
sorted = repository.branches_sorted_by(:name).first(20).map do |branch| sorted = repository.branches_sorted_by(:name).first(20).map do |branch|
...@@ -41,7 +41,7 @@ describe 'Branches' do ...@@ -41,7 +41,7 @@ describe 'Branches' do
it 'sorts the branches by last updated' do it 'sorts the branches by last updated' do
visit project_branches_path(project) visit project_branches_path(project)
click_button "Name" # Open sorting dropdown click_button "Last updated" # Open sorting dropdown
click_link "Last updated" click_link "Last updated"
sorted = repository.branches_sorted_by(:updated_desc).first(20).map do |branch| sorted = repository.branches_sorted_by(:updated_desc).first(20).map do |branch|
...@@ -53,7 +53,7 @@ describe 'Branches' do ...@@ -53,7 +53,7 @@ describe 'Branches' do
it 'sorts the branches by oldest updated' do it 'sorts the branches by oldest updated' do
visit project_branches_path(project) visit project_branches_path(project)
click_button "Name" # Open sorting dropdown click_button "Last updated" # Open sorting dropdown
click_link "Oldest updated" click_link "Oldest updated"
sorted = repository.branches_sorted_by(:updated_asc).first(20).map do |branch| sorted = repository.branches_sorted_by(:updated_asc).first(20).map do |branch|
......
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