Skip to content

Commit

Permalink
fix: fixing broken specs
Browse files Browse the repository at this point in the history
  • Loading branch information
marcosgz committed Jul 1, 2024
1 parent 1bbed09 commit 5677a11
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 15 deletions.
11 changes: 2 additions & 9 deletions lib/esse/index/indices.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,8 @@ def create_index(suffix: nil, body: nil, **options)
def reset_index(suffix: index_suffix, optimize: true, import: true, reindex: false, **options)
cluster.throw_error_when_readonly!

remove_root_in_use_index_named = nil
if index_name == index_name(suffix: suffix) && index_exist?(suffix: suffix)
remove_root_in_use_index_named = index_name
suffix = Esse.timestamp
elsif suffix.nil? || index_exist?(suffix: suffix)
suffix = Esse.timestamp
end
suffix ||= Esse.timestamp
suffix = Esse.timestamp while index_exist?(suffix: suffix)

if optimize
definition = [settings_hash, mappings_hash].reduce(&:merge)
Expand All @@ -83,8 +78,6 @@ def reset_index(suffix: index_suffix, optimize: true, import: true, reindex: fal
update_settings(suffix: suffix)
end

cluster.api.delete_index(index: remove_root_in_use_index_named) if remove_root_in_use_index_named

update_aliases(suffix: suffix)

true
Expand Down
13 changes: 7 additions & 6 deletions spec/esse/cluster_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -199,13 +199,14 @@

it 'retuns an instance of elasticsearch as default' do
expect(model.instance_variable_get(:@client)).to eq(nil)
if defined? Elasticsearch::Transport::Client
expect(model.client).to be_an_instance_of(Elasticsearch::Transport::Client)
expect(model.instance_variable_get(:@client)).to be_an_instance_of(Elasticsearch::Transport::Client)
else # Elasticsearch-ruby >= 8.0
expect(model.client).to be_an_instance_of(Elasticsearch::Client)
expect(model.instance_variable_get(:@client)).to be_an_instance_of(Elasticsearch::Client)
classes = []
if defined? Elasticsearch::Client # Elasticsearch-ruby >= 8.0
classes << Elasticsearch::Client
elsif defined? Elasticsearch::Transport::Client
classes << Elasticsearch::Transport::Client
end
expect(classes).to include(model.client.class)
expect(model.client).to be(model.instance_variable_get(:@client))
end

it 'store connection using default key' do
Expand Down

0 comments on commit 5677a11

Please sign in to comment.