1 files changed, 17 insertions, 22 deletions

diff --git a/spec/features/merge_request/user_sees_discussions_navigation_spec.rb b/spec/features/merge_request/user_sees_discussions_navigation_spec.rb
index 5f815bffb22..338e4329190 100644
--- a/spec/features/merge_request/user_sees_discussions_navigation_spec.rb
+++ b/spec/features/merge_request/user_sees_discussions_navigation_spec.rb
@@ -1,10 +1,7 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-
-RSpec.describe 'Merge request > User sees discussions navigation',
-  :js, feature_category: :code_review_workflow,
-  quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/410678' do
+RSpec.describe 'Merge request > User sees discussions navigation', :js, feature_category: :code_review_workflow do
   let_it_be(:project) { create(:project, :public, :repository) }
   let_it_be(:user) { project.creator }
   let_it_be(:merge_request) { create(:merge_request, source_project: project) }
@@ -44,7 +41,7 @@ RSpec.describe 'Merge request > User sees discussions navigation',
 
     shared_examples 'a page with a thread navigation' do
       context 'with active threads' do
-        it 'navigates to the first thread', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/410144' do
+        it 'navigates to the first thread' do
           goto_next_thread
           expect(page).to have_selector(first_discussion_selector, obscured: false)
         end
@@ -54,13 +51,13 @@ RSpec.describe 'Merge request > User sees discussions navigation',
           expect(page).to have_selector(second_discussion_selector, obscured: false)
         end
 
-        it 'navigates through active threads', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/391912' do
+        it 'navigates through active threads' do
           goto_next_thread
           goto_next_thread
           expect(page).to have_selector(second_discussion_selector, obscured: false)
         end
 
-        it 'cycles back to the first thread', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/391604' do
+        it 'cycles back to the first thread' do
           goto_next_thread
           goto_next_thread
           goto_next_thread
@@ -135,24 +132,18 @@ RSpec.describe 'Merge request > User sees discussions navigation',
   end
 
   describe 'Merge request discussions' do
-    shared_examples 'a page with no code discussions' do
-      let!(:first_discussion) do
-        create(:discussion_note_on_merge_request,
-               noteable: merge_request,
-               project: project
-              ).to_discussion
-      end
+    let_it_be(:first_discussion) do
+      create(:discussion_note_on_merge_request, noteable: merge_request, project: project).to_discussion
+    end
 
-      let!(:second_discussion) do
-        create(:discussion_note_on_merge_request,
-               noteable: merge_request,
-               project: project
-              ).to_discussion
-      end
+    let_it_be(:second_discussion) do
+      create(:discussion_note_on_merge_request, noteable: merge_request, project: project).to_discussion
+    end
 
-      let(:first_discussion_selector) { ".discussion[data-discussion-id='#{first_discussion.id}']" }
-      let(:second_discussion_selector) { ".discussion[data-discussion-id='#{second_discussion.id}']" }
+    let(:first_discussion_selector) { ".discussion[data-discussion-id='#{first_discussion.id}']" }
+    let(:second_discussion_selector) { ".discussion[data-discussion-id='#{second_discussion.id}']" }
 
+    shared_examples 'a page with no code discussions' do
       describe "Changes page discussions navigation" do
         it 'navigates to the first discussion on the Overview page' do
           goto_next_thread
@@ -196,9 +187,13 @@ RSpec.describe 'Merge request > User sees discussions navigation',
 
   def goto_next_thread
     click_button 'Go to next unresolved thread', obscured: false
+    # Wait for scroll
+    sleep(1)
   end
 
   def goto_previous_thread
     click_button 'Go to previous unresolved thread', obscured: false
+    # Wait for scroll
+    sleep(1)
   end
 end