Merge pull request #2105 from samvera/hyrax-5-upgrade-allow-clean_repo

🧹 Allow :clean or :clean_repo to work for the cleaners
samvera · Dec 21, 2023 · 9eed101 · 9eed101
2 parents 046c6ea + 75fc391
commit 9eed101
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
@@ -149,8 +149,14 @@
     # make sure we are on the default fedora config
     ActiveFedora::Fedora.reset!
     ActiveFedora::SolrService.reset!
-    # Pass `:clean' to destroy objects in fedora/solr and start from scratch
-    ActiveFedora::Cleaner.clean! if example.metadata[:clean]
+    # Pass `:clean' (or hyrax's convention of :clean_repo) to destroy objects in fedora/solr and
+    # start from scratch
+    if example.metadata[:clean] || example.metadata[:clean_repo]
+      ## We don't need to do `Hyrax::SolrService.wipe!` so long as we're using `ActiveFedora.clean!`;
+      ## but Valkyrie is coming so be prepared.
+      # Hyrax::SolrService.wipe!
+      ActiveFedora::Cleaner.clean!
+    end
     if example.metadata[:type] == :feature && Capybara.current_driver != :rack_test
       DatabaseCleaner.strategy = :truncation
     else