Commit 08223299 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'priority-to-label-priority' into 'master'

Rename priority sorting option to label priority

See merge request !9746
parents e84afa8b bfd33645
...@@ -50,7 +50,7 @@ module SortingHelper ...@@ -50,7 +50,7 @@ module SortingHelper
end end
def sort_title_priority def sort_title_priority
'Priority' 'Label priority'
end end
def sort_title_oldest_updated def sort_title_oldest_updated
......
---
title: Rename priority sorting option to label priority
merge_request:
author:
...@@ -32,7 +32,7 @@ feature 'Issue prioritization', feature: true do ...@@ -32,7 +32,7 @@ feature 'Issue prioritization', feature: true do
visit namespace_project_issues_path(project.namespace, project, sort: 'priority') visit namespace_project_issues_path(project.namespace, project, sort: 'priority')
# Ensure we are indicating that issues are sorted by priority # Ensure we are indicating that issues are sorted by priority
expect(page).to have_selector('.dropdown-toggle', text: 'Priority') expect(page).to have_selector('.dropdown-toggle', text: 'Label priority')
page.within('.issues-holder') do page.within('.issues-holder') do
issue_titles = all('.issues-list .issue-title-text').map(&:text) issue_titles = all('.issues-list .issue-title-text').map(&:text)
...@@ -70,7 +70,7 @@ feature 'Issue prioritization', feature: true do ...@@ -70,7 +70,7 @@ feature 'Issue prioritization', feature: true do
login_as user login_as user
visit namespace_project_issues_path(project.namespace, project, sort: 'priority') visit namespace_project_issues_path(project.namespace, project, sort: 'priority')
expect(page).to have_selector('.dropdown-toggle', text: 'Priority') expect(page).to have_selector('.dropdown-toggle', text: 'Label priority')
page.within('.issues-holder') do page.within('.issues-holder') do
issue_titles = all('.issues-list .issue-title-text').map(&:text) issue_titles = all('.issues-list .issue-title-text').map(&:text)
......
...@@ -56,8 +56,8 @@ describe "Dashboard > User sorts todos", feature: true do ...@@ -56,8 +56,8 @@ describe "Dashboard > User sorts todos", feature: true do
expect(results_list.all('p')[4]).to have_content("merge_request_1") expect(results_list.all('p')[4]).to have_content("merge_request_1")
end end
it "sorts by priority" do it "sorts by label priority" do
click_link "Priority" click_link "Label priority"
results_list = page.find('.todos-list') results_list = page.find('.todos-list')
expect(results_list.all('p')[0]).to have_content("issue_3") expect(results_list.all('p')[0]).to have_content("issue_3")
...@@ -85,8 +85,8 @@ describe "Dashboard > User sorts todos", feature: true do ...@@ -85,8 +85,8 @@ describe "Dashboard > User sorts todos", feature: true do
visit dashboard_todos_path visit dashboard_todos_path
end end
it "doesn't mix issues and merge requests priorities" do it "doesn't mix issues and merge requests label priorities" do
click_link "Priority" click_link "Label priority"
results_list = page.find('.todos-list') results_list = page.find('.todos-list')
expect(results_list.all('p')[0]).to have_content("issue_1") expect(results_list.all('p')[0]).to have_content("issue_1")
......
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