summaryrefslogtreecommitdiff
path: root/features/project/merge_requests.feature
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-03-07 15:24:27 -0500
committerRobert Speicher <rspeicher@gmail.com>2016-03-07 15:33:26 -0500
commit56c4f22c80b0555d5d7cfbc7f443122a8b70072c (patch)
tree952387e1f8921e0bf98a239ac35ff4164a3dd446 /features/project/merge_requests.feature
parent903aa7c95e82949ca0a7b18e1f6d2f25fe1b04f4 (diff)
downloadgitlab-ce-56c4f22c80b0555d5d7cfbc7f443122a8b70072c.tar.gz
Remove redundant integration tests
These three tests were essentially checking that adding a note to something updated its `noteable`'s `updated_at` attribute. This is well-tested Rails behavior and we shouldn't feel the need to write an integration test to verify it. At most we should be ensuring that the association definition adds the `touch: true` option, which we now do in Note's unit test.
Diffstat (limited to 'features/project/merge_requests.feature')
-rw-r--r--features/project/merge_requests.feature19
1 files changed, 0 insertions, 19 deletions
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
index a69089f00c4..f8d9fe1854d 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -87,15 +87,6 @@ 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 being sorted the list
Given I visit project "Shop" merge requests page
And I sort the list by "Oldest updated"
@@ -129,16 +120,6 @@ Feature: Project Merge Requests
Then The list should be sorted by "Least popular"
@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"