diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2018-05-09 15:37:28 +0200 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2018-05-09 15:37:28 +0200 |
| commit | 7923f70dfe5d9e3e4700cc7f7596c149075768b8 (patch) | |
| tree | 79d368a4f64cd79bcf984132a3c4b937b9c1355c | |
| parent | c2348322842c2148c1474ec2497cd43d87b0b737 (diff) | |
| download | gitlab-ce-7923f70dfe5d9e3e4700cc7f7596c149075768b8.tar.gz | |
Fix some tests in app/assets/javascripts/diffs/components/parallel_diff_view.vue
| -rw-r--r-- | app/assets/javascripts/diffs/components/parallel_diff_view.vue | 1 | ||||
| -rw-r--r-- | spec/support/helpers/merge_request_diff_helpers.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/diffs/components/parallel_diff_view.vue b/app/assets/javascripts/diffs/components/parallel_diff_view.vue index 3481a6be127..62756a314f1 100644 --- a/app/assets/javascripts/diffs/components/parallel_diff_view.vue +++ b/app/assets/javascripts/diffs/components/parallel_diff_view.vue @@ -159,6 +159,7 @@ export default { )" :key="line.left.lineCode || line.right.lineCode" class="notes_holder" + :class="hasDiscussion(line) ? '' : 'js-temp-notes-holder'" > <td class="notes_line old"></td> <td class="notes_content parallel old"> diff --git a/spec/support/helpers/merge_request_diff_helpers.rb b/spec/support/helpers/merge_request_diff_helpers.rb index c98aa503ed1..3b49d0b3319 100644 --- a/spec/support/helpers/merge_request_diff_helpers.rb +++ b/spec/support/helpers/merge_request_diff_helpers.rb @@ -2,7 +2,7 @@ module MergeRequestDiffHelpers def click_diff_line(line_holder, diff_side = nil) line = get_line_components(line_holder, diff_side) line[:content].hover - line[:num].find('.add-diff-note', visible: false).send_keys(:return) + line[:num].find('.js-add-diff-note-button', visible: false).send_keys(:return) end def get_line_components(line_holder, diff_side = nil) |