From dd2dfd87cd1a3f7f79a954bc79027fab9289ab8c Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Fri, 6 Oct 2017 10:48:29 -0500 Subject: [PATCH] Only clear solr where needed --- valkyrie/spec/support/solr_test.rb | 9 --------- .../spec/valkyrie/persistence/solr/query_service_spec.rb | 7 +++++++ 2 files changed, 7 insertions(+), 9 deletions(-) delete mode 100644 valkyrie/spec/support/solr_test.rb diff --git a/valkyrie/spec/support/solr_test.rb b/valkyrie/spec/support/solr_test.rb deleted file mode 100644 index a45797e91..000000000 --- a/valkyrie/spec/support/solr_test.rb +++ /dev/null @@ -1,9 +0,0 @@ -# frozen_string_literal: true -SOLR_TEST_URL = "http://127.0.0.1:#{ENV['TEST_JETTY_PORT'] || 8984}/solr/blacklight-core-test" -RSpec.configure do |config| - config.before do - client = RSolr.connect(url: SOLR_TEST_URL) - client.delete_by_query("*:*") - client.commit - end -end diff --git a/valkyrie/spec/valkyrie/persistence/solr/query_service_spec.rb b/valkyrie/spec/valkyrie/persistence/solr/query_service_spec.rb index 6096cf316..3e56f24a7 100644 --- a/valkyrie/spec/valkyrie/persistence/solr/query_service_spec.rb +++ b/valkyrie/spec/valkyrie/persistence/solr/query_service_spec.rb @@ -3,6 +3,13 @@ require 'valkyrie/specs/shared_specs' RSpec.describe Valkyrie::Persistence::Solr::QueryService do + SOLR_TEST_URL = "http://127.0.0.1:#{ENV['TEST_JETTY_PORT'] || 8984}/solr/blacklight-core-test" + + before do + client = RSolr.connect(url: SOLR_TEST_URL) + client.delete_by_query("*:*") + client.commit + end let(:adapter) { Valkyrie::Persistence::Solr::MetadataAdapter.new(connection: client) } let(:client) { RSolr.connect(url: SOLR_TEST_URL) } it_behaves_like "a Valkyrie query provider"