diff --git a/.rubocop_todo/rspec/be_eq.yml b/.rubocop_todo/rspec/be_eq.yml index b51f7e7c78e46dad1118b6fdeea9c8f996e735e2..65b84951a8649b86a6468d3e54c6d0bed44da019 100644 --- a/.rubocop_todo/rspec/be_eq.yml +++ b/.rubocop_todo/rspec/be_eq.yml @@ -468,7 +468,6 @@ RSpec/BeEq: - 'ee/spec/services/projects/restore_service_spec.rb' - 'ee/spec/services/projects/update_service_spec.rb' - 'ee/spec/services/quick_actions/interpret_service_spec.rb' - - 'ee/spec/services/search/elastic/cluster_reindexing_service_spec.rb' - 'ee/spec/services/search/project_service_spec.rb' - 'ee/spec/services/search/zoekt/indexing_task_service_spec.rb' - 'ee/spec/services/security/configuration/project_set_continuous_vulnerability_scanning_service_spec.rb' diff --git a/.rubocop_todo/rspec/receive_messages.yml b/.rubocop_todo/rspec/receive_messages.yml index 581c114c0d1d6cd9af745a3904526202aaec2492..97b93e6b1bc1cc22a084d9b1b8cc46a023c1c24a 100644 --- a/.rubocop_todo/rspec/receive_messages.yml +++ b/.rubocop_todo/rspec/receive_messages.yml @@ -154,7 +154,6 @@ RSpec/ReceiveMessages: - 'ee/spec/services/merge_requests/mergeability/check_jira_status_service_spec.rb' - 'ee/spec/services/merge_requests/mergeability/check_path_locks_service_spec.rb' - 'ee/spec/services/resource_access_tokens/create_service_spec.rb' - - 'ee/spec/services/search/elastic/cluster_reindexing_service_spec.rb' - 'ee/spec/services/search/project_service_spec.rb' - 'ee/spec/services/security/orchestration/assign_service_spec.rb' - 'ee/spec/services/security/scan_result_policies/generate_policy_violation_comment_service_spec.rb' diff --git a/ee/spec/services/search/elastic/cluster_reindexing_service_spec.rb b/ee/spec/services/search/elastic/cluster_reindexing_service_spec.rb index c69f16aa34428816e6b95245b4af351409fa290c..0c6eba35783c3042afb40edf5995b7d7fcf1b016 100644 --- a/ee/spec/services/search/elastic/cluster_reindexing_service_spec.rb +++ b/ee/spec/services/search/elastic/cluster_reindexing_service_spec.rb @@ -51,20 +51,19 @@ end it 'errors when there is not enough space' do - allow(helper).to receive(:index_size_bytes).and_return(100.megabytes) - allow(helper).to receive(:cluster_free_size_bytes).and_return(30.megabytes) + allow(helper).to receive_messages(index_size_bytes: 100.megabytes, cluster_free_size_bytes: 30.megabytes) expect { cluster_reindexing_service.execute }.to change { task.reload.state }.from('initial').to('failure') expect(task.reload.error_message).to match(/storage available/) end it 'pauses elasticsearch indexing' do - expect(Gitlab::CurrentSettings.elasticsearch_pause_indexing).to eq(false) + expect(Gitlab::CurrentSettings.elasticsearch_pause_indexing).to be(false) expect { cluster_reindexing_service.execute } .to change { task.reload.state }.from('initial').to('indexing_paused') - expect(Gitlab::CurrentSettings.elasticsearch_pause_indexing).to eq(true) + expect(Gitlab::CurrentSettings.elasticsearch_pause_indexing).to be(true) end context 'when partial reindexing' do @@ -93,11 +92,12 @@ let!(:task) { create(:elastic_reindexing_task, state: :indexing_paused, targets: nil) } before do - allow(helper).to receive(:create_standalone_indices).and_return(issues_new_index_name => issues_alias) allow(helper).to receive(:target_index_names) { |options| { "#{options[:target]}-1" => true } } - allow(helper).to receive(:create_empty_index).and_return(main_new_index_name => main_alias) + allow(helper).to receive_messages( + create_standalone_indices: { issues_new_index_name => issues_alias }, + create_empty_index: { main_new_index_name => main_alias } + ) allow(helper).to receive(:reindex) { |options| "#{options[:to]}_task_id" } - allow(helper).to receive(:documents_count) allow(helper).to receive(:get_settings) do |options| number_of_shards = case options[:index_name] when main_old_index_name then 10 @@ -212,11 +212,12 @@ end before do - allow(helper).to receive(:task_status).and_return( - { + allow(helper).to receive_messages( + task_status: { 'completed' => true, 'response' => { 'total' => 20, 'created' => 20, 'updated' => 0, 'deleted' => 0 } - } + }, + refresh_index: true ) allow(helper).to receive(:reindex).and_return('task_1', 'task_2', 'task_3', 'task_4', 'task_5', 'task_6') end