summaryrefslogtreecommitdiff
path: root/features/project
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-01-28 16:21:04 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-01-28 16:21:04 +0000
commit3f6bb7bc86a61e406aafdbf2b5975755f4cbe7ad (patch)
treebf2a6e6d60e029f122603699ec04ac87fe54d4e4 /features/project
parentee8884c68e5f6027b06bccda5e3c373eaaf2653f (diff)
parentc3c92c7317df157e156c3a34ff9f4c562229479f (diff)
downloadgitlab-ce-3f6bb7bc86a61e406aafdbf2b5975755f4cbe7ad.tar.gz
Merge branch 'issue_5546' into 'master'
Save list sort in a cookie Closes #5546 See merge request !2537
Diffstat (limited to 'features/project')
-rw-r--r--features/project/issues/issues.feature22
-rw-r--r--features/project/merge_requests.feature22
2 files changed, 44 insertions, 0 deletions
diff --git a/features/project/issues/issues.feature b/features/project/issues/issues.feature
index 1502b0952cd..0b3d03aa2a5 100644
--- a/features/project/issues/issues.feature
+++ b/features/project/issues/issues.feature
@@ -60,6 +60,28 @@ Feature: Project Issues
Then I should see "Release 0.4" at the top
@javascript
+ Scenario: Visiting Issues after being sorted the list
+ Given I visit project "Shop" issues page
+ And I sort the list by "Oldest updated"
+ And I visit my project's home page
+ 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
+ And I sort the list by "Oldest updated"
+ And I visit dashboard merge requests page
+ Then The list should be sorted by "Oldest updated"
+
+ @javascript
Scenario: I search issue
Given I fill in issue search with "Re"
Then I should see "Release 0.4" in issues
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
index 4f780aa680f..ca1ee6b3c2b 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -85,6 +85,28 @@ Feature: Project Merge Requests
Then I should see "Bug NS-04" at the top
@javascript
+ Scenario: Visiting Merge Requests after being sorted the list
+ Given I visit project "Shop" merge requests page
+ And I sort the list by "Oldest updated"
+ And I visit my project's home page
+ 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
+ And I sort the list by "Oldest updated"
+ And I visit dashboard merge requests page
+ Then The list should be sorted by "Oldest updated"
+
+ @javascript
Scenario: Visiting Merge Requests after commenting on diffs
Given project "Shop" have "Bug NS-05" open merge request with diffs inside
And I visit merge request page "Bug NS-05"