diff options
Diffstat (limited to 'features')
| -rw-r--r-- | features/project/merge_requests.feature | 324 | ||||
| -rw-r--r-- | features/steps/project/merge_requests.rb | 632 |
2 files changed, 0 insertions, 956 deletions
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature deleted file mode 100644 index 349fa2663a7..00000000000 --- a/features/project/merge_requests.feature +++ /dev/null @@ -1,324 +0,0 @@ -@project_merge_requests -Feature: Project Merge Requests - Background: - Given I sign in as a user - 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 - And I visit project "Shop" merge requests page - - 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 CI status for merge requests - Given project "Shop" have "Bug NS-05" open merge request with diffs inside - Given "Bug NS-05" has CI status - When I visit project "Shop" merge requests page - Then I should see merge request "Bug NS-05" with CI status - - Scenario: I should not see target branch name when it is project's default branch - Then I should see "Bug NS-04" in merge requests - And I should not see "master" branch - - Scenario: I should see target branch when it is different from default - Given project "Shop" have "Bug NS-06" open merge request - When I visit project "Shop" merge requests page - Then I should see "feature_conflict" branch - - @javascript - Scenario: I should not see the numbers of diverged commits if the branch is rebased on the target - Given project "Shop" have "Bug NS-07" open merge request with rebased branch - When I visit merge request page "Bug NS-07" - Then I should not see the diverged commits count - - @javascript - Scenario: I should see the numbers of diverged commits if the branch diverged from the target - Given project "Shop" have "Bug NS-08" open merge request with diverged branch - When I visit merge request page "Bug NS-08" - Then I should see the diverged commits count - - @javascript - Scenario: I should see rejected 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 - - @javascript - 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 - - @javascript - Scenario: I visit an open merge request page - Given I click link "Bug NS-04" - Then I should see merge request "Bug NS-04" - - @javascript - Scenario: I visit a merged merge request page - Given project "Shop" have "Feature NS-05" merged merge request - And I click link "Merged" - And I click link "Feature NS-05" - Then I should see merge request "Feature NS-05" - - @javascript - 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" - - @javascript - 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" - - @javascript - 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" - - @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" - - @javascript - Scenario: Visiting Merge Requests after being sorted the list - Given I visit project "Shop" merge requests page - And I sort the list by "Last updated" - And I visit my project's home page - And I visit project "Shop" merge requests page - Then The list should be sorted by "Last updated" - - @javascript - Scenario: Visiting Merge Requests from a different Project after sorting - Given I visit project "Shop" merge requests page - And I sort the list by "Last updated" - And I visit dashboard merge requests page - Then The list should be sorted by "Last updated" - - @javascript - Scenario: Sort merge requests by upvotes - Given project "Shop" have "Bug NS-05" open merge request with diffs inside - And project "Shop" have "Bug NS-06" open merge request - And merge request "Bug NS-04" have 2 upvotes and 1 downvote - And merge request "Bug NS-06" have 1 upvote and 2 downvotes - And I sort the list by "Popularity" - Then The list should be sorted by "Popularity" - - @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 click on the Changes tab - And I leave a comment like "Line is wrong" on diff - And I switch to the merge request's comments tab - Then I should see a discussion has started on diff - And I should see a badge of "1" next to the discussion link - - @javascript - Scenario: I see a new comment on merge request diff from another user in the discussion tab - Given project "Shop" have "Bug NS-05" open merge request with diffs inside - And I visit merge request page "Bug NS-05" - And user "John Doe" leaves a comment like "Line is wrong" on diff - Then I should see a discussion by user "John Doe" has started on diff - And I should see a badge of "1" next to the discussion link - - @javascript - Scenario: I edit a 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 click on the Changes tab - And I leave a comment like "Line is wrong" on diff - And I change the comment "Line is wrong" to "Typo, please fix" on diff - Then I should not see a diff comment saying "Line is wrong" - And I should see a diff comment saying "Typo, please fix" - - @javascript - Scenario: I delete a 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 click on the Changes tab - And I leave a comment like "Line is wrong" on diff - And I should see a badge of "1" next to the discussion link - And I delete the comment "Line is wrong" on diff - And I click on the Discussion tab - Then I should not see any discussion - And I should see a badge of "0" next to the discussion link - - @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" - And I click on the commit in the merge request - And I leave a comment like "Line is wrong" on diff in commit - And I switch to the merge request's comments tab - Then I should see a discussion has started on commit diff - - @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" - And I click on the commit in the merge request - And I leave a comment on the diff page in commit - And I switch to the merge request's comments tab - Then I should see a discussion has started on commit - - @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 - - # Markdown - - @javascript - 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 - - # 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 click on the Changes tab - And I leave a comment like "Line is wrong" on line 39 of the third file - And I click link "Hide inline discussion" of the third file - Then I should not see a comment like "Line is wrong here" in the third file - - @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 click on the Changes tab - And I leave a comment like "Line is wrong" on line 39 of the third file - Then I should see a comment like "Line is wrong" in the third 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 click on the Changes tab - And I leave a comment like "Line is correct" on line 12 of the second file - And I leave a comment like "Line is wrong" on line 39 of the third file - And I click link "Hide inline discussion" of the third file - Then I should not see a comment like "Line is wrong here" in the third file - And I should still see a comment like "Line is correct" in the second 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 click on the Changes tab - And I leave a comment like "Line is correct" on line 12 of the second file - And I leave a comment like "Line is wrong" on line 39 of the third file - And I click link "Hide inline discussion" of the third file - And I click link "Show inline discussion" of the third file - Then I should see a comment like "Line is wrong" in the third file - And I should still see a comment like "Line is correct" in the second file - - @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 click on the Changes tab - And I unfold diff - Then I should see additional file lines - - @javascript - Scenario: I unfold diff in Side-by-Side view - 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 click Side-by-side Diff tab - And I unfold diff - Then I should see additional file lines - - @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 click on the Changes tab - And I leave a comment like "Line is correct" on line 12 of the second file - And I leave a comment like "Line is wrong" on line 39 of the third file - And I click Side-by-side Diff tab - Then I should see comments on the side-by-side diff page - - @javascript - Scenario: I view diffs on a merge request - 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 - Then I should see the proper Inline and Side-by-side links - - # Description preview - - @javascript - Scenario: I can't preview without text - Given I visit merge request page "Bug NS-04" - And I click link "Edit" for the merge request - And I haven't written any description text - Then The Markdown preview tab should say there is nothing to do - - @javascript - Scenario: I can preview with text - Given I visit merge request page "Bug NS-04" - And I click link "Edit" for the merge request - And I write a description like ":+1: Nice" - Then The Markdown preview tab should display rendered Markdown - - @javascript - Scenario: I preview a merge request description - Given I visit merge request page "Bug NS-04" - And I click link "Edit" for the merge request - 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" - And I click link "Edit" for the merge request - And I preview a description text like "Bug fixed :smile:" - Then I should see the Markdown write tab - - @javascript - Scenario: I can unsubscribe from merge request - Given I visit merge request page "Bug NS-04" - Then I should see that I am subscribed - When I click button "Unsubscribe" - Then I should see that I am unsubscribed - - @javascript - Scenario: I can change the target branch - Given I visit merge request page "Bug NS-04" - And I click link "Edit" for the merge request - When I click the "Target branch" dropdown - And I select a new target branch - Then I should see new target branch changes - - @javascript - Scenario: I can close merge request after commenting - Given I visit merge request page "Bug NS-04" - And I leave a comment like "XML attached" - Then I should see comment "XML attached" - And I click link "Close" - Then I should see closed merge request "Bug NS-04" diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb deleted file mode 100644 index dde918e3d41..00000000000 --- a/features/steps/project/merge_requests.rb +++ /dev/null @@ -1,632 +0,0 @@ -class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps - include SharedAuthentication - include SharedIssuable - include SharedProject - include SharedNote - include SharedPaths - include SharedMarkdown - include SharedDiffNote - include SharedUser - include WaitForRequests - - after do - wait_for_requests if javascript_test? - end - - step 'I click link "New Merge Request"' do - page.within '.nav-controls' do - page.has_link?('New Merge Request') ? click_link("New Merge Request") : click_link('New merge request') - end - end - - step 'I click link "Bug NS-04"' do - click_link "Bug NS-04" - end - - step 'I click link "Feature NS-05"' do - click_link "Feature NS-05" - end - - step 'I click link "All"' do - find('.issues-state-filters [data-state="all"] span', text: 'All').click - # Waits for load - expect(find('.issues-state-filters > .active')).to have_content 'All' - end - - step 'I click link "Merged"' do - find('#state-merged').trigger('click') - end - - step 'I click link "Closed"' do - find('.issues-state-filters [data-state="closed"] span', text: 'Closed').click - end - - step 'I should see merge request "Wiki Feature"' do - page.within '.merge-request' do - expect(page).to have_content "Wiki Feature" - end - wait_for_requests - end - - step 'I should see closed merge request "Bug NS-04"' do - expect(page).to have_content "Bug NS-04" - expect(page).to have_content "Closed by" - wait_for_requests - end - - step 'I should see merge request "Bug NS-04"' do - expect(page).to have_content "Bug NS-04" - wait_for_requests - end - - step 'I should see merge request "Feature NS-05"' do - expect(page).to have_content "Feature NS-05" - wait_for_requests - end - - step 'I should not see "master" branch' do - expect(find('.issuable-info')).not_to have_content "master" - end - - step 'I should see "feature_conflict" branch' do - expect(page).to have_content "feature_conflict" - end - - step 'I should see "Bug NS-04" in merge requests' do - expect(page).to have_content "Bug NS-04" - end - - step 'I should see "Feature NS-03" in merge requests' do - expect(page).to have_content "Feature NS-03" - end - - step 'I should not see "Feature NS-03" in merge requests' do - expect(page).not_to have_content "Feature NS-03" - end - - step 'I should not see "Bug NS-04" in merge requests' do - expect(page).not_to have_content "Bug NS-04" - end - - step 'I should see that I am subscribed' do - expect(find('.issuable-subscribe-button span')).to have_content 'Unsubscribe' - end - - step 'I should see that I am unsubscribed' do - expect(find('.issuable-subscribe-button span')).to have_content 'Subscribe' - end - - step 'I click button "Unsubscribe"' do - click_on "Unsubscribe" - wait_for_requests - end - - step 'I click link "Close"' do - first(:css, '.close-mr-link').click - end - - step 'I submit new merge request "Wiki Feature"' do - find('.js-source-branch').click - find('.dropdown-source-branch .dropdown-content a', text: 'fix').click - - find('.js-target-branch').click - first('.dropdown-target-branch .dropdown-content a', text: 'feature').click - - click_button "Compare branches" - fill_in "merge_request_title", with: "Wiki Feature" - click_button "Submit merge request" - end - - step 'project "Shop" have "Bug NS-04" open merge request' do - create(:merge_request, - title: "Bug NS-04", - source_project: project, - target_project: project, - source_branch: 'fix', - target_branch: 'merge-test', - author: project.users.first, - description: "# Description header" - ) - end - - step 'project "Shop" have "Bug NS-06" open merge request' do - create(:merge_request, - title: "Bug NS-06", - source_project: project, - target_project: project, - source_branch: 'fix', - target_branch: 'feature_conflict', - author: project.users.first, - description: "# Description header" - ) - end - - step 'project "Shop" have "Bug NS-05" open merge request with diffs inside' do - create(:merge_request_with_diffs, - title: "Bug NS-05", - source_project: project, - target_project: project, - author: project.users.first, - source_branch: 'merge-test') - end - - step 'project "Shop" have "Feature NS-05" merged merge request' do - create(:merged_merge_request, - title: "Feature NS-05", - source_project: project, - target_project: project, - author: project.users.first) - end - - step 'project "Shop" have "Bug NS-07" open merge request with rebased branch' do - create(:merge_request, :rebased, - title: "Bug NS-07", - source_project: project, - target_project: project, - author: project.users.first) - end - - step 'project "Shop" have "Bug NS-08" open merge request with diverged branch' do - create(:merge_request, :diverged, - title: "Bug NS-08", - source_project: project, - target_project: project, - author: project.users.first) - end - - step 'project "Shop" have "Feature NS-03" closed merge request' do - create(:closed_merge_request, - title: "Feature NS-03", - source_project: project, - target_project: project, - author: project.users.first) - end - - step 'project "Community" has "Bug CO-01" open merge request with diffs inside' do - project = Project.find_by(name: "Community") - create(:merge_request_with_diffs, - title: "Bug CO-01", - source_project: project, - target_project: project, - author: project.users.first) - end - - step 'merge request "Bug NS-04" have 2 upvotes and 1 downvote' do - merge_request = MergeRequest.find_by(title: 'Bug NS-04') - create_list(:award_emoji, 2, awardable: merge_request) - create(:award_emoji, :downvote, awardable: merge_request) - end - - step 'merge request "Bug NS-06" have 1 upvote and 2 downvotes' do - awardable = MergeRequest.find_by(title: 'Bug NS-06') - create(:award_emoji, awardable: awardable) - create_list(:award_emoji, 2, :downvote, awardable: awardable) - end - - step 'The list should be sorted by "Least popular"' do - page.within '.mr-list' do - page.within 'li.merge-request:nth-child(1)' do - expect(page).to have_content 'Bug NS-06' - expect(page).to have_content '1 2' - end - - page.within 'li.merge-request:nth-child(2)' do - expect(page).to have_content 'Bug NS-04' - expect(page).to have_content '2 1' - end - - page.within 'li.merge-request:nth-child(3)' do - expect(page).to have_content 'Bug NS-05' - expect(page).not_to have_content '0 0' - end - end - end - - step 'The list should be sorted by "Popularity"' do - page.within '.mr-list' do - page.within 'li.merge-request:nth-child(1)' do - expect(page).to have_content 'Bug NS-04' - expect(page).to have_content '2 1' - end - - page.within 'li.merge-request:nth-child(2)' do - expect(page).to have_content 'Bug NS-06' - expect(page).to have_content '1 2' - end - - page.within 'li.merge-request:nth-child(3)' do - expect(page).to have_content 'Bug NS-05' - expect(page).not_to have_content '0 0' - end - end - end - - step 'I click on the Changes tab' do - page.within '.merge-request-tabs' do - click_link 'Changes' - end - - # Waits for load - expect(page).to have_css('.tab-content #diffs.active') - end - - step 'I should see the proper Inline and Side-by-side links' do - expect(page).to have_css('#parallel-diff-btn', count: 1) - expect(page).to have_css('#inline-diff-btn', count: 1) - end - - step 'I switch to the merge request\'s comments tab' do - visit project_merge_request_path(project, merge_request) - end - - step 'I click on the commit in the merge request' do - page.within '.merge-request-tabs' do - click_link 'Commits' - end - - page.within '.commits' do - click_link Commit.truncate_sha(sample_commit.id) - end - end - - step 'I leave a comment on the diff page' do - init_diff_note - leave_comment "One comment to rule them all" - end - - step 'I leave a comment on the diff page in commit' do - click_diff_line(sample_commit.line_code) - leave_comment "One comment to rule them all" - end - - step 'I leave a comment like "Line is wrong" on diff' do - init_diff_note - leave_comment "Line is wrong" - end - - step 'user "John Doe" leaves a comment like "Line is wrong" on diff' do - mr = MergeRequest.find_by(title: "Bug NS-05") - create(:diff_note_on_merge_request, project: project, - noteable: mr, - author: user_exists("John Doe"), - note: 'Line is wrong') - end - - step 'I leave a comment like "Line is wrong" on diff in commit' do - click_diff_line(sample_commit.line_code) - leave_comment "Line is wrong" - end - - step 'I change the comment "Line is wrong" to "Typo, please fix" on diff' do - page.within('.diff-file:nth-of-type(5) .note') do - find('.js-note-edit').click - - page.within('.current-note-edit-form', visible: true) do - fill_in 'note_note', with: 'Typo, please fix' - click_button 'Save comment' - end - - expect(page).not_to have_button 'Save comment', disabled: true, visible: true - end - end - - step 'I should not see a diff comment saying "Line is wrong"' do - page.within('.diff-file:nth-of-type(5) .note') do - expect(page).not_to have_visible_content 'Line is wrong' - end - end - - step 'I should see a diff comment saying "Typo, please fix"' do - page.within('.diff-file:nth-of-type(5) .note') do - expect(page).to have_visible_content 'Typo, please fix' - end - end - - step 'I delete the comment "Line is wrong" on diff' do - page.within('.diff-file:nth-of-type(5) .note') do - find('.more-actions').click - find('.more-actions .dropdown-menu li', match: :first) - - find('.js-note-delete').click - end - end - - step 'I click on the Discussion tab' do - page.within '.merge-request-tabs' do - find('.notes-tab').trigger('click') - end - - # Waits for load - expect(page).to have_css('.tab-content #notes.active') - end - - step 'I should not see any discussion' do - expect(page).not_to have_css('.notes .discussion') - end - - step 'I should see a discussion has started on diff' do - page.within(".notes .discussion") do - page.should have_content "#{current_user.name} #{current_user.to_reference} started a discussion" - page.should have_content sample_commit.line_code_path - page.should have_content "Line is wrong" - end - end - - step 'I should see a discussion by user "John Doe" has started on diff' do - # Trigger a refresh of notes - execute_script("$(document).trigger('visibilitychange');") - wait_for_requests - page.within(".notes .discussion") do - page.should have_content "#{user_exists("John Doe").name} #{user_exists("John Doe").to_reference} started a discussion" - page.should have_content sample_commit.line_code_path - page.should have_content "Line is wrong" - end - end - - step 'I should see a badge of "1" next to the discussion link' do - expect_discussion_badge_to_have_counter("1") - wait_for_requests - end - - step 'I should see a badge of "0" next to the discussion link' do - expect_discussion_badge_to_have_counter("0") - wait_for_requests - end - - step 'I should see a discussion has started on commit diff' do - page.within(".notes .discussion") do - page.should have_content "#{current_user.name} #{current_user.to_reference} started a discussion on commit" - page.should have_content sample_commit.line_code_path - page.should have_content "Line is wrong" - wait_for_requests - end - end - - step 'I should see a discussion has started on commit' do - page.within(".notes .discussion") do - page.should have_content "#{current_user.name} #{current_user.to_reference} started a discussion on commit" - page.should have_content "One comment to rule them all" - wait_for_requests - end - end - - step 'merge request is mergeable' do - expect(page).to have_button 'Merge' - end - - step 'I modify merge commit message' do - click_button "Modify commit message" - fill_in 'Commit message', with: 'wow such merge' - end - - step 'merge request "Bug NS-05" is mergeable' do - merge_request.mark_as_mergeable - end - - step 'I accept this merge request' do - page.within '.mr-state-widget' do - click_button "Merge" - end - end - - step 'I should see merged request' do - page.within '.status-box' do - expect(page).to have_content "Merged" - wait_for_requests - end - end - - step 'I click link "Reopen"' do - first(:css, '.reopen-mr-link').trigger('click') - end - - step 'I should see reopened merge request "Bug NS-04"' do - page.within '.status-box' do - expect(page).to have_content "Open" - end - wait_for_requests - end - - step 'I click link "Hide inline discussion" of the third file' do - page.within '.files>div:nth-child(3)' do - find('.js-toggle-diff-comments').trigger('click') - end - end - - step 'I click link "Show inline discussion" of the third file' do - page.within '.files>div:nth-child(3)' do - find('.js-toggle-diff-comments').trigger('click') - end - end - - step 'I should not see a comment like "Line is wrong" in the third file' do - page.within '.files>div:nth-child(3)' do - expect(page).not_to have_visible_content "Line is wrong" - end - end - - step 'I should see a comment like "Line is wrong" in the third file' do - page.within '.files>div:nth-child(3) .note-body > .note-text' do - expect(page).to have_visible_content "Line is wrong" - wait_for_requests - end - end - - step 'I should not see a comment like "Line is wrong here" in the third file' do - page.within '.files>div:nth-child(3)' do - expect(page).not_to have_visible_content "Line is wrong here" - end - end - - step 'I should see a comment like "Line is wrong here" in the third file' do - page.within '.files>div:nth-child(3) .note-body > .note-text' do - expect(page).to have_visible_content "Line is wrong here" - end - end - - step 'I leave a comment like "Line is correct" on line 12 of the second file' do - init_diff_note_first_file - - page.within(".js-discussion-note-form") do - fill_in "note_note", with: "Line is correct" - click_button "Comment" - end - - wait_for_requests - - page.within ".files>div:nth-child(2) .note-body > .note-text" do - expect(page).to have_content "Line is correct" - end - end - - step 'I leave a comment like "Line is wrong" on line 39 of the third file' do - init_diff_note_second_file - - page.within(".js-discussion-note-form") do - fill_in "note_note", with: "Line is wrong on here" - click_button "Comment" - end - - wait_for_requests - end - - step 'I should still see a comment like "Line is correct" in the second file' do - page.within '.files>div:nth-child(2) .note-body > .note-text' do - expect(page).to have_visible_content "Line is correct" - end - end - - step 'I unfold diff' do - expect(page).to have_css('.js-unfold') - - first('.js-unfold').click - end - - step 'I should see additional file lines' do - expect(first('.text-file')).to have_content('.bundle') - end - - step 'I click Side-by-side Diff tab' do - find('a', text: 'Side-by-side').trigger('click') - - # Waits for load - expect(page).to have_css('.parallel') - end - - step 'I should see comments on the side-by-side diff page' do - page.within '.files>div:nth-child(2) .parallel .note-body > .note-text' do - expect(page).to have_visible_content "Line is correct" - wait_for_requests - end - end - - step 'I fill in merge request search with "Fe"' do - fill_in 'issuable_search', with: "Fe" - page.within '.merge-requests-holder' do - find('.merge-request') - end - end - - step 'I click the "Target branch" dropdown' do - expect(page).to have_content('Target branch') - first('.target_branch').click - end - - step 'I select a new target branch' do - select "feature", from: "merge_request_target_branch" - click_button 'Save' - end - - step 'I should see new target branch changes' do - expect(page).to have_content 'Request to merge fix into feature' - expect(page).to have_content 'changed target branch from merge-test to feature' - wait_for_requests - end - - step 'I click on "Email Patches"' do - click_link "Email Patches" - end - - step 'I click on "Plain Diff"' do - click_link "Plain Diff" - end - - step 'I should see a patch diff' do - expect(page).to have_content('diff --git') - end - - step '"Bug NS-05" has CI status' do - project = merge_request.source_project - project.enable_ci - - pipeline = - create(:ci_pipeline, - project: project, - sha: merge_request.diff_head_sha, - ref: merge_request.source_branch, - head_pipeline_of: merge_request) - - create :ci_build, pipeline: pipeline - end - - step 'I should see merge request "Bug NS-05" with CI status' do - page.within ".mr-list" do - expect(page).to have_link "Pipeline: pending" - end - end - - step 'I should see the diverged commits count' do - page.within ".mr-source-target" do - expect(page).to have_content /([0-9]+ commits behind)/ - end - - wait_for_requests - end - - step 'I should not see the diverged commits count' do - page.within ".mr-source-target" do - expect(page).not_to have_content /([0-9]+ commit[s]? behind)/ - end - - wait_for_requests - end - - def merge_request - @merge_request ||= MergeRequest.find_by!(title: "Bug NS-05") - end - - def init_diff_note - click_diff_line(sample_commit.line_code) - end - - def leave_comment(message) - page.within(".js-discussion-note-form", visible: true) do - fill_in "note_note", with: message - click_button "Comment" - end - - wait_for_requests - - page.within(".notes_holder", visible: true) do - expect(page).to have_content message - end - end - - def init_diff_note_first_file - click_diff_line(sample_compare.changes[0][:line_code]) - end - - def init_diff_note_second_file - click_diff_line(sample_compare.changes[1][:line_code]) - end - - def have_visible_content(text) - have_css("*", text: text, visible: true) - end - - def expect_discussion_badge_to_have_counter(value) - page.within(".notes-tab .badge") do - page.should have_content value - end - end -end |