add sunspot.yml

.travis.yml

@@ -7,6 +7,7 @@ before_script:
   - mysql -e 'create database enju_test DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;'
   - psql -c 'create database enju_test;' -U postgres
   - bundle exec rake db:migrate
+  - bundle exec rake app:sunspot:solr:start
 services:
   - redis-server
 env:

enju_inter_library_loan.gemspec

@@ -24,8 +24,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "pg"
   s.add_development_dependency "rspec-rails", "~> 3.7"
   s.add_development_dependency "factory_bot_rails"
-  s.add_development_dependency "sunspot_solr", "2.2.0"
-  s.add_development_dependency "sunspot-rails-tester"
+  s.add_development_dependency "sunspot_solr", "~> 2.3"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "coveralls"
 end

spec/dummy/config/sunspot.yml

@@ -0,0 +1,23 @@
+production:
+  solr:
+    hostname: localhost
+    port: 8983
+    log_level: WARNING
+    path: /solr/production
+    # read_timeout: 2
+    # open_timeout: 0.5
+
+development:
+  solr:
+    hostname: localhost
+    port: 8982
+    log_level: INFO
+    path: /solr/development
+
+test:
+  solr:
+    hostname: localhost
+    port: 8981
+    log_level: WARNING
+    path: /solr/test
+

spec/rails_helper.rb

@@ -8,7 +8,6 @@
 require File.expand_path("../dummy/config/environment", __FILE__)
 require 'rspec/rails'
 require 'factory_bot'
-require 'sunspot-rails-tester'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -34,18 +33,6 @@
 
   config.extend ControllerMacros, type: :controller
 
-  $original_sunspot_session = Sunspot.session
-
-  config.before do
-    Sunspot.session = Sunspot::Rails::StubSessionProxy.new($original_sunspot_session)
-  end
-
-  config.before :each, solr: true do
-    Sunspot::Rails::Tester.start_original_sunspot_session
-    Sunspot.session = $original_sunspot_session
-    #Sunspot.remove_all!
-  end
-
   config.infer_spec_type_from_file_location!
 end