diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-01-22 18:43:21 -0500 |
|---|---|---|
| committer | Rubén Dávila <rdavila84@gmail.com> | 2016-01-22 18:43:21 -0500 |
| commit | c3c92c7317df157e156c3a34ff9f4c562229479f (patch) | |
| tree | c9e6581ee971c46ed9d00408b0ab77e18c1f7090 | |
| parent | 9ef468922c2ed5a02250414576fcf98ad1ac23cb (diff) | |
| download | gitlab-ce-issue_5546.tar.gz | |
Make default sorting preference work for Issues and MRs.issue_5546
| -rw-r--r-- | app/controllers/application_controller.rb | 6 | ||||
| -rw-r--r-- | features/project/issues/issues.feature | 7 | ||||
| -rw-r--r-- | features/project/merge_requests.feature | 7 |
3 files changed, 16 insertions, 4 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 540cc30bed5..824175c8a6c 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -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? diff --git a/features/project/issues/issues.feature b/features/project/issues/issues.feature index a91c5e0095d..0b3d03aa2a5 100644 --- a/features/project/issues/issues.feature +++ b/features/project/issues/issues.feature @@ -68,6 +68,13 @@ Feature: Project Issues 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 And I sort the list by "Oldest updated" diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature index 2938a22caa2..ca1ee6b3c2b 100644 --- a/features/project/merge_requests.feature +++ b/features/project/merge_requests.feature @@ -93,6 +93,13 @@ Feature: Project Merge Requests 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 And I sort the list by "Oldest updated" |