From 838307c717804791a5152d26743e341231f8ed7d Mon Sep 17 00:00:00 2001
From: tamsin johnson <tomjohnson@ucsb.edu>
Date: Wed, 23 Aug 2023 21:54:12 -0700
Subject: [PATCH 1/4] ci: add koppie build and test

---
 .circleci/config.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8359968606..dbb10def0a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -165,3 +165,16 @@ workflows:
           hyrax_valkyrie: "1"
           requires:
             - dassie-build
+
+  koppie:
+    jobs:
+      - kaniko-build:
+          name: "koppie-build"
+          ruby_version: "3.2.2"
+          hyrax_app: "koppie"
+      - hyrax-test:
+          name: "koppie-test"
+          ruby_version: "3.2.2"
+          hyrax_app: "koppie"
+          requires:
+            - koppie-build

From 68f1185c2f227650129c6d4e4975061c247239c3 Mon Sep 17 00:00:00 2001
From: tamsin johnson <tomjohnson@ucsb.edu>
Date: Tue, 22 Aug 2023 17:32:21 -0700
Subject: [PATCH 2/4] configure Solr for koppie

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index dbb10def0a..979cbe1cbd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -119,6 +119,7 @@ jobs:
       HYRAX_VALKYRIE: << parameters.hyrax_valkyrie >>
       IN_DOCKER: true
       KARMA_BROWSER: remote-chromium
+      SOLR_URL: http://127.0.0.1:8985/solr/hydra-test
       VALKYRIE_SOLR_CORE: valkyrie-test
       VALKYRIE_SOLR_PORT: 8985
     steps:

From c699f435508e286abc8f33b519f569c6711ede37 Mon Sep 17 00:00:00 2001
From: tamsin johnson <tomjohnson@ucsb.edu>
Date: Tue, 29 Aug 2023 21:26:45 -0700
Subject: [PATCH 3/4] use rspec filter to exclude :active_fedora tags

---
 spec/spec_helper.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index add0f911e7..d1e9b3d3c2 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -245,15 +245,17 @@ def clean_active_fedora_repository
 
   config.shared_context_metadata_behavior = :apply_to_host_groups
 
+  config.filter_run_excluding(:active_fedora) if Hyrax.config.disable_wings
   config.filter_run_when_matching :focus
 
   config.example_status_persistence_file_path = 'spec/examples.txt'
 
   config.profile_examples = 10
 
-  config.prepend_before(:context, :active_fedora) do
-    skip("Don't test Wings") if Hyrax.config.disable_wings
-  end
+  # Should not be needed if filter_run_excluding(:active_fedora) above correctly avoids running context setup.
+  # config.prepend_before(:context, :active_fedora) do
+  #   skip("Don't test Wings") if Hyrax.config.disable_wings
+  # end
 
   config.before(:example, :clean_repo) do
     clean_active_fedora_repository unless Hyrax.config.disable_wings

From ae96c2e8952fd2e3d6c3c00f0fd2be3103973542 Mon Sep 17 00:00:00 2001
From: Daniel Pierce <dlpierce@indiana.edu>
Date: Fri, 8 Sep 2023 01:22:02 -0400
Subject: [PATCH 4/4] Prevent Wings from loading when disabled

---
 lib/wings.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/wings.rb b/lib/wings.rb
index af11cbb3ec..f3bc7a41f3 100644
--- a/lib/wings.rb
+++ b/lib/wings.rb
@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+# Short circuit loading if Wings is disabled
+return if Hyrax.config.disable_wings
+
 ##
 # Wings is a toolkit integrating Valkyrie into Hyrax as a bridge away from the
 # hard dependency on ActiveFedora.