diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-01-20 15:06:49 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-01-20 15:06:49 +0000 |
| commit | b4faa59728c07893fe0f6d83648bf4d76e36320a (patch) | |
| tree | 91ddc330527189518eaefe796d65d11c30266ef0 /features/project | |
| parent | f8f96994f7aa53b1588762266bf60418960cf30d (diff) | |
| parent | c26816f7a732b339b14d7d6d928f5a86f490d77c (diff) | |
| download | gitlab-ce-b4faa59728c07893fe0f6d83648bf4d76e36320a.tar.gz | |
Merge branch 'issue_3749' into 'master'
Update Issues/MRs updated_at field when notes are generated
Closes #3749 and #9130
See merge request !2493
Diffstat (limited to 'features/project')
| -rw-r--r-- | features/project/issues/issues.feature | 8 | ||||
| -rw-r--r-- | features/project/merge_requests.feature | 19 |
2 files changed, 27 insertions, 0 deletions
diff --git a/features/project/issues/issues.feature b/features/project/issues/issues.feature index ab234bc7507..1502b0952cd 100644 --- a/features/project/issues/issues.feature +++ b/features/project/issues/issues.feature @@ -52,6 +52,14 @@ Feature: Project Issues And I should see an error alert section within the comment form @javascript + Scenario: Visiting Issues after leaving a comment + Given I visit issue page "Release 0.4" + And I leave a comment like "XML attached" + And I visit project "Shop" issues page + And I sort the list by "Last updated" + Then I should see "Release 0.4" at the top + + @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 aa9078b878f..f1629a26f10 100644 --- a/features/project/merge_requests.feature +++ b/features/project/merge_requests.feature @@ -76,6 +76,25 @@ Feature: Project Merge Requests Then I should see comment "XML attached" @javascript + Scenario: Visiting Merge Requests after leaving a comment + Given project "Shop" have "Bug NS-05" open merge request with diffs inside + And I visit merge request page "Bug NS-04" + And I leave a comment like "XML attached" + And I visit project "Shop" merge requests page + And I sort the list by "Last updated" + Then I should see "Bug NS-04" at the top + + @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" + And I click on the Changes tab + And I leave a comment like "Line is wrong" on diff + And I visit project "Shop" merge requests page + And I sort the list by "Last updated" + Then I should see "Bug NS-05" at the top + + @javascript Scenario: I comment on a merge request diff Given project "Shop" have "Bug NS-05" open merge request with diffs inside And I visit merge request page "Bug NS-05" |