Commit b70bba04 authored by Mark Lapierre's avatar Mark Lapierre

Split reply_to_discussion method

The method has 2 parts, entering text and submitting the comment.
They have to be separable because the batch comments test performs
different actions after entering text - it doesn't always immediately
submit the comment.
parent bb289fd5
...@@ -32,9 +32,13 @@ module QA ...@@ -32,9 +32,13 @@ module QA
click_element :comment_button click_element :comment_button
end end
def reply_to_discussion(reply_text) def type_reply_to_discussion(reply_text)
all_elements(:discussion_reply).last.click all_elements(:discussion_reply).last.click
fill_element :reply_input, reply_text fill_element :reply_input, reply_text
end
def reply_to_discussion(reply_text)
type_reply_to_discussion(reply_text)
click_element :reply_comment_button click_element :reply_comment_button
end end
......
...@@ -23,12 +23,12 @@ module QA ...@@ -23,12 +23,12 @@ module QA
show_page.start_discussion("I'm starting a new discussion") show_page.start_discussion("I'm starting a new discussion")
expect(show_page).to have_content("I'm starting a new discussion") expect(show_page).to have_content("I'm starting a new discussion")
show_page.reply_to_discussion("Could you please check this?") show_page.type_reply_to_discussion("Could you please check this?")
show_page.comment_now show_page.comment_now
expect(show_page).to have_content("Could you please check this?") expect(show_page).to have_content("Could you please check this?")
expect(show_page).to have_content("0/1 discussion resolved") expect(show_page).to have_content("0/1 discussion resolved")
show_page.reply_to_discussion("Could you also check that?") show_page.type_reply_to_discussion("Could you also check that?")
show_page.resolve_review_discussion show_page.resolve_review_discussion
show_page.start_review show_page.start_review
expect(show_page).to have_content("Could you also check that?") expect(show_page).to have_content("Could you also check that?")
...@@ -40,7 +40,7 @@ module QA ...@@ -40,7 +40,7 @@ module QA
show_page.comment_now show_page.comment_now
expect(show_page).to have_content("Can you check this line of code?") expect(show_page).to have_content("Can you check this line of code?")
show_page.reply_to_discussion("And this syntax as well?") show_page.type_reply_to_discussion("And this syntax as well?")
show_page.resolve_review_discussion show_page.resolve_review_discussion
show_page.start_review show_page.start_review
expect(show_page).to have_content("And this syntax as well?") expect(show_page).to have_content("And this syntax as well?")
...@@ -49,7 +49,7 @@ module QA ...@@ -49,7 +49,7 @@ module QA
show_page.submit_pending_reviews show_page.submit_pending_reviews
expect(show_page).to have_content("2/2 discussions resolved") expect(show_page).to have_content("2/2 discussions resolved")
show_page.reply_to_discussion("Unresolving this discussion") show_page.type_reply_to_discussion("Unresolving this discussion")
show_page.unresolve_review_discussion show_page.unresolve_review_discussion
show_page.comment_now show_page.comment_now
expect(show_page).to have_content("1/2 discussions resolved") expect(show_page).to have_content("1/2 discussions resolved")
...@@ -58,7 +58,7 @@ module QA ...@@ -58,7 +58,7 @@ module QA
Page::MergeRequest::Show.perform do |show_page| Page::MergeRequest::Show.perform do |show_page|
show_page.go_to_discussions_tab show_page.go_to_discussions_tab
show_page.reply_to_discussion("Planning to discard this comment") show_page.type_reply_to_discussion("Planning to discard this comment")
show_page.start_review show_page.start_review
expect(show_page).to have_content("Finish review 1") expect(show_page).to have_content("Finish review 1")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment