2013-01-14 23:11:35 +00:00
|
|
|
module SharedDiffNote
|
|
|
|
include Spinach::DSL
|
2014-07-31 15:07:24 +00:00
|
|
|
include RepoHelpers
|
2013-01-14 23:11:35 +00:00
|
|
|
|
2014-09-21 21:40:22 +00:00
|
|
|
step 'I cancel the diff comment' do
|
2015-06-12 05:36:00 +00:00
|
|
|
page.within(diff_file_selector) do
|
2013-04-11 07:45:18 +00:00
|
|
|
find(".js-close-discussion-note-form").click
|
2013-01-14 23:11:35 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2014-09-21 21:40:22 +00:00
|
|
|
step 'I delete a diff comment' do
|
2013-04-11 07:45:18 +00:00
|
|
|
find('.note').hover
|
|
|
|
find(".js-note-delete").click
|
2013-01-14 23:11:35 +00:00
|
|
|
end
|
|
|
|
|
2014-09-21 21:40:22 +00:00
|
|
|
step 'I haven\'t written any diff comment text' do
|
2015-06-12 05:36:00 +00:00
|
|
|
page.within(diff_file_selector) do
|
2013-01-14 23:11:35 +00:00
|
|
|
fill_in "note[note]", with: ""
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2014-09-21 21:40:22 +00:00
|
|
|
step 'I leave a diff comment like "Typo, please fix"' do
|
2015-06-19 02:13:32 +00:00
|
|
|
page.within(diff_file_selector) do
|
|
|
|
click_diff_line(sample_commit.line_code)
|
|
|
|
|
2016-06-20 17:23:46 +00:00
|
|
|
page.within("form[data-line-code='#{sample_commit.line_code}']") do
|
2015-06-19 02:13:32 +00:00
|
|
|
fill_in "note[note]", with: "Typo, please fix"
|
2016-07-03 20:01:36 +00:00
|
|
|
find(".js-comment-button").click
|
2015-06-19 02:13:32 +00:00
|
|
|
end
|
2013-01-14 23:11:35 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2015-06-05 22:24:05 +00:00
|
|
|
step 'I leave a diff comment in a parallel view on the left side like "Old comment"' do
|
2016-06-18 15:19:57 +00:00
|
|
|
click_parallel_diff_line(sample_commit.del_line_code, 'old')
|
2016-07-07 22:05:34 +00:00
|
|
|
page.within("#{diff_file_selector} form[data-line-code='#{sample_commit.del_line_code}']") do
|
2015-06-05 22:24:05 +00:00
|
|
|
fill_in "note[note]", with: "Old comment"
|
2016-07-03 20:01:36 +00:00
|
|
|
find(".js-comment-button").click
|
2015-06-05 22:24:05 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
step 'I leave a diff comment in a parallel view on the right side like "New comment"' do
|
|
|
|
click_parallel_diff_line(sample_commit.line_code, 'new')
|
2016-06-20 17:23:46 +00:00
|
|
|
page.within("#{diff_file_selector} form[data-line-code='#{sample_commit.line_code}']") do
|
2015-06-05 22:24:05 +00:00
|
|
|
fill_in "note[note]", with: "New comment"
|
2016-07-03 20:01:36 +00:00
|
|
|
find(".js-comment-button").click
|
2015-06-05 22:24:05 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2014-09-21 21:40:22 +00:00
|
|
|
step 'I preview a diff comment text like "Should fix it :smile:"' do
|
2015-06-19 02:13:32 +00:00
|
|
|
page.within(diff_file_selector) do
|
|
|
|
click_diff_line(sample_commit.line_code)
|
|
|
|
|
2016-06-20 17:23:46 +00:00
|
|
|
page.within("form[data-line-code='#{sample_commit.line_code}']") do
|
2015-06-19 02:13:32 +00:00
|
|
|
fill_in "note[note]", with: "Should fix it :smile:"
|
|
|
|
find('.js-md-preview-button').click
|
|
|
|
end
|
2013-01-14 23:11:35 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2014-09-21 21:40:22 +00:00
|
|
|
step 'I preview another diff comment text like "DRY this up"' do
|
2015-06-19 02:13:32 +00:00
|
|
|
page.within(diff_file_selector) do
|
|
|
|
click_diff_line(sample_commit.del_line_code)
|
2013-04-11 07:45:18 +00:00
|
|
|
|
2016-06-20 17:23:46 +00:00
|
|
|
page.within("form[data-line-code='#{sample_commit.del_line_code}']") do
|
2015-06-19 02:13:32 +00:00
|
|
|
fill_in "note[note]", with: "DRY this up"
|
|
|
|
find('.js-md-preview-button').click
|
|
|
|
end
|
2013-01-14 23:11:35 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2014-09-21 21:40:22 +00:00
|
|
|
step 'I open a diff comment form' do
|
2015-06-19 02:13:32 +00:00
|
|
|
page.within(diff_file_selector) do
|
|
|
|
click_diff_line(sample_commit.line_code)
|
|
|
|
end
|
2013-01-14 23:11:35 +00:00
|
|
|
end
|
|
|
|
|
2014-09-21 21:40:22 +00:00
|
|
|
step 'I open another diff comment form' do
|
2015-06-19 02:13:32 +00:00
|
|
|
page.within(diff_file_selector) do
|
|
|
|
click_diff_line(sample_commit.del_line_code)
|
|
|
|
end
|
2013-01-14 23:11:35 +00:00
|
|
|
end
|
|
|
|
|
2014-09-21 21:40:22 +00:00
|
|
|
step 'I write a diff comment like ":-1: I don\'t like this"' do
|
2015-06-12 05:36:00 +00:00
|
|
|
page.within(diff_file_selector) do
|
2013-01-14 23:11:35 +00:00
|
|
|
fill_in "note[note]", with: ":-1: I don\'t like this"
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2015-12-03 08:30:30 +00:00
|
|
|
step 'I write a diff comment like ":smile:"' do
|
|
|
|
page.within(diff_file_selector) do
|
|
|
|
click_diff_line(sample_commit.line_code)
|
|
|
|
|
2016-06-20 17:23:46 +00:00
|
|
|
page.within("form[data-line-code='#{sample_commit.line_code}']") do
|
2015-12-03 08:30:30 +00:00
|
|
|
fill_in 'note[note]', with: ':smile:'
|
2016-03-04 13:52:29 +00:00
|
|
|
click_button('Comment')
|
2015-12-03 08:30:30 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2014-09-21 21:40:22 +00:00
|
|
|
step 'I submit the diff comment' do
|
2015-06-12 05:36:00 +00:00
|
|
|
page.within(diff_file_selector) do
|
2016-03-04 13:52:29 +00:00
|
|
|
click_button("Comment")
|
2013-01-14 23:11:35 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2014-09-21 21:40:22 +00:00
|
|
|
step 'I should not see the diff comment form' do
|
2015-06-12 05:36:00 +00:00
|
|
|
page.within(diff_file_selector) do
|
2015-06-12 04:44:13 +00:00
|
|
|
expect(page).not_to have_css("form.new_note")
|
2013-01-14 23:11:35 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2014-10-17 04:36:52 +00:00
|
|
|
step 'The diff comment preview tab should say there is nothing to do' do
|
2015-06-12 05:36:00 +00:00
|
|
|
page.within(diff_file_selector) do
|
2014-10-17 04:36:52 +00:00
|
|
|
find('.js-md-preview-button').click
|
|
|
|
expect(find('.js-md-preview')).to have_content('Nothing to preview.')
|
2013-01-14 23:11:35 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2014-09-21 21:40:22 +00:00
|
|
|
step 'I should not see the diff comment text field' do
|
2015-06-12 05:36:00 +00:00
|
|
|
page.within(diff_file_selector) do
|
2014-09-29 21:58:01 +00:00
|
|
|
expect(find('.js-note-text')).not_to be_visible
|
2013-01-14 23:11:35 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2014-09-21 21:40:22 +00:00
|
|
|
step 'I should only see one diff form' do
|
2015-06-12 05:36:00 +00:00
|
|
|
page.within(diff_file_selector) do
|
2016-03-30 15:20:43 +00:00
|
|
|
expect(page).to have_css("form.new-note", count: 1)
|
2013-01-14 23:11:35 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2014-09-21 21:40:22 +00:00
|
|
|
step 'I should see a diff comment form with ":-1: I don\'t like this"' do
|
2015-06-12 05:36:00 +00:00
|
|
|
page.within(diff_file_selector) do
|
2015-06-12 04:44:13 +00:00
|
|
|
expect(page).to have_field("note[note]", with: ":-1: I don\'t like this")
|
2013-01-14 23:11:35 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2014-09-21 21:40:22 +00:00
|
|
|
step 'I should see a diff comment saying "Typo, please fix"' do
|
2015-06-12 05:36:00 +00:00
|
|
|
page.within("#{diff_file_selector} .note") do
|
2015-06-12 04:44:13 +00:00
|
|
|
expect(page).to have_content("Typo, please fix")
|
2013-01-14 23:11:35 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2015-06-05 22:24:05 +00:00
|
|
|
step 'I should see a diff comment on the left side saying "Old comment"' do
|
|
|
|
page.within("#{diff_file_selector} .notes_content.parallel.old") do
|
|
|
|
expect(page).to have_content("Old comment")
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
step 'I should see a diff comment on the right side saying "New comment"' do
|
|
|
|
page.within("#{diff_file_selector} .notes_content.parallel.new") do
|
|
|
|
expect(page).to have_content("New comment")
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-04-01 19:27:39 +00:00
|
|
|
step 'I should see a discussion reply button' do
|
2015-06-12 05:36:00 +00:00
|
|
|
page.within(diff_file_selector) do
|
2016-04-01 19:27:39 +00:00
|
|
|
expect(page).to have_button('Reply...')
|
2013-01-14 23:11:35 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2014-09-21 21:40:22 +00:00
|
|
|
step 'I should see a temporary diff comment form' do
|
2015-06-12 05:36:00 +00:00
|
|
|
page.within(diff_file_selector) do
|
2016-03-30 15:20:43 +00:00
|
|
|
expect(page).to have_css(".js-temp-notes-holder form.new-note")
|
2013-01-14 23:11:35 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2014-09-21 21:40:22 +00:00
|
|
|
step 'I should see an empty diff comment form' do
|
2015-06-12 05:36:00 +00:00
|
|
|
page.within(diff_file_selector) do
|
2015-06-12 04:44:13 +00:00
|
|
|
expect(page).to have_field("note[note]", with: "")
|
2013-01-14 23:11:35 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2014-09-21 21:40:22 +00:00
|
|
|
step 'I should see the cancel comment button' do
|
2015-06-12 05:36:00 +00:00
|
|
|
page.within("#{diff_file_selector} form") do
|
2015-06-12 04:44:13 +00:00
|
|
|
expect(page).to have_css(".js-close-discussion-note-form", text: "Cancel")
|
2013-01-14 23:11:35 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2014-09-21 21:40:22 +00:00
|
|
|
step 'I should see the diff comment preview' do
|
2015-06-12 05:36:00 +00:00
|
|
|
page.within("#{diff_file_selector} form") do
|
2014-10-21 02:53:17 +00:00
|
|
|
expect(page).to have_css('.js-md-preview', visible: true)
|
2013-01-14 23:11:35 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2014-10-17 04:36:52 +00:00
|
|
|
step 'I should see the diff comment write tab' do
|
2015-06-12 05:36:00 +00:00
|
|
|
page.within(diff_file_selector) do
|
2014-10-21 02:53:17 +00:00
|
|
|
expect(page).to have_css('.js-md-write-button', visible: true)
|
2013-01-14 23:11:35 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2014-10-17 04:36:52 +00:00
|
|
|
step 'The diff comment preview tab should display rendered Markdown' do
|
2015-06-12 05:36:00 +00:00
|
|
|
page.within(diff_file_selector) do
|
2014-10-17 04:36:52 +00:00
|
|
|
find('.js-md-preview-button').click
|
2014-10-21 02:53:17 +00:00
|
|
|
expect(find('.js-md-preview')).to have_css('img.emoji', visible: true)
|
2013-01-14 23:11:35 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2014-09-21 21:40:22 +00:00
|
|
|
step 'I should see two separate previews' do
|
2015-06-12 05:36:00 +00:00
|
|
|
page.within(diff_file_selector) do
|
2014-10-21 02:53:17 +00:00
|
|
|
expect(page).to have_css('.js-md-preview', visible: true, count: 2)
|
2014-10-18 23:24:12 +00:00
|
|
|
expect(page).to have_content('Should fix it')
|
|
|
|
expect(page).to have_content('DRY this up')
|
2013-01-14 23:11:35 +00:00
|
|
|
end
|
|
|
|
end
|
2014-06-24 17:22:33 +00:00
|
|
|
|
2015-12-03 08:30:30 +00:00
|
|
|
step 'I should see a diff comment with an emoji image' do
|
|
|
|
page.within("#{diff_file_selector} .note") do
|
|
|
|
expect(page).to have_xpath("//img[@alt=':smile:']")
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2015-06-05 22:24:05 +00:00
|
|
|
step 'I click side-by-side diff button' do
|
2016-07-03 20:01:36 +00:00
|
|
|
find('#parallel-diff-btn').click
|
2015-06-05 22:24:05 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
step 'I see side-by-side diff button' do
|
|
|
|
expect(page).to have_content "Side-by-side"
|
|
|
|
end
|
|
|
|
|
2014-06-24 17:22:33 +00:00
|
|
|
def diff_file_selector
|
2015-06-19 02:13:32 +00:00
|
|
|
'.diff-file:nth-of-type(1)'
|
2014-07-31 15:07:24 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
def click_diff_line(code)
|
2016-07-03 20:01:36 +00:00
|
|
|
find(".line_holder[id='#{code}'] td:nth-of-type(1)").trigger 'mouseover'
|
|
|
|
find(".line_holder[id='#{code}'] button").trigger 'click'
|
2014-06-24 17:22:33 +00:00
|
|
|
end
|
2015-06-05 22:24:05 +00:00
|
|
|
|
|
|
|
def click_parallel_diff_line(code, line_type)
|
2016-07-03 20:01:36 +00:00
|
|
|
find(".line_content.parallel.#{line_type}[data-line-code='#{code}']").trigger 'mouseover'
|
|
|
|
find(".line_holder.parallel button[data-line-code='#{code}']").trigger 'click'
|
2015-06-05 22:24:05 +00:00
|
|
|
end
|
2013-01-14 23:11:35 +00:00
|
|
|
end
|