summaryrefslogtreecommitdiff
path: root/spec/features
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-07-28 17:49:52 +0000
committerRobert Speicher <robert@gitlab.com>2017-07-28 17:49:52 +0000
commit62e9bb16dcac64549b622ad44d984035e643c680 (patch)
tree1b9d12c7ae44bfd6d01d5a49ce5a4d0c1b2fb748 /spec/features
parentafdb3ccbaf2ec5445569f50ead31d68706dcd3d3 (diff)
parent8aaaefa5f68914613ab02a18c20244e733930fa8 (diff)
downloadgitlab-ce-62e9bb16dcac64549b622ad44d984035e643c680.tar.gz
Merge branch 'rs-fix-master' into 'master'
Fix spec/features/projects/branches_spec See merge request !13163
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/projects/branches_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/features/projects/branches_spec.rb b/spec/features/projects/branches_spec.rb
index 6e787de2dd6..ad4527a0b74 100644
--- a/spec/features/projects/branches_spec.rb
+++ b/spec/features/projects/branches_spec.rb
@@ -29,7 +29,7 @@ describe 'Branches' do
it 'sorts the branches by name' do
visit project_branches_path(project)
- click_button "Name" # Open sorting dropdown
+ click_button "Last updated" # Open sorting dropdown
click_link "Name"
sorted = repository.branches_sorted_by(:name).first(20).map do |branch|
@@ -41,7 +41,7 @@ describe 'Branches' do
it 'sorts the branches by last updated' do
visit project_branches_path(project)
- click_button "Name" # Open sorting dropdown
+ click_button "Last updated" # Open sorting dropdown
click_link "Last updated"
sorted = repository.branches_sorted_by(:updated_desc).first(20).map do |branch|
@@ -53,7 +53,7 @@ describe 'Branches' do
it 'sorts the branches by oldest updated' do
visit project_branches_path(project)
- click_button "Name" # Open sorting dropdown
+ click_button "Last updated" # Open sorting dropdown
click_link "Oldest updated"
sorted = repository.branches_sorted_by(:updated_asc).first(20).map do |branch|