diff --git a/README.md b/README.md index df2ba72..11b059a 100644 --- a/README.md +++ b/README.md @@ -84,9 +84,9 @@ environment variables called `IMPORT_PATH`. If `IMPORT_PATH` is not set, `HyraxR ## Testing -To run Solr and Fedora for testing purposes: +To run Solr and Fedora for testing purposes, open a new terminal session for each and run the following commads: -`solr_wrapper --config spec/dummy/config/solr_wrapper_test.yml` +`solr_wrapper --config spec/dummy/config/solr_wrapper_test.yml` `fcrepo_wrapper --config spec/dummy/config/fcrepo_wrapper_test.yml` After this you can run the whole suite, or individual specs. System specs are located diff --git a/spec/dummy/.fcrepo_wrapper b/spec/dummy/.fcrepo_wrapper index b4d2f0b..54659dd 100644 --- a/spec/dummy/.fcrepo_wrapper +++ b/spec/dummy/.fcrepo_wrapper @@ -1,4 +1,5 @@ # Place any default configuration for solr_wrapper here +version: 4.7.5 port: 8984 enable_jms: false fcrepo_home_dir: tmp/fcrepo4-development-data diff --git a/spec/dummy/.solr_wrapper b/spec/dummy/.solr_wrapper index d4186ed..a4225ea 100644 --- a/spec/dummy/.solr_wrapper +++ b/spec/dummy/.solr_wrapper @@ -1,5 +1,5 @@ # Place any default configuration for solr_wrapper here -# version: 6.0.0 +version: 7.7.2 # port: 8983 instance_dir: tmp/solr-development collection: diff --git a/spec/dummy/.solr_wrapper.yml b/spec/dummy/.solr_wrapper.yml deleted file mode 100644 index 53894b7..0000000 --- a/spec/dummy/.solr_wrapper.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Place any default configuration for solr_wrapper here -# port: 8983 -collection: - dir: solr/conf/ - name: blacklight-core diff --git a/spec/dummy/config/fcrepo_wrapper_test.yml b/spec/dummy/config/fcrepo_wrapper_test.yml index 77f79a6..2e357d0 100644 --- a/spec/dummy/config/fcrepo_wrapper_test.yml +++ b/spec/dummy/config/fcrepo_wrapper_test.yml @@ -1,4 +1,5 @@ #config/fcrepo_wrapper_test.yml.sample port: 8986 enable_jms: false +version: 4.7.5 fcrepo_home_dir: tmp/fcrepo4-test-data diff --git a/spec/dummy/config/solr_wrapper_test.yml b/spec/dummy/config/solr_wrapper_test.yml index 5557b8c..67350f5 100644 --- a/spec/dummy/config/solr_wrapper_test.yml +++ b/spec/dummy/config/solr_wrapper_test.yml @@ -1,5 +1,5 @@ #config/solr_wrapper_test.yml -version: 6.1.0 +version: 7.7.2 port: 8985 instance_dir: tmp/solr-test collection: