summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-08-16 10:17:47 -0600
committerConnor Shea <connor.james.shea@gmail.com>2016-08-16 10:17:47 -0600
commit4384222b388551d8acef21f709da9768ef3ee649 (patch)
tree85d956899d3a7527baa258ce63760ccbb88b6fd7
parent41007f6d3c30a294bbf361ff900b3b19bb463291 (diff)
downloadgitlab-ce-4384222b388551d8acef21f709da9768ef3ee649.tar.gz
Add test for jumping between discussions and unhiding toggled discussions.
-rw-r--r--spec/features/merge_requests/diff_notes_resolve_spec.rb18
1 files changed, 18 insertions, 0 deletions
diff --git a/spec/features/merge_requests/diff_notes_resolve_spec.rb b/spec/features/merge_requests/diff_notes_resolve_spec.rb
index 79264a1f26a..c6adf7e4c56 100644
--- a/spec/features/merge_requests/diff_notes_resolve_spec.rb
+++ b/spec/features/merge_requests/diff_notes_resolve_spec.rb
@@ -292,6 +292,24 @@ feature 'Diff notes resolve', feature: true, js: true do
expect(holder).to have_selector('.discussion-next-btn')
end
end
+
+ it 'displays next discussion even if hidden' do
+ page.all('.note-discussion').each do |discussion|
+ page.within discussion do
+ click_link 'Toggle discussion'
+ end
+ end
+
+ page.within('.issuable-discussion #notes') do
+ expect(page).not_to have_selector('.btn', text: 'Resolve discussion')
+ end
+
+ page.within '.line-resolve-all-container' do
+ page.find('.discussion-next-btn').click
+ end
+
+ expect(find('.discussion-with-resolve-btn')).to have_selector('.btn', text: 'Resolve discussion')
+ end
end
context 'changes tab' do