Merge pull request #6186 from samvera/koppie-ci

ci: add koppie build and test

.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:
@@ -165,3 +166,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

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.

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