1 files changed, 13 insertions, 9 deletions
diff --git a/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb b/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb
index 1b5dd6945e0..04c7f4b6c76 100644
--- a/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb
+++ b/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb
@@ -121,7 +121,7 @@ describe 'User comments on a diff', :js do
   end
 
   context 'multi-line suggestions' do
-    it 'suggestion is presented' do
+    before do
       click_diff_line(find("[id='#{sample_compare.changes[1][:line_code]}']"))
 
       page.within('.js-discussion-note-form') do
@@ -130,7 +130,9 @@ describe 'User comments on a diff', :js do
       end
 
       wait_for_requests
+    end
 
+    it 'suggestion is presented' do
       page.within('.diff-discussions') do
         expect(page).to have_button('Apply suggestion')
         expect(page).to have_content('Suggested change')
@@ -160,22 +162,24 @@ describe 'User comments on a diff', :js do
     end
 
     it 'suggestion is appliable' do
-      click_diff_line(find("[id='#{sample_compare.changes[1][:line_code]}']"))
+      page.within('.diff-discussions') do
+        expect(page).not_to have_content('Applied')
 
-      page.within('.js-discussion-note-form') do
-        fill_in('note_note', with: "```suggestion:-3+5\n# change to a\n# comment\n# with\n# broken\n# lines\n```")
-        click_button('Comment')
-      end
+        click_button('Apply suggestion')
+        wait_for_requests
 
-      wait_for_requests
+        expect(page).to have_content('Applied')
+      end
+    end
 
+    it 'resolves discussion when applied' do
       page.within('.diff-discussions') do
-        expect(page).not_to have_content('Applied')
+        expect(page).not_to have_content('Unresolve discussion')
 
         click_button('Apply suggestion')
         wait_for_requests
 
-        expect(page).to have_content('Applied')
+        expect(page).to have_content('Unresolve discussion')
       end
     end
   end