diff options
-rw-r--r-- | app/assets/javascripts/diffs/components/parallel_diff_table_row.vue | 2 | ||||
-rw-r--r-- | qa/qa/page/merge_request/show.rb | 26 |
2 files changed, 27 insertions, 1 deletions
diff --git a/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue b/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue index fcc3b3e9117..f8af5fc434c 100644 --- a/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue +++ b/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue @@ -143,7 +143,7 @@ export default { :show-comment-button="true" :diff-view-type="parallelDiffViewType" line-position="right" - class="diff-line-num new_line" + class="diff-line-num new_line qa-new-diff-line" /> <td :id="line.right.lineCode" diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb index b52072d35ac..7f020a878c4 100644 --- a/qa/qa/page/merge_request/show.rb +++ b/qa/qa/page/merge_request/show.rb @@ -55,6 +55,32 @@ module QA element :labels_block end + view 'app/views/projects/merge_requests/show.html.haml' do + element :notes_tab + element :diffs_tab + end + + view 'app/assets/javascripts/diffs/components/diff_line_gutter_content.vue' do + element :diff_comment + end + + view 'app/assets/javascripts/notes/components/comment_form.vue' do + element :note_dropdown + element :discussion_option + end + + view 'app/assets/javascripts/notes/components/note_form.vue' do + element :reply_input + end + + view 'app/assets/javascripts/notes/components/noteable_discussion.vue' do + element :discussion_reply + end + + view 'app/assets/javascripts/diffs/components/parallel_diff_table_row.vue' do + element :new_diff_line + end + def fast_forward_possible? !has_text?('Fast-forward merge is not possible') end |