Commit c3c92c73 authored by Rubén Dávila's avatar Rubén Dávila

Make default sorting preference work for Issues and MRs.

parent 9ef46892
......@@ -410,10 +410,8 @@ class ApplicationController < ActionController::Base
private
def set_default_sort
key = if is_a_listing_page_for?('issues')
'issues_sort'
elsif is_a_listing_page_for?('merge_requests')
'merge_requests_sort'
key = if is_a_listing_page_for?('issues') || is_a_listing_page_for?('merge_requests')
'issuable_sort'
end
cookies[key] = params[:sort] if key && params[:sort].present?
......
......@@ -67,6 +67,13 @@ Feature: Project Issues
And I visit project "Shop" issues page
Then The list should be sorted by "Oldest updated"
@javascript
Scenario: Visiting Merge Requests after being sorted the list
Given I visit project "Shop" issues page
And I sort the list by "Oldest updated"
And I visit project "Shop" merge requests page
Then The list should be sorted by "Oldest updated"
@javascript
Scenario: Visiting Merge Requests from a differente Project after sorting
Given I visit project "Shop" merge requests page
......
......@@ -92,6 +92,13 @@ Feature: Project Merge Requests
And I visit project "Shop" merge requests page
Then The list should be sorted by "Oldest updated"
@javascript
Scenario: Visiting Issues after being sorted the list
Given I visit project "Shop" merge requests page
And I sort the list by "Oldest updated"
And I visit project "Shop" issues page
Then The list should be sorted by "Oldest updated"
@javascript
Scenario: Visiting Merge Requests from a differente Project after sorting
Given I visit project "Shop" merge requests page
......
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