Merge branch 'fix-incorrectly-passing-elasticsearch-issues-notes-spec' into 'master'

Fix incorrectly passing issue spec for Elasticsearch indexing

See merge request gitlab-org/gitlab!48745

ee/spec/models/issue_spec.rb

@@ -489,36 +489,33 @@ RSpec.describe Issue do
     context 'when updating an Issue' do
       let(:project) { create(:project, :public) }
       let(:issue) { create(:issue, project: project, confidential: true) }
+      let!(:note) { create(:note, noteable: issue, project: project) }
+      let!(:system_note) { create(:note, :system, noteable: issue, project: project) }
 
-      before do
-        Sidekiq::Testing.disable! do
-          create(:note, note: 'the_normal_note', noteable: issue, project: project)
+      context 'when changing the confidential value' do
+        it 'updates issue notes excluding system notes' do
+          expect_any_instance_of(Note).to receive(:maintain_elasticsearch_update) do |instance|
+            expect(instance.id).to eq(note.id)
           end
-        Sidekiq::Testing.inline! do
-          project.maintain_elasticsearch_update
 
-          issue.update!(update_field => update_value)
-          ensure_elasticsearch_index!
+          issue.update!(confidential: false)
         end
       end
 
-      context 'when changing the confidential value' do
-        let(:update_field) { :confidential }
-        let(:update_value) { false }
-
+      context 'when changing the author' do
         it 'updates issue notes excluding system notes' do
-          expect(issue.elasticsearch_issue_notes_need_updating?).to eq(true)
-          expect(Note.elastic_search('the_normal_note', options: { project_ids: [issue.project.id] }).present?).to eq(true)
+          expect_any_instance_of(Note).to receive(:maintain_elasticsearch_update) do |instance|
+            expect(instance.id).to eq(note.id)
+          end
+
+          issue.update!(author: create(:user))
         end
       end
 
       context 'when changing the title' do
-        let(:update_field) { :title }
-        let(:update_value) { 'abc' }
-
         it 'does not update issue notes' do
-          expect(issue.elasticsearch_issue_notes_need_updating?).to eq(false)
-          expect(Note.elastic_search('the_normal_note', options: { project_ids: [issue.project.id] }).present?).to eq(false)
+          expect_any_instance_of(Note).not_to receive(:maintain_elasticsearch_update)
+          issue.update!(title: 'the new title')
         end
       end
     end