From 5bf12a51d73583600aee41d61a03f6c4c8ee73bd Mon Sep 17 00:00:00 2001 From: Molly Struve Date: Mon, 27 Apr 2020 17:11:47 -0500 Subject: [PATCH] Clear Elasticsearch data for user viewing timeline specs (#7549) --- spec/rails_helper.rb | 2 +- spec/support/elasticsearch_helpers.rb | 7 +++++++ .../articles/user_visits_articles_by_timeframe_spec.rb | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 3983b4acc..f2a368707 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -69,7 +69,7 @@ RSpec.configure do |config| config.include FactoryBot::Syntax::Methods config.include OmniauthMacros config.include SidekiqTestHelpers - config.include ElasticsearchHelpers, elasticsearch: true + config.include ElasticsearchHelpers config.before(:suite) do Search::Cluster.recreate_indexes diff --git a/spec/support/elasticsearch_helpers.rb b/spec/support/elasticsearch_helpers.rb index 447b39a46..fbeb0594b 100644 --- a/spec/support/elasticsearch_helpers.rb +++ b/spec/support/elasticsearch_helpers.rb @@ -4,4 +4,11 @@ module ElasticsearchHelpers Array.wrap(resources).each(&:index_to_elasticsearch_inline) described_class.refresh_index end + + def clear_elasticsearch_data(search_class) + Search::Client.delete_by_query( + index: search_class::INDEX_ALIAS, body: { query: { match_all: {} } }, + ) + search_class.refresh_index + end end diff --git a/spec/system/articles/user_visits_articles_by_timeframe_spec.rb b/spec/system/articles/user_visits_articles_by_timeframe_spec.rb index 1029d5d9b..e6994317f 100644 --- a/spec/system/articles/user_visits_articles_by_timeframe_spec.rb +++ b/spec/system/articles/user_visits_articles_by_timeframe_spec.rb @@ -120,6 +120,7 @@ RSpec.describe "User visits articles by timeframe", type: :system do let(:user) { create(:user) } before do + clear_elasticsearch_data(Search::FeedContent) sign_in user visit "/top/week" end