summaryrefslogtreecommitdiff
path: root/spec/features/merge_request/user_comments_on_diff_spec.rb
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-10-03 10:05:43 +0100
committerPhil Hughes <me@iamphill.com>2018-10-03 10:05:43 +0100
commit33c4c5b8f30c07ff30de4cd26494becd3ad058c0 (patch)
treeb8c380912b47b697d8e2d2c7e41149e69be32040 /spec/features/merge_request/user_comments_on_diff_spec.rb
parent974fe0797079f4f7ddc57b45d15ee7d39a06e78a (diff)
downloadgitlab-ce-33c4c5b8f30c07ff30de4cd26494becd3ad058c0.tar.gz
Added file tree to merge request diffs
This file tree displays all the diff files in a tree like format Each file is taken and converted into a tree with folders Each folder can be toggled open & closed Clicking a file will scroll to the diff file & highlight with a glow affect Searching the tree list will search only files & return a list of the files without any folders Each file row contains an icon to show changed, new file or deleted Each row will also contain the added & removed lines count Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14249
Diffstat (limited to 'spec/features/merge_request/user_comments_on_diff_spec.rb')
-rw-r--r--spec/features/merge_request/user_comments_on_diff_spec.rb18
1 files changed, 9 insertions, 9 deletions
diff --git a/spec/features/merge_request/user_comments_on_diff_spec.rb b/spec/features/merge_request/user_comments_on_diff_spec.rb
index 441b080bee5..00cf368e8c9 100644
--- a/spec/features/merge_request/user_comments_on_diff_spec.rb
+++ b/spec/features/merge_request/user_comments_on_diff_spec.rb
@@ -28,7 +28,7 @@ describe 'User comments on a diff', :js do
click_button('Comment')
end
- page.within('.files > div:nth-child(3)') do
+ page.within('.diff-files-holder > div:nth-child(3)') do
expect(page).to have_content('Line is wrong')
find('.js-btn-vue-toggle-comments').click
@@ -49,7 +49,7 @@ describe 'User comments on a diff', :js do
wait_for_requests
- page.within('.files > div:nth-child(2) .note-body > .note-text') do
+ page.within('.diff-files-holder > div:nth-child(2) .note-body > .note-text') do
expect(page).to have_content('Line is correct')
end
@@ -63,7 +63,7 @@ describe 'User comments on a diff', :js do
wait_for_requests
# Hide the comment.
- page.within('.files > div:nth-child(3)') do
+ page.within('.diff-files-holder > div:nth-child(3)') do
find('.js-btn-vue-toggle-comments').click
expect(page).not_to have_content('Line is wrong')
@@ -71,21 +71,21 @@ describe 'User comments on a diff', :js do
# At this moment a user should see only one comment.
# The other one should be hidden.
- page.within('.files > div:nth-child(2) .note-body > .note-text') do
+ page.within('.diff-files-holder > div:nth-child(2) .note-body > .note-text') do
expect(page).to have_content('Line is correct')
end
# Show the comment.
- page.within('.files > div:nth-child(3)') do
+ page.within('.diff-files-holder > div:nth-child(3)') do
find('.js-btn-vue-toggle-comments').click
end
# Now both the comments should be shown.
- page.within('.files > div:nth-child(3) .note-body > .note-text') do
+ page.within('.diff-files-holder > div:nth-child(3) .note-body > .note-text') do
expect(page).to have_content('Line is wrong')
end
- page.within('.files > div:nth-child(2) .note-body > .note-text') do
+ page.within('.diff-files-holder > div:nth-child(2) .note-body > .note-text') do
expect(page).to have_content('Line is correct')
end
@@ -95,11 +95,11 @@ describe 'User comments on a diff', :js do
wait_for_requests
- page.within('.files > div:nth-child(3) .parallel .note-body > .note-text') do
+ page.within('.diff-files-holder > div:nth-child(3) .parallel .note-body > .note-text') do
expect(page).to have_content('Line is wrong')
end
- page.within('.files > div:nth-child(2) .parallel .note-body > .note-text') do
+ page.within('.diff-files-holder > div:nth-child(2) .parallel .note-body > .note-text') do
expect(page).to have_content('Line is correct')
end
end