blacklight-spotlight 4.6.1 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1c1e34d4e9beb99a5032c7361b9fb355f461b4cd7a532f6aea0c25730858753
-  data.tar.gz: 5f6879362e353cd851f04653aec67ad93b35d5b799f7a3d48e81f07eb4c53e62
+  metadata.gz: 051b1798794393c2afeb19a83437d9d0bde7c2bd5861a1684b08bb89fe948a51
+  data.tar.gz: '058d356020bd76fccf4124dee494114640ecb514ecabe06220a3ad2628ce9510'
 SHA512:
-  metadata.gz: 909f10a67ab1e3144bb2a43fc2590bbaf9ad7a5e9f0134f178b88bbc8674796acb1f868511f167f1e916985633aee927b274e3f0b5d479cd87ba41fbe15709b7
-  data.tar.gz: f5bc2b2ba5addad2ccbc01881e3e5b2bd5240fe96a82fc7fc742f94b5bda6132044f7b400cc132276173c0cc86e798741ba97156d0e5179bcb8e8338e9356ba0
+  metadata.gz: 2489cb7dd18bcd3369a41e0991349617ed3a49adedb9859d79eb9b0938f70f712cf6325c2e9eb48754d2b691f1a1ae6c32e7f3c8393a2083f3984248d166dd6c
+  data.tar.gz: a636d0dabffd8633a2a293c8433dada5c3df367512df0232ea366b193300e2828d6e973cc38bc31f7279cf486e1505c77cea8c6c7f5c181adec80dbd6f97f40d

data/Rakefile

@@ -19,6 +19,7 @@ end
 Bundler::GemHelper.install_tasks
 
 require 'solr_wrapper'
+require 'open3'
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
@@ -30,16 +31,45 @@ require 'engine_cart/rake_task'
 
 require 'spotlight/version'
 
-task ci: ['engine_cart:generate'] do
-  ENV['environment'] = 'test'
+def system_with_error_handling(*args)
+  Open3.popen3(*args) do |_stdin, stdout, stderr, thread|
+    puts stdout.read
+    raise "Unable to run #{args.inspect}: #{stderr.read}" unless thread.value.success?
+  end
+end
 
-  SolrWrapper.wrap(port: '8983') do |solr|
-    solr.with_collection(name: 'blacklight-core', dir: 'lib/generators/spotlight/templates/solr/conf') do
-      Rake::Task['spotlight:fixtures'].invoke
+def with_solr(&block) # rubocop:disable Metrics/MethodLength
+  # We're being invoked by the app entrypoint script and solr is already up via docker compose
+  if ENV['SOLR_ENV'] == 'docker-compose'
+    yield
+  elsif system('docker compose version')
+    # We're not running `docker compose up' but still want to use a docker instance of solr.
+    begin
+      puts 'Starting Solr'
+      system_with_error_handling 'docker compose up -d solr'
+      yield
+    ensure
+      puts 'Stopping Solr'
+      system_with_error_handling 'docker compose stop solr'
+    end
+  else
+    SolrWrapper.wrap do |solr|
+      solr.with_collection(&block)
+    end
+  end
+end
+
+task :ci do
+  ENV['environment'] = 'test'
 
-      # run the tests
-      Rake::Task['spec'].invoke
+  with_solr do
+    Rake::Task['spotlight:fixtures'].invoke
+    within_test_app do
+      system 'bin/rake spec:prepare'
     end
+
+    # run the tests
+    Rake::Task['spec'].invoke
   end
 end
 

data/app/assets/javascripts/spotlight/spotlight.esm.js

@@ -5137,7 +5137,7 @@ jQuery.fn.scrollStop = function(callback) {
 class Pages {
   connect(){
     SirTrevor.setDefaults({
-      iconUrl: Spotlight.sirTrevorIcon,
+      iconUrl: Spotlight.sirTrevorIcon || window.sirTrevorIcon,
       uploadUrl: $('[data-attachment-endpoint]').data('attachment-endpoint'),
       ajaxOptions: {
         headers: {