1 files changed, 35 insertions, 30 deletions
diff --git a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb
index 2d268ecab58..8f595a2b095 100644
--- a/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb
+++ b/spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb
@@ -139,44 +139,50 @@ describe 'Merge request > User resolves diff notes and discussions', :js do
             expect(find('.diffs .diff-file .notes_holder')).to be_visible
           end
         end
-      end
 
-      it 'allows user to resolve from reply form without a comment' do
-        page.within '.diff-content' do
-          click_button 'Reply...'
+        describe 'reply form' do
+          before do
+            click_button 'Toggle discussion'
 
-          click_button 'Resolve discussion'
-        end
+            page.within '.diff-content' do
+              click_button 'Reply...'
+            end
+          end
 
-        page.within '.line-resolve-all-container' do
-          expect(page).to have_content('1/1 discussion resolved')
-          expect(page).to have_selector('.line-resolve-btn.is-active')
-        end
-      end
+          it 'allows user to unresolve from reply form without a comment' do
+            page.within '.diff-content' do
+              click_button 'Unresolve discussion'
 
-      it 'allows user to unresolve from reply form without a comment' do
-        page.within '.diff-content' do
-          click_button 'Resolve discussion'
-          sleep 1
+              wait_for_requests
+            end
 
-          click_button 'Reply...'
+            page.within '.line-resolve-all-container' do
+              expect(page).to have_content('0/1 discussion resolved')
+              expect(page).not_to have_selector('.line-resolve-btn.is-active')
+            end
+          end
 
-          click_button 'Unresolve discussion'
-        end
+          it 'allows user to comment & unresolve discussion' do
+            page.within '.diff-content' do
+              find('.js-note-text').set 'testing'
 
-        page.within '.line-resolve-all-container' do
-          expect(page).to have_content('0/1 discussion resolved')
-          expect(page).not_to have_selector('.line-resolve-btn.is-active')
+              click_button 'Comment & unresolve discussion'
+
+              wait_for_requests
+            end
+
+            page.within '.line-resolve-all-container' do
+              expect(page).to have_content('0/1 discussion resolved')
+            end
+          end
         end
       end
 
-      it 'allows user to comment & resolve discussion' do
+      it 'allows user to resolve from reply form without a comment' do
         page.within '.diff-content' do
           click_button 'Reply...'
 
-          find('.js-note-text').set 'testing'
-
-          click_button 'Comment & resolve discussion'
+          click_button 'Resolve discussion'
         end
 
         page.within '.line-resolve-all-container' do
@@ -185,19 +191,18 @@ describe 'Merge request > User resolves diff notes and discussions', :js do
         end
       end
 
-      it 'allows user to comment & unresolve discussion' do
+      it 'allows user to comment & resolve discussion' do
         page.within '.diff-content' do
-          click_button 'Resolve discussion'
-
           click_button 'Reply...'
 
           find('.js-note-text').set 'testing'
 
-          click_button 'Comment & unresolve discussion'
+          click_button 'Comment & resolve discussion'
         end
 
         page.within '.line-resolve-all-container' do
-          expect(page).to have_content('0/1 discussion resolved')
+          expect(page).to have_content('1/1 discussion resolved')
+          expect(page).to have_selector('.line-resolve-btn.is-active')
         end
       end