Merge pull request #155 from sul-dlss/test_solr6

Test on Solr 6 using solr_wrapper

.solr_wrapper.yml

@@ -0,0 +1,5 @@
+port: 8984
+version: 6.6.5
+collection:
+  dir: solr_conf/conf/
+  name: hydrus-test

Gemfile

@@ -37,6 +37,7 @@ gem 'uglifier', '>= 1.0.3'
 
 group :development, :test do
   gem 'factory_bot_rails'
+  gem 'solr_wrapper', '~> 2.0'
   gem 'jettywrapper', '~> 2.0'
   gem 'sqlite3'
   gem 'rspec-rails', '~> 3.1'

Gemfile.lock

@@ -405,6 +405,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
+    retriable (3.1.2)
     retries (0.0.5)
     rsolr (1.0.13)
       builder (>= 2.1.2)
@@ -459,6 +460,11 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
+    solr_wrapper (2.0.0)
+      faraday
+      retriable
+      ruby-progressbar
+      rubyzip
     solrizer (3.4.1)
       activesupport
       daemons
@@ -561,6 +567,7 @@ DEPENDENCIES
   rubocop (~> 0.56.0)
   sass-rails (~> 4.0)
   simplecov
+  solr_wrapper (~> 2.0)
   sqlite3
   sul_chrome (~> 0.1.0)
   uglifier (>= 1.0.3)

README.md

@@ -10,7 +10,8 @@ Digital Repository for preservation and access.
 ## Setting up your environment
 
 First, you need a Java runtime so you can have a local Solr and Fedora instance for development/testing.
-One way to install Solr/Fedora is by using hydra-jetty, which is what the instructions below assume
+One way to install Solr/Fedora is by using solr_wrapper and jetty_wrapper (for Fedora),
+ which is what the instructions below assume
 
 ```bash
 rvm install 2.3.4
@@ -24,11 +25,12 @@ cd hydrus
 bundle install
 
 rake jetty:clean # download hydra-jetty
-rake hydra:jetty:config # configure hydra-jetty
 
 # Create a config/settings.local.yml file, adding passwords, etc.  Talk to another developer to see what is needed here.
 
-rake jetty:start # start your local solr/fedora
+rake jetty:start # start your local fedora
+
+solr_wrapper # start Solr. Do this in a separate terminal window.
 
 rake db:migrate
 rake db:test:prepare
@@ -40,10 +42,12 @@ rake hydrus:refreshfix RAILS_ENV=test
 
 ## Running the application
 
-Assuming you are using hydra-jetty for solr/fedora, start the Jetty server:
+Assuming you are using solr_wrapper for Solr and jetty_wrapper for Fedora,
+start the servers:
 
 ```bash
 rake jetty:start
+solr_wrapper # Do this in a separate terminal window.
 ```
 
 Run the Hydrus application in either of these ways:
@@ -67,7 +71,7 @@ docker run -d -p 127.0.0.1:3002:3000 suldlss/suri-rails:latest
 * Jetty - [http://localhost:8983](http://localhost:8983)
 * Fedora admin - [http://localhost:8983/fedora/admin](http://localhost:8983/fedora/admin)
 * Fedora objects - [http://localhost:8983/fedora/objects](http://localhost:8983/fedora/objects)
-* Solr - [http://localhost:8983/solr](http://localhost:8983/solr)
+* Solr - [http://localhost:8984/solr](http://localhost:8983/solr)
 
 ## User accounts used during development
 

config/settings/test.yml

@@ -20,4 +20,4 @@ suri:
   mint_ids: false
 
 solr:
-  url: http://localhost:8983/solr/test
+  url: http://localhost:8984/solr/hydrus-test

config/solr.yml

@@ -1,5 +1,5 @@
 development:
-  url: http://localhost:8983/solr/development
+  url: http://localhost:8984/solr/hydrus-test
 
 test:
-  url: http://localhost:8983/solr/test
+  url: http://localhost:8984/solr/hydrus-test

lib/tasks/ci.rake

@@ -1,10 +1,8 @@
-if defined? Jettywrapper
-  # Only in dev/test
-  Jettywrapper.hydra_jetty_version = 'v7.0.0'
-end
+# This tells Jettywrapper where to download from
+ZIP_URL = 'https://github.com/sul-dlss/fcrepo3-jetty/archive/master.zip'
 
 desc 'Run Continuous Integration Suite (tests, coverage, docs)'
-task ci: [:rubocop, 'jetty:clean', 'jetty:config'] do
+task ci: [:rubocop] do
   unless Rails.env.test?
     # force any CI sub-tasks to run in the test environment (e.g. to ensure
     # fixtures get loaded into the right places)
@@ -13,16 +11,22 @@ task ci: [:rubocop, 'jetty:clean', 'jetty:config'] do
   end
 
   Rake::Task['db:migrate'].invoke
+  Rake::Task['jetty:clean'].invoke
 
   jetty_params = Jettywrapper.load_config.merge({
-    jetty_home: File.expand_path(File.dirname(__FILE__) + '/../../jetty'),
+    jetty_home: File.expand_path(File.dirname(__FILE__) + '../../../jetty'),
     startup_wait: 90
   })
 
   error = nil
   error = Jettywrapper.wrap(jetty_params) do
-    Rake::Task['hydrus:refreshfix'].invoke
-    Rake::Task['spec'].invoke
+    SolrWrapper.wrap do |solr|
+      solr.with_collection(name: 'hydrus-test',
+                           dir: File.join(File.expand_path('../..', File.dirname(__FILE__)), 'solr_conf', 'conf')) do
+        Rake::Task['hydrus:refreshfix'].invoke
+        Rake::Task['spec'].invoke
+      end
+    end
   end
   raise "TEST FAILURES: #{error}" if error
 end

lib/tasks/fixtures.rake

@@ -186,7 +186,7 @@ namespace :hydrus do
     # Restore jetty to initial state.
     Rake::Task['jetty:stop'].invoke
     Rake::Task['jetty:clean'].invoke
-    Rake::Task['hydra:jetty:config'].invoke
+    Rake::Task['hydra:jetty:config_fedora'].invoke
     Rake::Task['jetty:start'].invoke
     Rake::Task['hydrus:clear_upload_files'].invoke
   end