(whimsy) branch master updated: Ensure overrides are in place before main code is loaded

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new e11328ee Ensure overrides are in place before main code is loaded
e11328ee is described below

commit e11328ee644fb7cc598b1972dfb7632fb89125e2
Author: Sebb <s...@apache.org>
AuthorDate: Mon Jul 22 15:49:31 2024 +0100

    Ensure overrides are in place before main code is loaded
---
 lib/spec/lib/committee_spec.rb | 1 -
 lib/spec/spec_helper.rb        | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/spec/lib/committee_spec.rb b/lib/spec/lib/committee_spec.rb
index bfe14164..9712531e 100644
--- a/lib/spec/lib/committee_spec.rb
+++ b/lib/spec/lib/committee_spec.rb
@@ -25,7 +25,6 @@ describe ASF::Committee do
   }
   describe "ASF::Committee::site" do
     it "should return correct display_name initially" do
-      pending('works locally, but not under GH actions...')
       httpd = ASF::Committee['httpd']
       expect(httpd.display_name).to eq('HTTP Server')
     end
diff --git a/lib/spec/spec_helper.rb b/lib/spec/spec_helper.rb
index 33fbe723..74c28dc1 100644
--- a/lib/spec/spec_helper.rb
+++ b/lib/spec/spec_helper.rb
@@ -17,8 +17,9 @@
 lib = File.expand_path('..', __dir__)
 $LOAD_PATH.unshift lib unless $LOAD_PATH.include? lib
 
-require 'whimsy/asf'
 require 'whimsy/asf/config' # must be loaded before updating config
+require 'whimsy/asf/svn' # must be loaded before updating config
+# Don't load 'whimsy/asf' here as some classes may depend on overrides below
 
 SAMPLE_SVN_NAME = 'minutes' # name of checkout of public SVN dir
 SAMPLE_SVN_URL_RE = %r{https://.+/minutes}