Merge pull request #3368 from projectblacklight/fix-devise

Workaround bug in devise

Author: jcoyne

lib/generators/blacklight/user_generator.rb

@@ -35,6 +35,8 @@ def generate_devise_assets
       generate "devise_guests", model_name.classify
 
       gsub_file("config/initializers/devise.rb", "config.sign_out_via = :delete", "config.sign_out_via = :get")
+      # Work around for https://github.com/heartcombo/devise/issues/5720
+      gsub_file("config/initializers/devise.rb", "# config.reload_routes = true", "config.reload_routes = false")
     end
 
     # Add Blacklight to the user model

tasks/blacklight.rake

@@ -3,7 +3,7 @@
 require 'engine_cart/rake_task'
 
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |t|
+RSpec::Core::RakeTask.new(spec: 'blacklight:build_host_assets') do |t|
   t.pattern = 'spec/**/*_spec.rb'
 end
 
@@ -46,15 +46,18 @@ desc "Run test suite"
 task ci: ['build:npm'] do
   with_solr do
     Rake::Task['blacklight:internal:seed'].invoke
-    within_test_app do
-      # Precompiles the assets
-      system "bin/rake assets:precompile" # Required due to https://github.com/rails/propshaft/issues/211
-    end
     Rake::Task['blacklight:coverage'].invoke
   end
 end
 
 namespace :blacklight do
+  task :build_host_assets do
+    within_test_app do
+      # Precompiles the assets
+      `bin/rails spec:prepare`
+    end
+  end
+
   desc "Run tests with coverage"
   task :coverage do
     ENV['COVERAGE'] = 'true'