Merge branch 'add-resolve-discussion-test' into 'master'

Add explicit test to test resolved discussion toggle content

See merge request gitlab-org/gitlab-ce!14796

spec/features/merge_requests/diff_notes_resolve_spec.rb

@@ -88,16 +88,26 @@ feature 'Diff notes resolve', :js do
         end
       end
 
-      it 'hides resolved discussion' do
+      describe 'resolved discussion' do
+        before do
           page.within '.diff-content' do
             click_button 'Resolve discussion'
           end
 
           visit_merge_request
+        end
 
+        it 'hides when resolve discussion is clicked' do
           expect(page).to have_selector('.discussion-body', visible: false)
         end
 
+        it 'shows resolved discussion when toggled' do
+          find(".timeline-content .discussion[data-discussion-id='#{note.discussion_id}'] .discussion-toggle-button").click
+
+          expect(page.find(".timeline-content #note_#{note.noteable_id}")).to be_visible
+        end
+      end
+
       it 'allows user to resolve from reply form without a comment' do
         page.within '.diff-content' do
           click_button 'Reply...'