kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/features/project/merge_requests.feature

221 lines
9.1 KiB
Gherkin
Raw Normal View History

add spinach steps for remaining features
2012-09-10 09:35:23 -04:00
Feature: Project Merge Requests
Cucumber feature -> Merge Request
2012-08-09 01:13:29 -04:00
Background:
add spinach steps for remaining features
2012-09-10 09:35:23 -04:00
Given I sign in as a user
Cucumber feature -> Merge Request
2012-08-09 01:13:29 -04:00
And I own project "Shop"
And project "Shop" have "Bug NS-04" open merge request
And project "Shop" have "Feature NS-03" closed merge request
add spinach steps for remaining features
2012-09-10 09:35:23 -04:00
And I visit project "Shop" merge requests page
Cucumber feature -> Merge Request
2012-08-09 01:13:29 -04:00
Scenario: I should see open merge requests
Then I should see "Bug NS-04" in merge requests
And I should not see "Feature NS-03" in merge requests
Scenario: I should see closed merge requests
Given I click link "Closed"
Then I should see "Feature NS-03" in merge requests
And I should not see "Bug NS-04" in merge requests
Scenario: I should see all merge requests
Given I click link "All"
Then I should see "Feature NS-03" in merge requests
And I should see "Bug NS-04" in merge requests
Scenario: I visit merge request page
Given I click link "Bug NS-04"
Then I should see merge request "Bug NS-04"
Scenario: I close merge request page
Given I click link "Bug NS-04"
And I click link "Close"
Then I should see closed merge request "Bug NS-04"
Add tests to reopen MR Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-03 03:21:50 -05:00
Scenario: I reopen merge request page
Given I click link "Bug NS-04"
And I click link "Close"
Then I should see closed merge request "Bug NS-04"
When I click link "Reopen"
Then I should see reopened merge request "Bug NS-04"
Cucumber feature -> Merge Request
2012-08-09 01:13:29 -04:00
Scenario: I submit new unassigned merge request
Given I click link "New Merge Request"
And I submit new merge request "Wiki Feature"
Then I should see merge request "Wiki Feature"
refactor finders in spianch:merge_request.feature
2013-02-28 02:43:48 -05:00
@javascript
Scenario: I comment on a merge request
Given I visit merge request page "Bug NS-04"
And I leave a comment like "XML attached"
Then I should see comment "XML attached"
Cucumber feature -> Merge Request
2012-08-09 01:13:29 -04:00
Add merge request note feature
2012-10-29 17:23:49 -04:00
@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"
And I switch to the diff tab
Fix MR tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-31 12:19:40 -04:00
And I leave a comment like "Line is wrong" on diff
Add merge request note feature
2012-10-29 17:23:49 -04:00
And I switch to the merge request's comments tab
Fix MR tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-31 12:19:40 -04:00
Then I should see a discussion has started on diff
Add merge request note feature
2012-10-29 17:23:49 -04:00
@javascript
Scenario: I comment on a line of a commit in merge request
Given project "Shop" have "Bug NS-05" open merge request with diffs inside
And I visit merge request page "Bug NS-05"
Fix MR tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-31 12:19:40 -04:00
And I click on the commit in the merge request
And I leave a comment like "Line is wrong" on diff in commit
Add merge request note feature
2012-10-29 17:23:49 -04:00
And I switch to the merge request's comments tab
Fix MR tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-31 12:19:40 -04:00
Then I should see a discussion has started on commit diff
Add merge request note feature
2012-10-29 17:23:49 -04:00
@javascript
Scenario: I comment on a commit in merge request
Given project "Shop" have "Bug NS-05" open merge request with diffs inside
And I visit merge request page "Bug NS-05"
Fix MR tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-31 12:19:40 -04:00
And I click on the commit in the merge request
Fix MR spinach tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-23 05:55:43 -05:00
And I leave a comment on the diff page in commit
Add merge request note feature
2012-10-29 17:23:49 -04:00
And I switch to the merge request's comments tab
Fix MR tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-31 12:19:40 -04:00
Then I should see a discussion has started on commit
Tests for accept MR with custom message Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-14 04:49:54 -05:00
@javascript
Scenario: I accept merge request with custom commit message
Given project "Shop" have "Bug NS-05" open merge request with diffs inside
And merge request "Bug NS-05" is mergeable
And I visit merge request page "Bug NS-05"
And merge request is mergeable
Then I modify merge commit message
And I accept this merge request
Then I should see merged request
Headers have ids and link to their own id.
2014-02-04 02:48:33 -05:00
# Markdown
Scenario: Headers inside the description should have ids generated for them.
When I visit merge request page "Bug NS-04"
Then Header "Description header" should have correct id and link
@javascript
Scenario: Headers inside comments should not have ids generated for them.
Given I visit merge request page "Bug NS-04"
And I leave a comment with a header containing "Comment with a header"
Then The comment with the header should not have an ID
Add button for toggling inline comments in diff view. This is useful when there are many comments and they're becoming a distraction when trying to read the diff.
2014-01-09 11:50:27 -05:00
Add Spinach tests for task lists
2014-10-06 02:59:03 -04:00
Scenario: Merge request description should render task checkboxes
Given project "Shop" has "MR-task-open" open MR with task markdown
When I visit merge request page "MR-task-open"
Then I should see task checkboxes in the description
Scenario: Merge request notes should not render task checkboxes
Given project "Shop" has "MR-task-open" open MR with task markdown
When I visit merge request page "MR-task-open"
Then I should not see task checkboxes in the comment
Add button for toggling inline comments in diff view. This is useful when there are many comments and they're becoming a distraction when trying to read the diff.
2014-01-09 11:50:27 -05:00
# Toggling inline comments
@javascript
Scenario: I hide comments on a merge request diff with comments in a single file
Given project "Shop" have "Bug NS-05" open merge request with diffs inside
And I visit merge request page "Bug NS-05"
And I switch to the diff tab
And I leave a comment like "Line is wrong" on line 39 of the second file
And I click link "Hide inline discussion" of the second file
Preventing some duplication in MR feature tests by adding a different comment.
2014-10-06 09:07:48 -04:00
Then I should not see a comment like "Line is wrong here" in the second file
Add button for toggling inline comments in diff view. This is useful when there are many comments and they're becoming a distraction when trying to read the diff.
2014-01-09 11:50:27 -05:00
@javascript
Scenario: I show comments on a merge request diff with comments in a single file
Given project "Shop" have "Bug NS-05" open merge request with diffs inside
And I visit merge request page "Bug NS-05"
And I switch to the diff tab
And I leave a comment like "Line is wrong" on line 39 of the second file
Then I should see a comment like "Line is wrong" in the second file
@javascript
Scenario: I hide comments on a merge request diff with comments in multiple files
Given project "Shop" have "Bug NS-05" open merge request with diffs inside
And I visit merge request page "Bug NS-05"
And I switch to the diff tab
And I leave a comment like "Line is correct" on line 12 of the first file
And I leave a comment like "Line is wrong" on line 39 of the second file
And I click link "Hide inline discussion" of the second file
Preventing some duplication in MR feature tests by adding a different comment.
2014-10-06 09:07:48 -04:00
Then I should not see a comment like "Line is wrong here" in the second file
Add button for toggling inline comments in diff view. This is useful when there are many comments and they're becoming a distraction when trying to read the diff.
2014-01-09 11:50:27 -05:00
And I should still see a comment like "Line is correct" in the first file
@javascript
Scenario: I show comments on a merge request diff with comments in multiple files
Given project "Shop" have "Bug NS-05" open merge request with diffs inside
And I visit merge request page "Bug NS-05"
And I switch to the diff tab
And I leave a comment like "Line is correct" on line 12 of the first file
And I leave a comment like "Line is wrong" on line 39 of the second file
And I click link "Hide inline discussion" of the second file
And I click link "Show inline discussion" of the second file
Then I should see a comment like "Line is wrong" in the second file
And I should still see a comment like "Line is correct" in the first file
diff unfold
2014-08-02 11:12:01 -04:00
@javascript
Scenario: I unfold diff
Given project "Shop" have "Bug NS-05" open merge request with diffs inside
And I visit merge request page "Bug NS-05"
And I switch to the diff tab
And I unfold diff
Then I should see additional file lines
Add one feature test.
2014-09-12 14:12:31 -04:00
@javascript
Scenario: I show comments on a merge request side-by-side diff with comments in multiple files
Given project "Shop" have "Bug NS-05" open merge request with diffs inside
And I visit merge request page "Bug NS-05"
And I switch to the diff tab
And I leave a comment like "Line is correct" on line 12 of the first file
And I leave a comment like "Line is wrong" on line 39 of the second file
And I click Side-by-side Diff tab
Then I should see comments on the side-by-side diff page
Add Spinach tests for task lists
2014-10-06 02:59:03 -04:00
# Task status in issues list
Scenario: Merge requests list should display task status
Given project "Shop" has "MR-task-open" open MR with task markdown
When I visit project "Shop" merge requests page
Refactor task list tests and coffeescript
2014-10-06 20:19:12 -04:00
Then I should see the task status for the Taskable
Add Spinach tests for task lists
2014-10-06 02:59:03 -04:00
# Toggling task items
@javascript
Scenario: Task checkboxes should be enabled for an open merge request
Given project "Shop" has "MR-task-open" open MR with task markdown
When I visit merge request page "MR-task-open"
Then Task checkboxes should be enabled
@javascript
Scenario: Task checkboxes should be disabled for a closed merge request
Given project "Shop" has "MR-task-open" open MR with task markdown
And I visit merge request page "MR-task-open"
And I click link "Close"
Then Task checkboxes should be disabled
Add Markdown preview to more forms Enable Markdown previews when creating and editing issues, merge requests, and milestones, and when editing notes.
2014-10-15 03:21:21 -04:00
# Description preview
@javascript
Scenario: I can't preview without text
Given I visit merge request page "Bug NS-04"
Refactor Markdown preview tests Create a new shared module for common issue/merge request behavior, use `expect` syntax instead of `should`, and avoid `visible: false` in the `have_css` matcher.
2014-10-17 00:10:50 -04:00
And I click link "Edit" for the merge request
Add Markdown preview to more forms Enable Markdown previews when creating and editing issues, merge requests, and milestones, and when editing notes.
2014-10-15 03:21:21 -04:00
And I haven't written any description text
Fix more Markdown preview tests
2014-10-18 19:43:45 -04:00
Then The Markdown preview tab should say there is nothing to do
Add Markdown preview to more forms Enable Markdown previews when creating and editing issues, merge requests, and milestones, and when editing notes.
2014-10-15 03:21:21 -04:00
@javascript
Scenario: I can preview with text
Given I visit merge request page "Bug NS-04"
Refactor Markdown preview tests Create a new shared module for common issue/merge request behavior, use `expect` syntax instead of `should`, and avoid `visible: false` in the `have_css` matcher.
2014-10-17 00:10:50 -04:00
And I click link "Edit" for the merge request
Fix more Markdown preview tests
2014-10-18 19:43:45 -04:00
And I write a description like ":+1: Nice"
Then The Markdown preview tab should display rendered Markdown
Add Markdown preview to more forms Enable Markdown previews when creating and editing issues, merge requests, and milestones, and when editing notes.
2014-10-15 03:21:21 -04:00
@javascript
Scenario: I preview a merge request description
Given I visit merge request page "Bug NS-04"
Refactor Markdown preview tests Create a new shared module for common issue/merge request behavior, use `expect` syntax instead of `should`, and avoid `visible: false` in the `have_css` matcher.
2014-10-17 00:10:50 -04:00
And I click link "Edit" for the merge request
Add Markdown preview to more forms Enable Markdown previews when creating and editing issues, merge requests, and milestones, and when editing notes.
2014-10-15 03:21:21 -04:00
And I preview a description text like "Bug fixed :smile:"
Then I should see the Markdown preview
And I should not see the Markdown text field
@javascript
Scenario: I can edit after preview
Given I visit merge request page "Bug NS-04"
Refactor Markdown preview tests Create a new shared module for common issue/merge request behavior, use `expect` syntax instead of `should`, and avoid `visible: false` in the `have_css` matcher.
2014-10-17 00:10:50 -04:00
And I click link "Edit" for the merge request
Add Markdown preview to more forms Enable Markdown previews when creating and editing issues, merge requests, and milestones, and when editing notes.
2014-10-15 03:21:21 -04:00
And I preview a description text like "Bug fixed :smile:"
Fix more Markdown preview tests
2014-10-18 19:43:45 -04:00
Then I should see the Markdown write tab
Copy permalink