Commit fdc94907 authored by Phil Hughes's avatar Phil Hughes

Fixed issue with not being able to sort and filter

parent 471d7a5b
......@@ -69,7 +69,7 @@ issuable_created = false
updateStateFilters: ->
stateFilters = $('.issues-state-filters')
stateFilters = $('.issues-state-filters, .dropdown-menu-sort')
newParams = {}
paramKeys = ['author_id', 'milestone_title', 'assignee_id', 'issue_search']
......
......@@ -6,26 +6,35 @@
- else
= sort_title_recently_created
%b.caret
%ul.dropdown-menu.dropdown-menu-align-right
%ul.dropdown-menu.dropdown-menu-align-right.dropdown-menu-sort
%li
= link_to page_filter_path(sort: sort_value_recently_created) do
= sort_title_recently_created
%li
= link_to page_filter_path(sort: sort_value_oldest_created) do
= sort_title_oldest_created
%li
= link_to page_filter_path(sort: sort_value_recently_updated) do
= sort_title_recently_updated
%li
= link_to page_filter_path(sort: sort_value_oldest_updated) do
= sort_title_oldest_updated
%li
= link_to page_filter_path(sort: sort_value_milestone_soon) do
= sort_title_milestone_soon
%li
= link_to page_filter_path(sort: sort_value_milestone_later) do
= sort_title_milestone_later
- if controller.controller_name == 'issues' || controller.action_name == 'issues'
%li
= link_to page_filter_path(sort: sort_value_due_date_soon) do
= sort_title_due_date_soon
%li
= link_to page_filter_path(sort: sort_value_due_date_later) do
= sort_title_due_date_later
%li
= link_to page_filter_path(sort: sort_value_upvotes) do
= sort_title_upvotes
%li
= link_to page_filter_path(sort: sort_value_downvotes) do
= sort_title_downvotes
......@@ -190,7 +190,9 @@ describe 'Filter issues', feature: true do
expect(page).to_not have_selector('.issue')
end
end
end
context 'text and dropdown options', js: true do
it 'should filter by text and label' do
fill_in 'issue_search', with: 'Bug'
......@@ -260,4 +262,37 @@ describe 'Filter issues', feature: true do
end
end
end
describe 'filter issues and sort', js: true do
before do
label = create(:label, project: project, title: 'bug')
bug_one = create(:issue, title: "Frontend", project: project)
bug_two = create(:issue, title: "Bug 2", project: project)
bug_one.labels << project.labels.find_by(title: 'bug')
bug_two.labels << project.labels.find_by(title: 'bug')
visit namespace_project_issues_path(project.namespace, project)
end
it 'should be able to filter and sort issues' do
click_button 'Label'
page.within '.labels-filter' do
click_link 'bug'
end
page.within '.issues-list' do
expect(page).to have_selector('.issue', count: 2)
end
click_button 'Last created'
page.within '.dropdown-menu-sort' do
click_link 'Oldest created'
end
page.within '.issues-list' do
expect(first('.issue')).to have_content('Frontend')
end
end
end
end
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